From 017653470d8d1db3f5dea0c1ef1f5a1cedb181ac Mon Sep 17 00:00:00 2001 From: Diadlo Date: Sat, 29 Jul 2017 20:39:14 +0300 Subject: [PATCH] refactor: Move friend and group in model directory --- CMakeLists.txt | 8 ++++---- qtox.pro | 8 ++++---- src/core/coreav.cpp | 4 ++-- src/friendlist.cpp | 2 +- src/grouplist.cpp | 2 +- src/{ => model}/friend.cpp | 2 +- src/{ => model}/friend.h | 4 ++-- src/{ => model}/group.cpp | 10 +++++----- src/{ => model}/group.h | 2 +- src/persistence/offlinemsgengine.cpp | 2 +- src/video/groupnetcamview.cpp | 2 +- src/video/netcamview.cpp | 2 +- src/video/videosurface.cpp | 2 +- src/widget/about/aboutuser.h | 2 +- src/widget/circlewidget.cpp | 2 +- src/widget/contentdialog.cpp | 4 ++-- src/widget/form/chatform.cpp | 2 +- src/widget/form/genericchatform.cpp | 4 ++-- src/widget/form/groupchatform.cpp | 4 ++-- src/widget/form/tabcompleter.cpp | 2 +- src/widget/form/tabcompleter.h | 2 +- src/widget/friendlistlayout.cpp | 2 +- src/widget/friendlistwidget.cpp | 2 +- src/widget/friendwidget.cpp | 4 ++-- src/widget/groupwidget.cpp | 4 ++-- src/widget/tool/removefrienddialog.h | 2 +- src/widget/widget.cpp | 4 ++-- 27 files changed, 45 insertions(+), 45 deletions(-) rename src/{ => model}/friend.cpp (99%) rename src/{ => model}/friend.h (96%) rename src/{ => model}/group.cpp (95%) rename src/{ => model}/group.h (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a644d32da..6daa0a55d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,18 +243,18 @@ set(${PROJECT_NAME}_SOURCES src/core/toxpk.h src/core/toxstring.cpp src/core/toxstring.h - src/friend.cpp - src/friend.h src/friendlist.cpp src/friendlist.h - src/group.cpp - src/group.h src/groupinvite.cpp src/groupinvite.h src/grouplist.cpp src/grouplist.h src/ipc.cpp src/ipc.h + src/model/friend.cpp + src/model/friend.h + src/model/group.cpp + src/model/group.h src/net/autoupdate.cpp src/net/autoupdate.h src/net/avatarbroadcaster.cpp diff --git a/qtox.pro b/qtox.pro index c400e6688..db968bdc4 100644 --- a/qtox.pro +++ b/qtox.pro @@ -365,12 +365,12 @@ HEADERS += \ src/core/toxid.h \ src/core/toxpk.h \ src/core/toxstring.h \ - src/friend.h \ src/friendlist.h \ - src/group.h \ src/groupinvite.h \ src/grouplist.h \ src/ipc.h \ + src/model/friend.h \ + src/model/group.h \ src/net/autoupdate.h \ src/net/avatarbroadcaster.h \ src/net/toxme.h \ @@ -486,13 +486,13 @@ SOURCES += \ src/core/toxid.cpp \ src/core/toxpk.cpp \ src/core/toxstring.cpp \ - src/friend.cpp \ src/friendlist.cpp \ - src/group.cpp \ src/groupinvite.cpp \ src/grouplist.cpp \ src/ipc.cpp \ src/main.cpp \ + src/model/friend.cpp \ + src/model/group.cpp \ src/net/autoupdate.cpp \ src/net/avatarbroadcaster.cpp \ src/net/toxme.cpp \ diff --git a/src/core/coreav.cpp b/src/core/coreav.cpp index 7ff001728..eae3a7d7c 100644 --- a/src/core/coreav.cpp +++ b/src/core/coreav.cpp @@ -21,8 +21,8 @@ #include "core.h" #include "coreav.h" #include "src/audio/audio.h" -#include "src/friend.h" -#include "src/group.h" +#include "src/model/friend.h" +#include "src/model/group.h" #include "src/persistence/settings.h" #include "src/video/corevideosource.h" #include "src/video/videoframe.h" diff --git a/src/friendlist.cpp b/src/friendlist.cpp index 8c05eaa14..ef1878a76 100644 --- a/src/friendlist.cpp +++ b/src/friendlist.cpp @@ -17,8 +17,8 @@ along with qTox. If not, see . */ -#include "friend.h" #include "friendlist.h" +#include "src/model/friend.h" #include "src/persistence/settings.h" #include #include diff --git a/src/grouplist.cpp b/src/grouplist.cpp index e2c5d4708..fe93697e7 100644 --- a/src/grouplist.cpp +++ b/src/grouplist.cpp @@ -18,7 +18,7 @@ */ #include "grouplist.h" -#include "group.h" +#include "src/model/group.h" #include #include diff --git a/src/friend.cpp b/src/model/friend.cpp similarity index 99% rename from src/friend.cpp rename to src/model/friend.cpp index 622151f3c..27eb8cff0 100644 --- a/src/friend.cpp +++ b/src/model/friend.cpp @@ -20,7 +20,7 @@ #include "friend.h" #include "src/core/core.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/grouplist.h" #include "src/nexus.h" #include "src/persistence/profile.h" diff --git a/src/friend.h b/src/model/friend.h similarity index 96% rename from src/friend.h rename to src/model/friend.h index a8172b5f6..3f5ec0aec 100644 --- a/src/friend.h +++ b/src/model/friend.h @@ -1,5 +1,5 @@ /* - Copyright © 2014-2015 by The qTox Project Contributors + Copyright © 2014-2017 by The qTox Project Contributors This file is part of qTox, a Qt-based graphical interface for Tox. @@ -20,7 +20,7 @@ #ifndef FRIEND_H #define FRIEND_H -#include "core/toxid.h" +#include "src/core/toxid.h" #include "src/core/corestructs.h" #include #include diff --git a/src/group.cpp b/src/model/group.cpp similarity index 95% rename from src/group.cpp rename to src/model/group.cpp index baa6eccd9..78a8754f6 100644 --- a/src/group.cpp +++ b/src/model/group.cpp @@ -1,5 +1,5 @@ /* - Copyright © 2014-2015 by The qTox Project Contributors + Copyright © 2014-2017 by The qTox Project Contributors This file is part of qTox, a Qt-based graphical interface for Tox. @@ -19,12 +19,12 @@ #include "group.h" #include "friend.h" -#include "friendlist.h" +#include "src/friendlist.h" #include "src/core/core.h" #include "src/persistence/settings.h" -#include "widget/form/groupchatform.h" -#include "widget/groupwidget.h" -#include "widget/gui.h" +#include "src/widget/form/groupchatform.h" +#include "src/widget/groupwidget.h" +#include "src/widget/gui.h" #include #include diff --git a/src/group.h b/src/model/group.h similarity index 97% rename from src/group.h rename to src/model/group.h index 61b00df29..bd18852ce 100644 --- a/src/group.h +++ b/src/model/group.h @@ -1,5 +1,5 @@ /* - Copyright © 2014-2015 by The qTox Project Contributors + Copyright © 2014-2017 by The qTox Project Contributors This file is part of qTox, a Qt-based graphical interface for Tox. diff --git a/src/persistence/offlinemsgengine.cpp b/src/persistence/offlinemsgengine.cpp index d8b1f3db7..74db56737 100644 --- a/src/persistence/offlinemsgengine.cpp +++ b/src/persistence/offlinemsgengine.cpp @@ -19,7 +19,7 @@ #include "offlinemsgengine.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/nexus.h" #include "src/persistence/profile.h" #include "src/persistence/settings.h" diff --git a/src/video/groupnetcamview.cpp b/src/video/groupnetcamview.cpp index 00e1d820d..227ce7ed7 100644 --- a/src/video/groupnetcamview.cpp +++ b/src/video/groupnetcamview.cpp @@ -20,7 +20,7 @@ #include "groupnetcamview.h" #include "src/audio/audio.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" #include "src/nexus.h" #include "src/persistence/profile.h" diff --git a/src/video/netcamview.cpp b/src/video/netcamview.cpp index eee9214ba..1575d9406 100644 --- a/src/video/netcamview.cpp +++ b/src/video/netcamview.cpp @@ -20,7 +20,7 @@ #include "netcamview.h" #include "camerasource.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" #include "src/nexus.h" #include "src/persistence/profile.h" diff --git a/src/video/videosurface.cpp b/src/video/videosurface.cpp index 9ed7ad9b3..09263d20a 100644 --- a/src/video/videosurface.cpp +++ b/src/video/videosurface.cpp @@ -19,7 +19,7 @@ #include "videosurface.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" #include "src/persistence/settings.h" #include "src/video/videoframe.h" diff --git a/src/widget/about/aboutuser.h b/src/widget/about/aboutuser.h index bacfef583..36d431ae0 100644 --- a/src/widget/about/aboutuser.h +++ b/src/widget/about/aboutuser.h @@ -1,7 +1,7 @@ #ifndef ABOUTUSER_H #define ABOUTUSER_H -#include "src/friend.h" +#include "src/model/friend.h" #include diff --git a/src/widget/circlewidget.cpp b/src/widget/circlewidget.cpp index 1fde70c6c..497fcbf8c 100644 --- a/src/widget/circlewidget.cpp +++ b/src/widget/circlewidget.cpp @@ -33,7 +33,7 @@ #include "widget.h" #include "tool/croppinglabel.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" #include "src/persistence/settings.h" diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp index 441b43c29..980e60b2d 100644 --- a/src/widget/contentdialog.cpp +++ b/src/widget/contentdialog.cpp @@ -33,9 +33,9 @@ #include "style.h" #include "widget.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/grouplist.h" #include "src/persistence/settings.h" #include "src/widget/form/chatform.h" diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp index e017b8293..9e6612a1b 100644 --- a/src/widget/form/chatform.cpp +++ b/src/widget/form/chatform.cpp @@ -27,7 +27,7 @@ #include "src/chatlog/content/text.h" #include "src/core/core.h" #include "src/core/coreav.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/nexus.h" #include "src/persistence/offlinemsgengine.h" #include "src/persistence/profile.h" diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index de6b52cf6..b6b668052 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -22,9 +22,9 @@ #include "src/chatlog/chatlog.h" #include "src/chatlog/content/timestamp.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/grouplist.h" #include "src/persistence/settings.h" #include "src/persistence/smileypack.h" diff --git a/src/widget/form/groupchatform.cpp b/src/widget/form/groupchatform.cpp index c725992f1..45e1d56f1 100644 --- a/src/widget/form/groupchatform.cpp +++ b/src/widget/form/groupchatform.cpp @@ -27,9 +27,9 @@ #include "tabcompleter.h" #include "src/core/core.h" #include "src/core/coreav.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/video/groupnetcamview.h" #include "src/widget/flowlayout.h" #include "src/widget/form/chatform.h" diff --git a/src/widget/form/tabcompleter.cpp b/src/widget/form/tabcompleter.cpp index a21f1401b..b9fdfce8c 100644 --- a/src/widget/form/tabcompleter.cpp +++ b/src/widget/form/tabcompleter.cpp @@ -26,7 +26,7 @@ #include #include "src/core/core.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/widget/tool/chattextedit.h" /** diff --git a/src/widget/form/tabcompleter.h b/src/widget/form/tabcompleter.h index 4775dccfa..84335914a 100644 --- a/src/widget/form/tabcompleter.h +++ b/src/widget/form/tabcompleter.h @@ -23,7 +23,7 @@ #ifndef TABCOMPLETER_H #define TABCOMPLETER_H -#include "src/group.h" +#include "src/model/group.h" #include "src/widget/tool/chattextedit.h" #include #include diff --git a/src/widget/friendlistlayout.cpp b/src/widget/friendlistlayout.cpp index ac82601b4..5a4647db1 100644 --- a/src/widget/friendlistlayout.cpp +++ b/src/widget/friendlistlayout.cpp @@ -15,7 +15,7 @@ #include "friendlistlayout.h" #include "friendlistwidget.h" #include "friendwidget.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" #include diff --git a/src/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp index c1a2bf78f..e88df70a7 100644 --- a/src/widget/friendlistwidget.cpp +++ b/src/widget/friendlistwidget.cpp @@ -23,7 +23,7 @@ #include "friendwidget.h" #include "groupwidget.h" #include "widget.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" #include "src/persistence/settings.h" #include diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp index e3d9f2dc7..e738ce027 100644 --- a/src/widget/friendwidget.cpp +++ b/src/widget/friendwidget.cpp @@ -24,9 +24,9 @@ #include "maskablepixmapwidget.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/grouplist.h" #include "src/persistence/settings.h" #include "src/widget/about/aboutuser.h" diff --git a/src/widget/groupwidget.cpp b/src/widget/groupwidget.cpp index 95cfc38d7..90041f18b 100644 --- a/src/widget/groupwidget.cpp +++ b/src/widget/groupwidget.cpp @@ -31,9 +31,9 @@ #include "maskablepixmapwidget.h" #include "form/groupchatform.h" #include "src/core/core.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/grouplist.h" #include "src/widget/friendwidget.h" #include "src/widget/style.h" diff --git a/src/widget/tool/removefrienddialog.h b/src/widget/tool/removefrienddialog.h index b74ba0fb5..5b6489f45 100644 --- a/src/widget/tool/removefrienddialog.h +++ b/src/widget/tool/removefrienddialog.h @@ -3,7 +3,7 @@ #include "ui_removefrienddialog.h" -#include "src/friend.h" +#include "src/model/friend.h" #include diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 65ae0587c..f762ed0ee 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -51,9 +51,9 @@ #include "src/audio/audio.h" #include "src/core/core.h" #include "src/core/coreav.h" -#include "src/friend.h" +#include "src/model/friend.h" #include "src/friendlist.h" -#include "src/group.h" +#include "src/model/group.h" #include "src/grouplist.h" #include "src/net/autoupdate.h" #include "src/nexus.h"