refactor: Move friend and group in model directory

2024-03-22 14:00:36 +08:00 · 2017-07-29 20:39:14 +03:00 · 2017-07-29 20:39:14 +03:00 · 017653470d
commit 017653470d
parent 7f3887f67c
27 changed files with 45 additions and 45 deletions
--- 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
--- 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 \
--- 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"
--- a/src/friendlist.cpp
+++ b/src/friendlist.cpp
@ -17,8 +17,8 @@
    along with qTox.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "friend.h"
 #include "friendlist.h"
+#include "src/model/friend.h"
 #include "src/persistence/settings.h"
 #include <QDebug>
 #include <QHash>
--- a/src/grouplist.cpp
+++ b/src/grouplist.cpp
@ -18,7 +18,7 @@
 */

 #include "grouplist.h"
-#include "group.h"
+#include "src/model/group.h"
 #include <QDebug>
 #include <QHash>

--- a/src/model/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"
--- a/src/model/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 <QObject>
 #include <QString>
--- a/src/model/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 <QDebug>
 #include <QTimer>

--- a/src/model/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.

--- 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"
--- 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"
--- 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"
--- 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"
--- 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 <QDialog>


--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- a/src/widget/form/tabcompleter.cpp
+++ b/src/widget/form/tabcompleter.cpp
@ -26,7 +26,7 @@
 #include <QRegExp>

 #include "src/core/core.h"
-#include "src/group.h"
+#include "src/model/group.h"
 #include "src/widget/tool/chattextedit.h"

 /**
--- 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 <QMap>
 #include <QString>
--- 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 <cassert>

--- 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 <QDragEnterEvent>
--- 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"
--- 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"
--- 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 <QDialog>


--- 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"