Reorganize files

qtox.pro

@@ -33,7 +33,7 @@ FORMS    += \
     src/chatlog/content/filetransferwidget.ui \
     src/widget/form/settings/advancedsettings.ui \
     src/android.ui \
-    src/widget/loginscreen.ui
+    src/loginscreen.ui
     
 CONFIG   += c++11
 
@@ -113,8 +113,8 @@ contains(JENKINS,YES) {
 }
 
 contains(DEFINES, QTOX_FILTER_AUDIO) {
-    HEADERS += src/audiofilterer.h
-    SOURCES += src/audiofilterer.cpp
+    HEADERS += src/audio/audiofilterer.h
+    SOURCES += src/audio/audiofilterer.cpp
 }
 
 contains(DEFINES, QTOX_PLATFORM_EXT) {
@@ -304,16 +304,16 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/group.h \
         src/grouplist.h \
         src/friendlist.h \
-        src/misc/smileypack.h \
+        src/persistence/smileypack.h \
         src/widget/emoticonswidget.h \
-        src/misc/style.h \
-        src/widget/croppinglabel.h \
+        src/widget/style.h \
+        src/widget/tool/croppinglabel.h \
         src/widget/maskablepixmapwidget.h \
-        src/widget/videosurface.h \
-        src/widget/toxuri.h \
-        src/toxdns.h \
-        src/widget/toxsave.h \
-        src/misc/serialize.h \
+        src/video/videosurface.h \
+        src/net/toxuri.h \
+        src/net/toxdns.h \
+        src/persistence/toxsave.h \
+        src/persistence/serialize.h \
         src/chatlog/chatlog.h \
         src/chatlog/chatline.h \
         src/chatlog/chatlinecontent.h \
@@ -329,7 +329,7 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/chatlog/content/timestamp.h \
         src/chatlog/documentcache.h \
         src/chatlog/pixmapcache.h \
-        src/offlinemsgengine.h \
+        src/persistence/offlinemsgengine.h \
         src/widget/form/addfriendform.h \
         src/widget/form/chatform.h \
         src/widget/form/groupchatform.h \
@@ -345,7 +345,7 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/friendwidget.h \
         src/widget/groupwidget.h \
         src/widget/widget.h \
-        src/widget/netcamview.h \
+        src/video/netcamview.h \
         src/widget/friendlistwidget.h \
         src/widget/genericchatroomwidget.h \
         src/widget/form/genericchatform.h \
@@ -353,12 +353,12 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/form/loadhistorydialog.h \
         src/widget/form/setpassworddialog.h \
         src/widget/form/tabcompleter.h \
-        src/misc/flowlayout.h \
+        src/widget/flowlayout.h \
         src/ipc.h \
-        src/autoupdate.h \
-        src/widget/callconfirmwidget.h \
+        src/net/autoupdate.h \
+        src/widget/tool/callconfirmwidget.h \
         src/widget/systemtrayicon.h \
-        src/misc/qrwidget.h \
+        src/widget/qrwidget.h \
         src/widget/systemtrayicon_private.h \
         src/widget/loginscreen.h
 
@@ -373,16 +373,16 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/tool/chattextedit.cpp \
         src/widget/tool/friendrequestdialog.cpp \
         src/widget/widget.cpp \
-        src/widget/netcamview.cpp \
+        src/video/netcamview.cpp \
         src/widget/friendlistwidget.cpp \
         src/widget/adjustingscrollarea.cpp \
         src/widget/form/loadhistorydialog.cpp \
         src/widget/form/setpassworddialog.cpp \
         src/widget/form/tabcompleter.cpp \
-        src/misc/flowlayout.cpp \
+        src/widget/flowlayout.cpp \
         src/ipc.cpp \
-        src/autoupdate.cpp \
-        src/widget/callconfirmwidget.cpp \
+        src/net/autoupdate.cpp \
+        src/widget/tool/callconfirmwidget.cpp \
         src/widget/systemtrayicon.cpp \
         src/widget/groupwidget.cpp \
         src/widget/friendwidget.cpp \
@@ -393,16 +393,16 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/friendlist.cpp \
         src/group.cpp \
         src/grouplist.cpp \
-        src/misc/smileypack.cpp \
+        src/persistence/smileypack.cpp \
         src/widget/emoticonswidget.cpp \
-        src/misc/style.cpp \
-        src/widget/croppinglabel.cpp \
+        src/widget/style.cpp \
+        src/widget/tool/croppinglabel.cpp \
         src/widget/maskablepixmapwidget.cpp \
-        src/widget/videosurface.cpp \
-        src/widget/toxuri.cpp \
-        src/toxdns.cpp \
-        src/widget/toxsave.cpp \
-        src/misc/serialize.cpp \
+        src/video/videosurface.cpp \
+        src/net/toxuri.cpp \
+        src/net/toxdns.cpp \
+        src/persistence/toxsave.cpp \
+        src/persistence/serialize.cpp \
         src/chatlog/chatlog.cpp \
         src/chatlog/chatline.cpp \
         src/chatlog/chatlinecontent.cpp \
@@ -418,8 +418,8 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/chatlog/content/timestamp.cpp \
         src/chatlog/documentcache.cpp \
         src/chatlog/pixmapcache.cpp \
-        src/offlinemsgengine.cpp \
-        src/misc/qrwidget.cpp \
+        src/persistence/offlinemsgengine.cpp \
+        src/widget/qrwidget.cpp \
         src/widget/genericchatroomwidget.cpp \
         src/widget/loginscreen.cpp
 }
@@ -449,26 +449,26 @@ macx {
 }
 
 SOURCES += \
-    src/audio.cpp \
-    src/historykeeper.cpp \
+    src/audio/audio.cpp \
+    src/persistence/historykeeper.cpp \
     src/main.cpp \
     src/nexus.cpp \
-    src/misc/cdata.cpp \
-    src/misc/cstring.cpp \
-    src/misc/settings.cpp \
-    src/misc/db/genericddinterface.cpp \
-    src/misc/db/plaindb.cpp \
-    src/misc/db/encrypteddb.cpp \
+    src/core/cdata.cpp \
+    src/core/cstring.cpp \
+    src/persistence/settings.cpp \
+    src/persistence/db/genericddinterface.cpp \
+    src/persistence/db/plaindb.cpp \
+    src/persistence/db/encrypteddb.cpp \
     src/video/videoframe.cpp \
     src/widget/gui.cpp \
-    src/toxme.cpp \
+    src/net/toxme.cpp \
     src/core/core.cpp \
     src/core/coreav.cpp \
     src/core/coreencryption.cpp \
     src/core/corefile.cpp \
     src/core/corestructs.cpp \
-    src/profilelocker.cpp \
-    src/avatarbroadcaster.cpp \
+    src/persistence/profilelocker.cpp \
+    src/net/avatarbroadcaster.cpp \
     src/widget/tool/screenshotgrabber.cpp \
     src/widget/tool/screengrabberchooserrectitem.cpp \
     src/widget/tool/screengrabberoverlayitem.cpp \
@@ -479,30 +479,30 @@ SOURCES += \
     src/video/camerasource.cpp \
     src/video/corevideosource.cpp \
     src/core/toxid.cpp \
-    src/profile.cpp \
-    src/translator.cpp
+    src/persistence/profile.cpp \
+    src/widget/translator.cpp
 
 HEADERS += \
-    src/audio.h \
+    src/audio/audio.h \
     src/core/core.h \
     src/core/coreav.h \
     src/core/coredefines.h \
     src/core/corefile.h \
     src/core/corestructs.h \
-    src/historykeeper.h \
+    src/persistence/historykeeper.h \
     src/nexus.h \
-    src/misc/cdata.h \
-    src/misc/cstring.h \
-    src/misc/settings.h \
-    src/misc/db/genericddinterface.h \
-    src/misc/db/plaindb.h \
-    src/misc/db/encrypteddb.h \
+    src/core/cdata.h \
+    src/core/cstring.h \
+    src/persistence/settings.h \
+    src/persistence/db/genericddinterface.h \
+    src/persistence/db/plaindb.h \
+    src/persistence/db/encrypteddb.h \
     src/video/videoframe.h \
     src/video/videosource.h \
     src/widget/gui.h \
-    src/toxme.h \
-    src/profilelocker.h \
-    src/avatarbroadcaster.h \
+    src/net/toxme.h \
+    src/persistence/profilelocker.h \
+    src/net/avatarbroadcaster.h \
     src/widget/tool/screenshotgrabber.h \
     src/widget/tool/screengrabberchooserrectitem.h \
     src/widget/tool/screengrabberoverlayitem.h \
@@ -514,5 +514,5 @@ HEADERS += \
     src/video/corevideosource.h \
     src/video/videomode.h \
     src/core/toxid.h \
-    src/profile.h \
-    src/translator.h
+    src/persistence/profile.h \
+    src/widget/translator.h

src/chatlog/chatlog.cpp

@@ -15,7 +15,7 @@
 #include "chatlog.h"
 #include "chatmessage.h"
 #include "chatlinecontent.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 #include <QDebug>
 #include <QScrollBar>

src/chatlog/chatmessage.cpp

@@ -21,9 +21,9 @@
 #include "content/image.h"
 #include "content/notificationicon.h"
 
-#include "src/misc/settings.h"
-#include "src/misc/smileypack.h"
-#include "src/misc/style.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/smileypack.h"
+#include "src/widget/style.h"
 
 #define NAME_COL_WIDTH 90.0
 #define TIME_COL_WIDTH 90.0

src/chatlog/content/filetransferwidget.cpp

@@ -17,7 +17,7 @@
 
 #include "src/nexus.h"
 #include "src/core/core.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/widget/widget.h"
 
 #include <QMouseEvent>

src/chatlog/content/filetransferwidget.ui

@@ -435,7 +435,7 @@
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header>src/widget/croppinglabel.h</header>
+   <header location="global">src/widget/tool/croppinglabel.h</header>
   </customwidget>
  </customwidgets>
  <resources>

src/chatlog/customtextdocument.cpp

@@ -13,9 +13,9 @@
 */
 
 #include "customtextdocument.h"
-#include "../misc/settings.h"
-#include "../misc/smileypack.h"
-#include "../misc/style.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/smileypack.h"
+#include "src/widget/style.h"
 
 #include <QIcon>
 #include <QDebug>

src/core/core.cpp

@@ -16,15 +16,15 @@
 
 #include "core.h"
 #include "src/nexus.h"
-#include "src/misc/cdata.h"
-#include "src/misc/cstring.h"
-#include "src/misc/settings.h"
+#include "src/core/cdata.h"
+#include "src/core/cstring.h"
+#include "src/persistence/settings.h"
 #include "src/widget/gui.h"
-#include "src/historykeeper.h"
-#include "src/audio.h"
-#include "src/profilelocker.h"
-#include "src/avatarbroadcaster.h"
-#include "src/profile.h"
+#include "src/persistence/historykeeper.h"
+#include "src/audio/audio.h"
+#include "src/persistence/profilelocker.h"
+#include "src/net/avatarbroadcaster.h"
+#include "src/persistence/profile.h"
 #include "corefile.h"
 #include "src/video/camerasource.h"
 

src/core/coreav.cpp

@@ -18,11 +18,11 @@
 #include "src/video/camerasource.h"
 #include "src/video/corevideosource.h"
 #include "src/video/videoframe.h"
-#include "src/audio.h"
+#include "src/audio/audio.h"
 #ifdef QTOX_FILTER_AUDIO
-#include "src/audiofilterer.h"
+#include "src/audio/audiofilterer.h"
 #endif
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <assert.h>
 #include <QDebug>
 #include <QTimer>

src/core/coreencryption.cpp

@@ -18,11 +18,11 @@
 
 #include "core.h"
 #include "src/widget/gui.h"
-#include "src/misc/settings.h"
-#include "src/misc/cstring.h"
-#include "src/historykeeper.h"
+#include "src/persistence/settings.h"
+#include "src/core/cstring.h"
+#include "src/persistence/historykeeper.h"
 #include "src/nexus.h"
-#include "src/profile.h"
+#include "src/persistence/profile.h"
 #include <tox/tox.h>
 #include <tox/toxencryptsave.h>
 #include <QApplication>

src/core/corefile.cpp

@@ -1,8 +1,8 @@
 #include "core.h"
 #include "corefile.h"
 #include "corestructs.h"
-#include "src/misc/cstring.h"
-#include "src/misc/settings.h"
+#include "src/core/cstring.h"
+#include "src/persistence/settings.h"
 #include <QDebug>
 #include <QFile>
 #include <QThread>

src/friend.cpp

@@ -18,7 +18,7 @@
 #include "widget/form/chatform.h"
 #include "widget/gui.h"
 #include "src/core/core.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 
 Friend::Friend(uint32_t FriendId, const ToxId &UserId)
     : userName{Core::getInstance()->getPeerName(UserId)},

src/friendlist.cpp

@@ -14,7 +14,7 @@
 
 #include "friend.h"
 #include "friendlist.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QMenu>
 #include <QDebug>
 #include <QHash>

src/ipc.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "src/ipc.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QDebug>
 #include <QCoreApplication>
 #include <random>

src/main.cpp

@@ -13,16 +13,16 @@
 */
 
 #include "widget/widget.h"
-#include "misc/settings.h"
+#include "persistence/settings.h"
 #include "src/nexus.h"
 #include "src/ipc.h"
-#include "src/widget/toxuri.h"
-#include "src/widget/toxsave.h"
-#include "src/autoupdate.h"
-#include "src/profile.h"
-#include "src/profilelocker.h"
+#include "src/net/toxuri.h"
+#include "src/net/autoupdate.h"
+#include "src/persistence/toxsave.h"
+#include "src/persistence/profile.h"
+#include "src/persistence/profilelocker.h"
 #include "src/widget/loginscreen.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDateTime>

src/net/autoupdate.cpp

@@ -13,9 +13,9 @@
 */
 
 
-#include "src/autoupdate.h"
-#include "src/misc/serialize.h"
-#include "src/misc/settings.h"
+#include "src/net/autoupdate.h"
+#include "src/persistence/serialize.h"
+#include "src/persistence/settings.h"
 #include "src/widget/widget.h"
 #include "src/widget/gui.h"
 #include <QNetworkAccessManager>

src/net/toxdns.cpp

@@ -13,8 +13,8 @@
 */
 
 
-#include "src/toxdns.h"
-#include "src/misc/cdata.h"
+#include "src/net/toxdns.h"
+#include "src/core/cdata.h"
 #include <QMessageBox>
 #include <QCoreApplication>
 #include <QThread>

src/net/toxdns.h

@@ -16,8 +16,8 @@
 #ifndef QTOXDNS_H
 #define QTOXDNS_H
 
-#include "core/corestructs.h"
-#include "core/toxid.h"
+#include "src/core/corestructs.h"
+#include "src/core/toxid.h"
 #include <QDnsLookup>
 #include <QObject>
 

src/net/toxme.h

@@ -4,7 +4,7 @@
 #include <QString>
 #include <QMutex>
 #include <memory>
-#include "core/toxid.h"
+#include "src/core/toxid.h"
 
 class QNetworkAccessManager;
 

src/net/toxuri.cpp

@@ -13,8 +13,8 @@
 */
 
 
-#include "src/widget/toxuri.h"
-#include "src/toxdns.h"
+#include "src/net/toxuri.h"
+#include "src/net/toxdns.h"
 #include "src/widget/tool/friendrequestdialog.h"
 #include "src/nexus.h"
 #include "src/core/core.h"

src/nexus.cpp

@@ -1,7 +1,7 @@
 #include "nexus.h"
-#include "profile.h"
+#include "src/persistence/profile.h"
 #include "src/core/core.h"
-#include "misc/settings.h"
+#include "persistence/settings.h"
 #include "video/camerasource.h"
 #include "widget/gui.h"
 #include "widget/loginscreen.h"

src/persistence/db/encrypteddb.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "encrypteddb.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
 
 #include <tox/toxencryptsave.h>

src/persistence/historykeeper.cpp

@@ -13,10 +13,10 @@
 */
 
 #include "historykeeper.h"
-#include "misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
 #include "src/nexus.h"
-#include "src/profile.h"
+#include "src/persistence/profile.h"
 
 #include <QSqlError>
 #include <QFile>
@@ -26,8 +26,8 @@
 #include <QDebug>
 #include <QTemporaryFile>
 
-#include "misc/db/plaindb.h"
-#include "misc/db/encrypteddb.h"
+#include "src/persistence/db/plaindb.h"
+#include "src/persistence/db/encrypteddb.h"
 
 static HistoryKeeper *historyInstance = nullptr;
 

src/persistence/offlinemsgengine.cpp

@@ -14,8 +14,8 @@
 
 #include "offlinemsgengine.h"
 #include "src/friend.h"
-#include "src/historykeeper.h"
-#include "src/misc/settings.h"
+#include "src/persistence/historykeeper.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
 #include <QMutexLocker>
 #include <QTimer>

src/persistence/profile.cpp

@@ -1,8 +1,8 @@
 #include "profile.h"
 #include "profilelocker.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
-#include "src/historykeeper.h"
+#include "src/persistence/historykeeper.h"
 #include "src/widget/gui.h"
 #include "src/widget/widget.h"
 #include "src/nexus.h"
@@ -13,6 +13,7 @@
 #include <QThread>
 #include <QObject>
 #include <QDebug>
+
 QVector<QString> Profile::profiles;
 
 Profile::Profile(QString name, QString password, bool isNewProfile)

src/persistence/profilelocker.cpp

@@ -1,5 +1,5 @@
 #include "profilelocker.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QDir>
 #include <QDebug>
 

src/persistence/serialize.cpp

@@ -13,7 +13,7 @@
 */
 
 
-#include "src/misc/serialize.h"
+#include "src/persistence/serialize.h"
 
 QByteArray doubleToData(double num)
 {

src/persistence/settings.cpp

@@ -15,12 +15,12 @@
 */
 
 #include "settings.h"
-#include "smileypack.h"
+#include "src/persistence/smileypack.h"
+#include "src/persistence/db/plaindb.h"
 #include "src/core/corestructs.h"
-#include "src/misc/db/plaindb.h"
 #include "src/core/core.h"
 #include "src/widget/gui.h"
-#include "src/profilelocker.h"
+#include "src/persistence/profilelocker.h"
 #ifdef QTOX_PLATFORM_EXT
 #include "src/platform/autorun.h"
 #endif

src/persistence/smileypack.cpp

@@ -13,8 +13,8 @@
 */
 
 #include "smileypack.h"
-#include "settings.h"
-#include "style.h"
+#include "src/persistence/settings.h"
+#include "src/widget/style.h"
 
 #include <QFileInfo>
 #include <QFile>

src/persistence/toxsave.cpp

@@ -13,9 +13,9 @@
 */
 
 #include "toxsave.h"
-#include "gui.h"
+#include "src/widget/gui.h"
 #include "src/core/core.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QCoreApplication>
 #include <QFileInfo>
 

src/platform/autorun_win.cpp

@@ -15,7 +15,7 @@
 #include <QApplication>
 #ifdef Q_OS_WIN32
 #include "src/platform/autorun.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <windows.h>
 #include <string>
 

src/platform/autorun_xdg.cpp

@@ -15,7 +15,7 @@
 #include <QApplication>
 #if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
 #include "src/platform/autorun.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QProcessEnvironment>
 #include <QDir>
 

src/video/cameradevice.cpp

@@ -6,7 +6,7 @@ extern "C" {
 #include <libavdevice/avdevice.h>
 }
 #include "cameradevice.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 
 #ifdef Q_OS_WIN
 #include "src/platform/camera/directshow.h"

src/video/netcamview.cpp

@@ -14,7 +14,7 @@
 
 #include "netcamview.h"
 #include "src/core/core.h"
-#include "src/widget/videosurface.h"
+#include "src/video/videosurface.h"
 #include <QLabel>
 #include <QHBoxLayout>
 

src/widget/androidgui.cpp

@@ -7,7 +7,7 @@
 #include "src/friendlist.h"
 #include "src/group.h"
 #include "src/grouplist.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/misc/style.h"
 #include "src/nexus.h"
 #include "src/widget/friendwidget.h"

src/widget/emoticonswidget.cpp

@@ -13,9 +13,9 @@
 */
 
 #include "emoticonswidget.h"
-#include "src/misc/smileypack.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
+#include "src/widget/style.h"
+#include "src/persistence/smileypack.h"
+#include "src/persistence/settings.h"
 
 #include <QPushButton>
 #include <QRadioButton>

src/widget/form/addfriendform.cpp

@@ -22,11 +22,11 @@
 #include "ui_mainwindow.h"
 #include "src/nexus.h"
 #include "src/core/core.h"
-#include "src/misc/cdata.h"
-#include "src/toxdns.h"
-#include "src/misc/settings.h"
+#include "src/core/cdata.h"
+#include "src/net/toxdns.h"
+#include "src/persistence/settings.h"
 #include "src/widget/gui.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 AddFriendForm::AddFriendForm()
 {

src/widget/form/chatform.cpp

@@ -27,27 +27,27 @@
 #include "chatform.h"
 #include "src/core/core.h"
 #include "src/friend.h"
-#include "src/historykeeper.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
-#include "src/misc/cstring.h"
-#include "src/widget/callconfirmwidget.h"
+#include "src/persistence/historykeeper.h"
+#include "src/widget/style.h"
+#include "src/persistence/settings.h"
+#include "src/core/cstring.h"
+#include "src/widget/tool/callconfirmwidget.h"
 #include "src/widget/friendwidget.h"
-#include "src/widget/netcamview.h"
+#include "src/video/netcamview.h"
 #include "src/widget/form/loadhistorydialog.h"
 #include "src/widget/tool/chattextedit.h"
 #include "src/widget/widget.h"
 #include "src/widget/maskablepixmapwidget.h"
-#include "src/widget/croppinglabel.h"
+#include "src/widget/tool/croppinglabel.h"
 #include "src/chatlog/chatmessage.h"
 #include "src/chatlog/content/filetransferwidget.h"
 #include "src/chatlog/chatlinecontentproxy.h"
 #include "src/chatlog/content/text.h"
 #include "src/chatlog/chatlog.h"
-#include "src/offlinemsgengine.h"
+#include "src/persistence/offlinemsgengine.h"
 #include "src/widget/tool/screenshotgrabber.h"
 #include "src/widget/tool/flyoutoverlaywidget.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 ChatForm::ChatForm(Friend* chatFriend)
     : f(chatFriend)

src/widget/form/filesform.cpp

@@ -15,7 +15,7 @@
 #include "filesform.h"
 #include "ui_mainwindow.h"
 #include "src/widget/widget.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QFileInfo>
 #include <QUrl>
 #include <QDebug>

src/widget/form/genericchatform.cpp

@@ -21,11 +21,11 @@
 #include <QShortcut>
 #include <QKeyEvent>
 
-#include "src/misc/smileypack.h"
+#include "src/persistence/smileypack.h"
 #include "src/widget/emoticonswidget.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/widget/widget.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/widget/tool/chattextedit.h"
 #include "src/widget/maskablepixmapwidget.h"
 #include "src/core/core.h"
@@ -36,7 +36,7 @@
 #include "src/chatlog/chatlog.h"
 #include "src/chatlog/content/timestamp.h"
 #include "src/widget/tool/flyoutoverlaywidget.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 GenericChatForm::GenericChatForm(QWidget *parent)
   : QWidget(parent)

src/widget/form/groupchatform.cpp

@@ -17,13 +17,13 @@
 #include "src/group.h"
 #include "src/widget/groupwidget.h"
 #include "src/widget/tool/chattextedit.h"
-#include "src/widget/croppinglabel.h"
+#include "src/widget/tool/croppinglabel.h"
 #include "src/widget/maskablepixmapwidget.h"
 #include "src/core/core.h"
-#include "src/misc/style.h"
-#include "src/historykeeper.h"
-#include "src/misc/flowlayout.h"
-#include "src/translator.h"
+#include "src/widget/style.h"
+#include "src/persistence/historykeeper.h"
+#include "src/widget/flowlayout.h"
+#include "src/widget/translator.h"
 #include <QDebug>
 #include <QTimer>
 #include <QPushButton>

src/widget/form/profileform.cpp

@@ -20,15 +20,15 @@
 #include "src/widget/form/settingswidget.h"
 #include "src/widget/maskablepixmapwidget.h"
 #include "src/widget/form/setpassworddialog.h"
-#include "src/misc/settings.h"
-#include "src/widget/croppinglabel.h"
+#include "src/persistence/settings.h"
+#include "src/widget/tool/croppinglabel.h"
 #include "src/widget/widget.h"
 #include "src/widget/gui.h"
-#include "src/historykeeper.h"
-#include "src/misc/style.h"
-#include "src/profilelocker.h"
-#include "src/profile.h"
-#include "src/translator.h"
+#include "src/widget/style.h"
+#include "src/persistence/historykeeper.h"
+#include "src/persistence/profilelocker.h"
+#include "src/persistence/profile.h"
+#include "src/widget/translator.h"
 #include <QLabel>
 #include <QLineEdit>
 #include <QGroupBox>

src/widget/form/profileform.h

@@ -20,7 +20,7 @@
 #include <QTimer>
 #include <QVBoxLayout>
 #include "src/core/core.h"
-#include "src/misc/qrwidget.h"
+#include "src/widget/qrwidget.h"
 
 class CroppingLabel;
 class Core;

src/widget/form/profileform.ui

@@ -39,7 +39,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>579</width>
+        <width>585</width>
         <height>625</height>
        </rect>
       </property>
@@ -283,7 +283,7 @@ Profile does not contain your history.</string>
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header location="global">src/widget/croppinglabel.h</header>
+   <header location="global">src/widget/tool/croppinglabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/widget/form/settings/advancedform.cpp

@@ -15,10 +15,10 @@
 #include "ui_advancedsettings.h"
 
 #include "advancedform.h"
-#include "src/historykeeper.h"
-#include "src/misc/settings.h"
-#include "src/misc/db/plaindb.h"
-#include "src/translator.h"
+#include "src/persistence/historykeeper.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/db/plaindb.h"
+#include "src/widget/translator.h"
 
 AdvancedForm::AdvancedForm() :
     GenericForm(QPixmap(":/img/settings/general.png"))

src/widget/form/settings/avform.cpp

@@ -14,12 +14,12 @@
 
 #include "avform.h"
 #include "ui_avsettings.h"
-#include "src/misc/settings.h"
-#include "src/audio.h"
+#include "src/persistence/settings.h"
+#include "src/audio/audio.h"
 #include "src/video/camerasource.h"
 #include "src/video/cameradevice.h"
-#include "src/widget/videosurface.h"
-#include "src/translator.h"
+#include "src/video/videosurface.h"
+#include "src/widget/translator.h"
 
 #if defined(__APPLE__) && defined(__MACH__)
  #include <OpenAL/al.h>

src/widget/form/settings/generalform.cpp

@@ -16,13 +16,14 @@
 #include "generalform.h"
 #include "src/widget/form/settingswidget.h"
 #include "src/widget/widget.h"
-#include "src/misc/settings.h"
-#include "src/misc/smileypack.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/smileypack.h"
 #include "src/core/core.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/nexus.h"
-#include "src/profile.h"
-#include "src/translator.h"
+#include "src/persistence/profile.h"
+#include "src/widget/translator.h"
+#include "src/net/autoupdate.h"
 #include <QMessageBox>
 #include <QStyleFactory>
 #include <QTime>
@@ -30,8 +31,6 @@
 #include <QStandardPaths>
 #include <QDebug>
 
-#include "src/autoupdate.h"
-
 static QStringList locales = {"bg", "de", "en", "es", "fr", "hr", "hu", "it", "lt", "mannol", "nl", "no_nb", "pirate", "pl", "pt", "ru", "sl", "fi", "sv", "uk", "zh"};
 static QStringList langs = {"Български", "Deutsch", "English", "Español", "Français", "Hrvatski", "Magyar", "Italiano", "Lietuvių", "mannol", "Nederlands", "Norsk Bokmål", "Pirate", "Polski", "Português", "Русский", "Slovenščina", "Suomi", "Svenska", "Українська", "简体中文"};
 

src/widget/form/settings/privacyform.cpp

@@ -15,13 +15,13 @@
 #include "privacyform.h"
 #include "ui_privacysettings.h"
 #include "src/widget/form/settingswidget.h"
-#include "src/misc/settings.h"
-#include "src/historykeeper.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/historykeeper.h"
 #include "src/core/core.h"
 #include "src/widget/widget.h"
 #include "src/widget/gui.h"
 #include "src/widget/form/setpassworddialog.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QMessageBox>
 #include <QFile>
 #include <QDebug>

src/widget/form/settingswidget.cpp

@@ -20,7 +20,7 @@
 #include "src/widget/form/settings/privacyform.h"
 #include "src/widget/form/settings/avform.h"
 #include "src/widget/form/settings/advancedform.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QTabWidget>
 
 SettingsWidget::SettingsWidget(QWidget* parent)

src/widget/friendwidget.cpp

@@ -21,9 +21,9 @@
 #include "src/core/core.h"
 #include "form/chatform.h"
 #include "maskablepixmapwidget.h"
-#include "croppinglabel.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
+#include "src/widget/tool/croppinglabel.h"
+#include "src/widget/style.h"
+#include "src/persistence/settings.h"
 #include "src/widget/widget.h"
 #include <QContextMenuEvent>
 #include <QMenu>

src/widget/genericchatroomwidget.cpp

@@ -13,10 +13,10 @@
 */
 
 #include "genericchatroomwidget.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
+#include "src/widget/style.h"
+#include "src/persistence/settings.h"
 #include "maskablepixmapwidget.h"
-#include "croppinglabel.h"
+#include "src/widget/tool/croppinglabel.h"
 #include <QMouseEvent>
 #include <QStyle>
 

src/widget/groupwidget.cpp

@@ -15,10 +15,10 @@
 #include "groupwidget.h"
 #include "src/grouplist.h"
 #include "src/group.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "form/groupchatform.h"
 #include "maskablepixmapwidget.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/core/core.h"
 #include <QPalette>
 #include <QMenu>

src/widget/loginscreen.cpp

@@ -1,11 +1,11 @@
 #include "loginscreen.h"
 #include "ui_loginscreen.h"
-#include "src/profile.h"
-#include "src/profilelocker.h"
+#include "src/persistence/profile.h"
+#include "src/persistence/profilelocker.h"
 #include "src/nexus.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/widget/form/setpassworddialog.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QMessageBox>
 #include <QDebug>
 

src/widget/style.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "style.h"
-#include "settings.h"
+#include "src/persistence/settings.h"
 #include "src/widget/gui.h"
 
 #include <QFile>

src/widget/systemtrayicon.cpp

@@ -4,7 +4,7 @@
 #include <QMenu>
 #include <QFile>
 #include <QDebug>
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 
 SystemTrayIcon::SystemTrayIcon()
 {

src/widget/tool/callconfirmwidget.cpp

@@ -1,5 +1,5 @@
 #include "callconfirmwidget.h"
-#include "gui.h"
+#include "src/widget/gui.h"
 #include <assert.h>
 #include <QVBoxLayout>
 #include <QHBoxLayout>

src/widget/tool/chattextedit.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "chattextedit.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QKeyEvent>
 
 ChatTextEdit::ChatTextEdit(QWidget *parent) :

src/widget/translator.cpp

@@ -1,5 +1,5 @@
 #include "translator.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QApplication>
 #include <QString>
 #include <QLocale>

src/widget/widget.cpp

@@ -15,7 +15,7 @@
 #include "widget.h"
 #include "ui_mainwindow.h"
 #include "src/core/core.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/friend.h"
 #include "src/friendlist.h"
 #include "tool/friendrequestdialog.h"
@@ -24,19 +24,19 @@
 #include "src/group.h"
 #include "groupwidget.h"
 #include "form/groupchatform.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "friendlistwidget.h"
 #include "form/chatform.h"
 #include "maskablepixmapwidget.h"
-#include "src/historykeeper.h"
-#include "src/autoupdate.h"
-#include "src/audio.h"
+#include "src/persistence/historykeeper.h"
+#include "src/net/autoupdate.h"
+#include "src/audio/audio.h"
 #include "src/platform/timer.h"
 #include "systemtrayicon.h"
 #include "src/nexus.h"
 #include "src/widget/gui.h"
-#include "src/offlinemsgengine.h"
-#include "src/translator.h"
+#include "src/persistence/offlinemsgengine.h"
+#include "src/widget/translator.h"
 #include <cassert>
 #include <QMessageBox>
 #include <QDebug>