GNOME.org
 

[fractal] Remove types module

commit bb76c01bd9baaf252284243cd06cecba64a9ea76
Author: Alejandro Domínguez <adomu net-c com>
Date:   Fri Oct 9 00:35:57 2020 +0200

    Remove types module

 fractal-gtk/src/actions/global.rs        |  2 +-
 fractal-gtk/src/actions/message.rs       |  2 +-
 fractal-gtk/src/appop/directory.rs       |  2 +-
 fractal-gtk/src/appop/invite.rs          |  2 +-
 fractal-gtk/src/appop/media_viewer.rs    |  2 +-
 fractal-gtk/src/appop/member.rs          |  3 +--
 fractal-gtk/src/appop/message.rs         |  4 ++--
 fractal-gtk/src/appop/mod.rs             |  8 ++++----
 fractal-gtk/src/appop/room.rs            |  5 ++++-
 fractal-gtk/src/backend/directory.rs     |  2 +-
 fractal-gtk/src/backend/media.rs         |  2 +-
 fractal-gtk/src/backend/room.rs          |  8 +++++---
 fractal-gtk/src/backend/sync.rs          | 12 ++++++------
 fractal-gtk/src/backend/user.rs          |  2 +-
 fractal-gtk/src/cache/mod.rs             |  3 +--
 fractal-gtk/src/cache/state.rs           |  3 +--
 fractal-gtk/src/main.rs                  |  1 -
 fractal-gtk/src/meson.build              |  1 -
 fractal-gtk/src/types.rs                 | 11 -----------
 fractal-gtk/src/uitypes.rs               |  2 +-
 fractal-gtk/src/widgets/autocomplete.rs  |  2 +-
 fractal-gtk/src/widgets/media_viewer.rs  |  3 +--
 fractal-gtk/src/widgets/member.rs        |  2 +-
 fractal-gtk/src/widgets/members_list.rs  |  2 +-
 fractal-gtk/src/widgets/room.rs          |  2 +-
 fractal-gtk/src/widgets/room_settings.rs |  3 +--
 fractal-gtk/src/widgets/roomlist.rs      |  2 +-
 fractal-gtk/src/widgets/roomrow.rs       |  2 +-
 28 files changed, 41 insertions(+), 54 deletions(-)
---
diff --git a/fractal-gtk/src/actions/global.rs b/fractal-gtk/src/actions/global.rs
index dea1fae1..bb56cd63 100644
--- a/fractal-gtk/src/actions/global.rs
+++ b/fractal-gtk/src/actions/global.rs
@@ -5,7 +5,7 @@ use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 
 use crate::appop::AppOp;
-use crate::types::Message;
+use crate::model::message::Message;
 use crate::util::i18n::i18n;
 use crate::widgets::FileDialog::open;
 use crate::App;
diff --git a/fractal-gtk/src/actions/message.rs b/fractal-gtk/src/actions/message.rs
index 09aa4adc..7d202aa2 100644
--- a/fractal-gtk/src/actions/message.rs
+++ b/fractal-gtk/src/actions/message.rs
@@ -14,7 +14,7 @@ use std::thread;
 
 use crate::actions::AppState;
 use crate::backend::HandleError;
-use crate::types::Message;
+use crate::model::message::Message;
 use crate::uibuilder::UI;
 use crate::util::i18n::i18n;
 use crate::App;
diff --git a/fractal-gtk/src/appop/directory.rs b/fractal-gtk/src/appop/directory.rs
index 90b6d32b..e1f8abc4 100644
--- a/fractal-gtk/src/appop/directory.rs
+++ b/fractal-gtk/src/appop/directory.rs
@@ -9,7 +9,7 @@ use crate::appop::AppOp;
 use crate::widgets;
 
 use super::RoomSearchPagination;
-use crate::types::Room;
+use crate::model::room::Room;
 use fractal_api::r0::thirdparty::get_supported_protocols::ProtocolInstance;
 
 impl AppOp {
diff --git a/fractal-gtk/src/appop/invite.rs b/fractal-gtk/src/appop/invite.rs
index bbed6cd1..775105e2 100644
--- a/fractal-gtk/src/appop/invite.rs
+++ b/fractal-gtk/src/appop/invite.rs
@@ -14,7 +14,7 @@ use crate::globals;
 
 use crate::widgets;
 
-use crate::types::Member;
+use crate::model::member::Member;
 
 impl AppOp {
     pub fn add_to_invite(&mut self, u: Member) {
diff --git a/fractal-gtk/src/appop/media_viewer.rs b/fractal-gtk/src/appop/media_viewer.rs
index 786fe400..1e0fd76b 100644
--- a/fractal-gtk/src/appop/media_viewer.rs
+++ b/fractal-gtk/src/appop/media_viewer.rs
@@ -9,7 +9,7 @@ use crate::appop::AppState;
 
 use crate::widgets;
 
-use crate::types::Message;
+use crate::model::message::Message;
 
 impl AppOp {
     /* FIXME: take msg by reference and maybe create an action for this */
diff --git a/fractal-gtk/src/appop/member.rs b/fractal-gtk/src/appop/member.rs
index e929bc0f..14439891 100644
--- a/fractal-gtk/src/appop/member.rs
+++ b/fractal-gtk/src/appop/member.rs
@@ -16,8 +16,7 @@ use crate::appop::AppOp;
 use crate::widgets;
 use crate::App;
 
-use crate::types::Event;
-use crate::types::Member;
+use crate::model::{event::Event, member::Member};
 
 #[derive(Debug, Clone)]
 pub enum SearchType {
diff --git a/fractal-gtk/src/appop/message.rs b/fractal-gtk/src/appop/message.rs
index 2e8ccf25..1bc42d9a 100644
--- a/fractal-gtk/src/appop/message.rs
+++ b/fractal-gtk/src/appop/message.rs
@@ -1,5 +1,5 @@
 use crate::backend::{room, HandleError};
-use crate::types::ExtraContent;
+use crate::model::fileinfo::ExtraContent;
 use comrak::{markdown_to_html, ComrakOptions};
 use fractal_api::identifiers::{EventId, RoomId};
 use fractal_api::r0::AccessToken;
@@ -27,7 +27,7 @@ use crate::uitypes::MessageContent;
 use crate::uitypes::RowType;
 use crate::widgets;
 
-use crate::types::Message;
+use crate::model::message::Message;
 
 pub struct TmpMsg {
     pub msg: Message,
diff --git a/fractal-gtk/src/appop/mod.rs b/fractal-gtk/src/appop/mod.rs
index 97d895b8..a1e4ca00 100644
--- a/fractal-gtk/src/appop/mod.rs
+++ b/fractal-gtk/src/appop/mod.rs
@@ -16,10 +16,10 @@ use fractal_api::url::Url;
 
 use crate::util::i18n;
 
-use crate::types::Member;
-use crate::types::Room;
-use crate::types::RoomList;
-
+use crate::model::{
+    member::Member,
+    room::{Room, RoomList},
+};
 use crate::passwd::PasswordStorage;
 
 use crate::actions::AppState;
diff --git a/fractal-gtk/src/appop/room.rs b/fractal-gtk/src/appop/room.rs
index 6c26589c..3c5b34e3 100644
--- a/fractal-gtk/src/appop/room.rs
+++ b/fractal-gtk/src/appop/room.rs
@@ -21,7 +21,10 @@ use crate::actions::AppState;
 use crate::cache;
 use crate::widgets;
 
-use crate::types::{Member, Reason, Room, RoomMembership, RoomTag};
+use crate::model::{
+    member::Member,
+    room::{Reason, Room, RoomMembership, RoomTag},
+};
 
 use crate::util::markup_text;
 
diff --git a/fractal-gtk/src/backend/directory.rs b/fractal-gtk/src/backend/directory.rs
index f8a8d427..ffe659af 100644
--- a/fractal-gtk/src/backend/directory.rs
+++ b/fractal-gtk/src/backend/directory.rs
@@ -7,7 +7,7 @@ use crate::globals;
 use crate::backend::HTTP_CLIENT;
 use crate::util::cache_dir_path;
 
-use crate::types::Room;
+use crate::model::room::Room;
 use fractal_api::r0::directory::post_public_rooms::request as post_public_rooms;
 use fractal_api::r0::directory::post_public_rooms::Body as PublicRoomsBody;
 use fractal_api::r0::directory::post_public_rooms::Filter as PublicRoomsFilter;
diff --git a/fractal-gtk/src/backend/media.rs b/fractal-gtk/src/backend/media.rs
index 166c7dd8..717f54ae 100644
--- a/fractal-gtk/src/backend/media.rs
+++ b/fractal-gtk/src/backend/media.rs
@@ -10,7 +10,7 @@ use crate::backend::HTTP_CLIENT;
 use crate::util::ResultExpectLog;
 use fractal_api::r0::AccessToken;
 
-use crate::types::Message;
+use crate::model::message::Message;
 use fractal_api::r0::filter::RoomEventFilter;
 use fractal_api::r0::message::get_message_events::request as get_messages_events_req;
 use fractal_api::r0::message::get_message_events::Direction as GetMessagesEventsDirection;
diff --git a/fractal-gtk/src/backend/room.rs b/fractal-gtk/src/backend/room.rs
index e8c7f9d6..6aa8f8d2 100644
--- a/fractal-gtk/src/backend/room.rs
+++ b/fractal-gtk/src/backend/room.rs
@@ -20,9 +20,11 @@ use crate::backend::HTTP_CLIENT;
 use crate::util::cache_dir_path;
 
 use crate::error::StandardErrorResponse;
-use crate::types::Member;
-use crate::types::Message;
-use crate::types::{Room, RoomMembership, RoomTag};
+use crate::model::{
+    member::Member,
+    message::Message,
+    room::{Room, RoomMembership, RoomTag},
+};
 use fractal_api::r0::config::get_global_account_data::request as get_global_account_data;
 use fractal_api::r0::config::get_global_account_data::Parameters as GetGlobalAccountDataParameters;
 use fractal_api::r0::config::set_global_account_data::request as set_global_account_data;
diff --git a/fractal-gtk/src/backend/sync.rs b/fractal-gtk/src/backend/sync.rs
index be7198fc..460b3795 100644
--- a/fractal-gtk/src/backend/sync.rs
+++ b/fractal-gtk/src/backend/sync.rs
@@ -1,12 +1,12 @@
 use crate::client::ProxySettings;
 use crate::error::{Error, StandardErrorResponse};
 use crate::globals;
-use crate::types::Event;
-use crate::types::Member;
-use crate::types::Message;
-use crate::types::Room;
-use crate::types::RoomMembership;
-use crate::types::RoomTag;
+use crate::model::{
+    event::Event,
+    member::Member,
+    message::Message,
+    room::{Room, RoomMembership, RoomTag},
+};
 use fractal_api::r0::filter::EventFilter;
 use fractal_api::r0::filter::Filter;
 use fractal_api::r0::filter::RoomEventFilter;
diff --git a/fractal-gtk/src/backend/user.rs b/fractal-gtk/src/backend/user.rs
index 6c4221d8..f2690f27 100644
--- a/fractal-gtk/src/backend/user.rs
+++ b/fractal-gtk/src/backend/user.rs
@@ -17,7 +17,7 @@ use std::path::PathBuf;
 use std::sync::mpsc::Sender;
 use std::thread;
 
-use crate::types::Member;
+use crate::model::member::Member;
 use fractal_api::identity::r0::association::msisdn::submit_token::request as submit_phone_token_req;
 use fractal_api::identity::r0::association::msisdn::submit_token::Body as SubmitPhoneTokenBody;
 use fractal_api::identity::r0::association::msisdn::submit_token::Response as SubmitPhoneTokenResponse;
diff --git a/fractal-gtk/src/cache/mod.rs b/fractal-gtk/src/cache/mod.rs
index 8a8dc78a..913f99eb 100644
--- a/fractal-gtk/src/cache/mod.rs
+++ b/fractal-gtk/src/cache/mod.rs
@@ -10,8 +10,7 @@ use gtk::LabelExt;
 use serde::{Deserialize, Serialize};
 use std::thread;
 
-use crate::types::Room;
-use crate::types::RoomList;
+use crate::model::room::{Room, RoomList};
 use anyhow::Error;
 use fractal_api::identifiers::{DeviceId, UserId};
 use std::collections::HashMap;
diff --git a/fractal-gtk/src/cache/state.rs b/fractal-gtk/src/cache/state.rs
index 19bc1212..18833be8 100644
--- a/fractal-gtk/src/cache/state.rs
+++ b/fractal-gtk/src/cache/state.rs
@@ -9,8 +9,7 @@ use std::cell::RefCell;
 use std::fs::remove_dir_all;
 use std::sync::{Arc, Mutex, MutexGuard};
 
-use crate::types::Message;
-use crate::types::Room;
+use crate::model::{message::Message, room::Room};
 use crate::util::cache_dir_path;
 use fractal_api::identifiers::{DeviceId, UserId};
 
diff --git a/fractal-gtk/src/main.rs b/fractal-gtk/src/main.rs
index 7f4f9849..586a77e0 100644
--- a/fractal-gtk/src/main.rs
+++ b/fractal-gtk/src/main.rs
@@ -21,7 +21,6 @@ mod widgets;
 
 mod appop;
 
-mod types;
 use std::error::Error;
 
 use crate::app::App;
diff --git a/fractal-gtk/src/meson.build b/fractal-gtk/src/meson.build
index 6b548a1c..e86770af 100644
--- a/fractal-gtk/src/meson.build
+++ b/fractal-gtk/src/meson.build
@@ -121,7 +121,6 @@ app_sources = files(
   'globals.rs',
   'main.rs',
   'passwd.rs',
-  'types.rs',
   'uibuilder.rs',
   'uitypes.rs'
 )
diff --git a/fractal-gtk/src/uitypes.rs b/fractal-gtk/src/uitypes.rs
index 0ecdfc18..319dce7e 100644
--- a/fractal-gtk/src/uitypes.rs
+++ b/fractal-gtk/src/uitypes.rs
@@ -1,4 +1,4 @@
-use crate::types::Message;
+use crate::model::message::Message;
 use crate::widgets;
 use chrono::prelude::DateTime;
 use chrono::prelude::Local;
diff --git a/fractal-gtk/src/widgets/autocomplete.rs b/fractal-gtk/src/widgets/autocomplete.rs
index 5be90826..ca713824 100644
--- a/fractal-gtk/src/widgets/autocomplete.rs
+++ b/fractal-gtk/src/widgets/autocomplete.rs
@@ -8,7 +8,7 @@ use std::sync::{Arc, Mutex};
 use gtk::prelude::*;
 use gtk::TextTag;
 
-use crate::types::Member;
+use crate::model::member::Member;
 
 use crate::appop::AppOp;
 use crate::widgets;
diff --git a/fractal-gtk/src/widgets/media_viewer.rs b/fractal-gtk/src/widgets/media_viewer.rs
index d85d7e20..6ef0d563 100644
--- a/fractal-gtk/src/widgets/media_viewer.rs
+++ b/fractal-gtk/src/widgets/media_viewer.rs
@@ -19,8 +19,7 @@ use gtk::prelude::*;
 use gtk::Overlay;
 use libhandy::HeaderBarExt;
 
-use crate::types::Message;
-use crate::types::Room;
+use crate::model::{message::Message, room::Room};
 
 use crate::uitypes::RowType;
 use crate::widgets::image;
diff --git a/fractal-gtk/src/widgets/member.rs b/fractal-gtk/src/widgets/member.rs
index 9c6b8628..1832c6af 100644
--- a/fractal-gtk/src/widgets/member.rs
+++ b/fractal-gtk/src/widgets/member.rs
@@ -1,6 +1,6 @@
 use gtk::prelude::*;
 
-use crate::types::Member;
+use crate::model::member::Member;
 
 use crate::appop::AppOp;
 
diff --git a/fractal-gtk/src/widgets/members_list.rs b/fractal-gtk/src/widgets/members_list.rs
index 0e142016..69f2f729 100644
--- a/fractal-gtk/src/widgets/members_list.rs
+++ b/fractal-gtk/src/widgets/members_list.rs
@@ -7,7 +7,7 @@ use std::rc::Rc;
 use glib::signal;
 use gtk::prelude::*;
 
-use crate::types::Member;
+use crate::model::member::Member;
 use crate::util::i18n::i18n;
 use crate::widgets;
 use crate::widgets::avatar::{AvatarBadgeColor, AvatarExt};
diff --git a/fractal-gtk/src/widgets/room.rs b/fractal-gtk/src/widgets/room.rs
index 0bf4267f..d23ed319 100644
--- a/fractal-gtk/src/widgets/room.rs
+++ b/fractal-gtk/src/widgets/room.rs
@@ -4,7 +4,7 @@ use crate::backend::room;
 use gtk::prelude::*;
 use std::thread;
 
-use crate::types::Room;
+use crate::model::room::Room;
 
 use crate::util::markup_text;
 
diff --git a/fractal-gtk/src/widgets/room_settings.rs b/fractal-gtk/src/widgets/room_settings.rs
index 878a2873..b3e42f89 100644
--- a/fractal-gtk/src/widgets/room_settings.rs
+++ b/fractal-gtk/src/widgets/room_settings.rs
@@ -14,8 +14,7 @@ use gtk::prelude::*;
 use crate::actions;
 use crate::actions::{ButtonState, StateExt};
 use crate::app::App;
-use crate::types::Member;
-use crate::types::Room;
+use crate::model::{member::Member, room::Room};
 use crate::util::markup_text;
 use crate::widgets;
 use crate::widgets::avatar::AvatarExt;
diff --git a/fractal-gtk/src/widgets/roomlist.rs b/fractal-gtk/src/widgets/roomlist.rs
index 09c8a843..2408f905 100644
--- a/fractal-gtk/src/widgets/roomlist.rs
+++ b/fractal-gtk/src/widgets/roomlist.rs
@@ -8,7 +8,7 @@ use log::info;
 use std::collections::HashMap;
 
 use crate::globals;
-use crate::types::{Room, RoomTag};
+use crate::model::room::{Room, RoomTag};
 use crate::widgets::roomrow::RoomRow;
 use std::convert::TryFrom;
 use std::sync::atomic::{AtomicBool, Ordering};
diff --git a/fractal-gtk/src/widgets/roomrow.rs b/fractal-gtk/src/widgets/roomrow.rs
index 70bbf4be..e2fa4fe0 100644
--- a/fractal-gtk/src/widgets/roomrow.rs
+++ b/fractal-gtk/src/widgets/roomrow.rs
@@ -1,7 +1,7 @@
 use fractal_api::url::Url;
 use gtk::prelude::*;
 
-use crate::types::Room;
+use crate::model::room::Room;
 
 use crate::widgets;
 use crate::widgets::AvatarExt;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]