From b4a9f04f925770b221bf0341fe81b107784d0865 Mon Sep 17 00:00:00 2001 From: Diadlo Date: Tue, 15 Nov 2016 11:00:23 +0300 Subject: [PATCH] refactor: Added to include path and exclude it from all includes --- qtox.pro | 1 + src/audio/audio.cpp | 6 +- src/chatlog/chatlinecontentproxy.cpp | 2 +- src/chatlog/chatlog.cpp | 2 +- src/chatlog/chatmessage.cpp | 4 +- src/chatlog/chatmessage.h | 2 +- src/chatlog/content/filetransferwidget.cpp | 12 ++-- src/chatlog/content/filetransferwidget.h | 4 +- src/chatlog/content/text.cpp | 2 +- src/chatlog/customtextdocument.cpp | 6 +- src/core/core.cpp | 20 +++---- src/core/coreav.cpp | 12 ++-- src/core/coreav.h | 2 +- src/core/coreencryption.cpp | 12 ++-- src/core/corefile.cpp | 6 +- src/core/corestructs.cpp | 4 +- src/core/toxcall.cpp | 12 ++-- src/core/toxcall.h | 2 +- src/friend.cpp | 12 ++-- src/friend.h | 2 +- src/friendlist.cpp | 2 +- src/group.cpp | 2 +- src/ipc.cpp | 4 +- src/main.cpp | 18 +++--- src/net/autoupdate.cpp | 12 ++-- src/net/avatarbroadcaster.cpp | 2 +- src/net/toxme.cpp | 2 +- src/net/toxme.h | 2 +- src/net/toxuri.cpp | 10 ++-- src/nexus.cpp | 8 +-- src/persistence/db/encrypteddb.cpp | 8 +-- src/persistence/history.h | 2 +- src/persistence/historykeeper.cpp | 12 ++-- src/persistence/offlinemsgengine.cpp | 10 ++-- src/persistence/offlinemsgengine.h | 2 +- src/persistence/profile.cpp | 8 +-- src/persistence/profile.h | 2 +- src/persistence/profilelocker.cpp | 2 +- src/persistence/serialize.cpp | 2 +- src/persistence/settings.cpp | 24 ++++---- src/persistence/settings.h | 2 +- src/persistence/settingsserializer.cpp | 6 +- src/persistence/smileypack.cpp | 4 +- src/persistence/toxsave.cpp | 8 +-- src/platform/autorun_osx.cpp | 2 +- src/platform/autorun_win.cpp | 4 +- src/platform/autorun_xdg.cpp | 4 +- src/platform/camera/avfoundation.h | 2 +- src/platform/camera/directshow.h | 2 +- src/platform/camera/v4l2.h | 2 +- src/platform/capslock_osx.cpp | 2 +- src/platform/capslock_win.cpp | 2 +- src/platform/capslock_x11.cpp | 2 +- src/platform/timer_osx.cpp | 2 +- src/platform/timer_win.cpp | 2 +- src/platform/timer_x11.cpp | 2 +- src/video/cameradevice.cpp | 8 +-- src/video/camerasource.cpp | 2 +- src/video/camerasource.h | 4 +- src/video/genericnetcamview.h | 2 +- src/video/groupnetcamview.cpp | 16 +++--- src/video/netcamview.cpp | 16 +++--- src/video/videosurface.cpp | 14 ++--- src/video/videosurface.h | 2 +- src/widget/about/aboutuser.cpp | 6 +- src/widget/about/aboutuser.h | 2 +- src/widget/categorywidget.cpp | 2 +- src/widget/categorywidget.h | 2 +- src/widget/circlewidget.cpp | 6 +- src/widget/contentdialog.cpp | 20 +++---- src/widget/contentdialog.h | 6 +- src/widget/contentlayout.cpp | 2 +- src/widget/emoticonswidget.cpp | 6 +- src/widget/form/addfriendform.cpp | 20 +++---- src/widget/form/chatform.cpp | 56 +++++++++---------- src/widget/form/chatform.h | 4 +- src/widget/form/filesform.cpp | 6 +- src/widget/form/genericchatform.cpp | 40 ++++++------- src/widget/form/genericchatform.h | 6 +- src/widget/form/groupchatform.cpp | 26 ++++----- src/widget/form/groupinviteform.cpp | 16 +++--- src/widget/form/groupinviteform.h | 4 +- src/widget/form/profileform.cpp | 30 +++++----- src/widget/form/profileform.h | 4 +- src/widget/form/settings/aboutform.cpp | 6 +- src/widget/form/settings/advancedform.cpp | 18 +++--- src/widget/form/settings/avform.cpp | 20 +++---- src/widget/form/settings/avform.h | 2 +- src/widget/form/settings/generalform.cpp | 24 ++++---- src/widget/form/settings/privacyform.cpp | 22 ++++---- .../form/settings/userinterfaceform.cpp | 24 ++++---- src/widget/form/settings/userinterfaceform.h | 2 +- src/widget/form/settingswidget.cpp | 20 +++---- src/widget/form/tabcompleter.cpp | 6 +- src/widget/form/tabcompleter.h | 4 +- src/widget/friendlistlayout.cpp | 4 +- src/widget/friendlistlayout.h | 2 +- src/widget/friendlistwidget.cpp | 6 +- src/widget/friendlistwidget.h | 2 +- src/widget/friendwidget.cpp | 20 +++---- src/widget/genericchatitemwidget.cpp | 6 +- src/widget/genericchatroomwidget.cpp | 6 +- src/widget/groupwidget.cpp | 18 +++--- src/widget/gui.cpp | 2 +- src/widget/loginscreen.cpp | 16 +++--- src/widget/passwordedit.cpp | 2 +- src/widget/style.cpp | 4 +- src/widget/systemtrayicon.cpp | 2 +- src/widget/systemtrayicon_private.h | 2 +- src/widget/tool/callconfirmwidget.cpp | 2 +- src/widget/tool/chattextedit.cpp | 2 +- src/widget/tool/micfeedbackwidget.cpp | 2 +- src/widget/tool/profileimporter.cpp | 4 +- src/widget/tool/removefrienddialog.h | 2 +- src/widget/tool/screenshotgrabber.cpp | 2 +- src/widget/translator.cpp | 2 +- src/widget/widget.cpp | 44 +++++++-------- src/widget/widget.h | 2 +- 118 files changed, 469 insertions(+), 468 deletions(-) diff --git a/qtox.pro b/qtox.pro index b73cd1a41..8c08c1761 100644 --- a/qtox.pro +++ b/qtox.pro @@ -21,6 +21,7 @@ QT += core gui network xml opengl sql svg widgets TARGET = qtox TEMPLATE = app +INCLUDEPATH += src FORMS += \ src/loginscreen.ui \ src/mainwindow.ui \ diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index ea2239b5b..3c8571775 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -18,9 +18,9 @@ */ #include "audio.h" -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/persistence/settings.h" +#include "core/core.h" +#include "core/coreav.h" +#include "persistence/settings.h" #include #include diff --git a/src/chatlog/chatlinecontentproxy.cpp b/src/chatlog/chatlinecontentproxy.cpp index 0d243f7f7..f163816e8 100644 --- a/src/chatlog/chatlinecontentproxy.cpp +++ b/src/chatlog/chatlinecontentproxy.cpp @@ -18,7 +18,7 @@ */ #include "chatlinecontentproxy.h" -#include "src/chatlog/content/filetransferwidget.h" +#include "chatlog/content/filetransferwidget.h" #include #include #include diff --git a/src/chatlog/chatlog.cpp b/src/chatlog/chatlog.cpp index aa0bfd6be..975d69392 100644 --- a/src/chatlog/chatlog.cpp +++ b/src/chatlog/chatlog.cpp @@ -22,7 +22,7 @@ #include "chatlinecontent.h" #include "chatlinecontentproxy.h" #include "content/filetransferwidget.h" -#include "src/widget/translator.h" +#include "widget/translator.h" #include #include diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp index 2c19e1858..d5222ce75 100644 --- a/src/chatlog/chatmessage.cpp +++ b/src/chatlog/chatmessage.cpp @@ -28,8 +28,8 @@ #include -#include "src/persistence/settings.h" -#include "src/persistence/smileypack.h" +#include "persistence/settings.h" +#include "persistence/smileypack.h" #define NAME_COL_WIDTH 90.0 #define TIME_COL_WIDTH 90.0 diff --git a/src/chatlog/chatmessage.h b/src/chatlog/chatmessage.h index a7962cdd4..a07df1df8 100644 --- a/src/chatlog/chatmessage.h +++ b/src/chatlog/chatmessage.h @@ -21,7 +21,7 @@ #define CHATMESSAGE_H #include "chatline.h" -#include "src/core/corestructs.h" +#include "core/corestructs.h" #include class QGraphicsScene; diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp index bdb6ea05b..696fc351b 100644 --- a/src/chatlog/content/filetransferwidget.cpp +++ b/src/chatlog/content/filetransferwidget.cpp @@ -20,12 +20,12 @@ #include "filetransferwidget.h" #include "ui_filetransferwidget.h" -#include "src/nexus.h" -#include "src/core/core.h" -#include "src/widget/gui.h" -#include "src/widget/style.h" -#include "src/widget/widget.h" -#include "src/persistence/settings.h" +#include "nexus.h" +#include "core/core.h" +#include "widget/gui.h" +#include "widget/style.h" +#include "widget/widget.h" +#include "persistence/settings.h" #include #include diff --git a/src/chatlog/content/filetransferwidget.h b/src/chatlog/content/filetransferwidget.h index 26e609cc6..57771f93a 100644 --- a/src/chatlog/content/filetransferwidget.h +++ b/src/chatlog/content/filetransferwidget.h @@ -23,8 +23,8 @@ #include #include -#include "src/chatlog/chatlinecontent.h" -#include "src/core/corestructs.h" +#include "chatlog/chatlinecontent.h" +#include "core/corestructs.h" namespace Ui { diff --git a/src/chatlog/content/text.cpp b/src/chatlog/content/text.cpp index 26fb3ee90..f8cf01b5a 100644 --- a/src/chatlog/content/text.cpp +++ b/src/chatlog/content/text.cpp @@ -31,7 +31,7 @@ #include #include -#include "src/widget/style.h" +#include "widget/style.h" Text::Text(const QString& txt, const QFont& font, bool enableElide, const QString &rwText, const QColor c) : rawText(rwText) diff --git a/src/chatlog/customtextdocument.cpp b/src/chatlog/customtextdocument.cpp index c4261b4ea..4579f707a 100644 --- a/src/chatlog/customtextdocument.cpp +++ b/src/chatlog/customtextdocument.cpp @@ -18,9 +18,9 @@ */ #include "customtextdocument.h" -#include "src/persistence/settings.h" -#include "src/persistence/smileypack.h" -#include "src/widget/style.h" +#include "persistence/settings.h" +#include "persistence/smileypack.h" +#include "widget/style.h" #include #include diff --git a/src/core/core.cpp b/src/core/core.cpp index 82b267fce..8949b9610 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -19,17 +19,17 @@ */ #include "core.h" -#include "src/nexus.h" -#include "src/core/cdata.h" -#include "src/core/cstring.h" -#include "src/core/coreav.h" -#include "src/persistence/settings.h" -#include "src/widget/gui.h" -#include "src/persistence/profilelocker.h" -#include "src/net/avatarbroadcaster.h" -#include "src/persistence/profile.h" +#include "nexus.h" +#include "core/cdata.h" +#include "core/cstring.h" +#include "core/coreav.h" +#include "persistence/settings.h" +#include "widget/gui.h" +#include "persistence/profilelocker.h" +#include "net/avatarbroadcaster.h" +#include "persistence/profile.h" #include "corefile.h" -#include "src/video/camerasource.h" +#include "video/camerasource.h" #include #include diff --git a/src/core/coreav.cpp b/src/core/coreav.cpp index c4131bb39..698f3cd53 100644 --- a/src/core/coreav.cpp +++ b/src/core/coreav.cpp @@ -20,12 +20,12 @@ #include "core.h" #include "coreav.h" -#include "src/audio/audio.h" -#include "src/friend.h" -#include "src/group.h" -#include "src/persistence/settings.h" -#include "src/video/videoframe.h" -#include "src/video/corevideosource.h" +#include "audio/audio.h" +#include "friend.h" +#include "group.h" +#include "persistence/settings.h" +#include "video/videoframe.h" +#include "video/corevideosource.h" #include #include #include diff --git a/src/core/coreav.h b/src/core/coreav.h index 7b34b9a00..ae01b63d5 100644 --- a/src/core/coreav.h +++ b/src/core/coreav.h @@ -24,7 +24,7 @@ #include #include #include -#include "src/core/toxcall.h" +#include "core/toxcall.h" #include class Friend; diff --git a/src/core/coreencryption.cpp b/src/core/coreencryption.cpp index c818f1fdf..f121300c4 100644 --- a/src/core/coreencryption.cpp +++ b/src/core/coreencryption.cpp @@ -22,12 +22,12 @@ /* was permanently moved here to handle encryption */ #include "core.h" -#include "src/widget/gui.h" -#include "src/persistence/settings.h" -#include "src/core/cstring.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" -#include "src/persistence/historykeeper.h" +#include "widget/gui.h" +#include "persistence/settings.h" +#include "core/cstring.h" +#include "nexus.h" +#include "persistence/profile.h" +#include "persistence/historykeeper.h" #include #include #include diff --git a/src/core/corefile.cpp b/src/core/corefile.cpp index 4785e55e7..1a32cb229 100644 --- a/src/core/corefile.cpp +++ b/src/core/corefile.cpp @@ -21,9 +21,9 @@ #include "core.h" #include "corefile.h" #include "corestructs.h" -#include "src/core/cstring.h" -#include "src/persistence/settings.h" -#include "src/persistence/profile.h" +#include "core/cstring.h" +#include "persistence/settings.h" +#include "persistence/profile.h" #include #include #include diff --git a/src/core/corestructs.cpp b/src/core/corestructs.cpp index 9277336ec..09c2ba1ae 100644 --- a/src/core/corestructs.cpp +++ b/src/core/corestructs.cpp @@ -1,5 +1,5 @@ -#include "src/core/corestructs.h" -#include "src/core/core.h" +#include "core/corestructs.h" +#include "core/core.h" #include #include #include diff --git a/src/core/toxcall.cpp b/src/core/toxcall.cpp index 56869153c..3840a6b69 100644 --- a/src/core/toxcall.cpp +++ b/src/core/toxcall.cpp @@ -1,9 +1,9 @@ -#include "src/audio/audio.h" -#include "src/core/toxcall.h" -#include "src/core/coreav.h" -#include "src/persistence/settings.h" -#include "src/video/camerasource.h" -#include "src/video/corevideosource.h" +#include "audio/audio.h" +#include "core/toxcall.h" +#include "core/coreav.h" +#include "persistence/settings.h" +#include "video/camerasource.h" +#include "video/corevideosource.h" #include #include diff --git a/src/core/toxcall.h b/src/core/toxcall.h index 9f36f71e1..e540d2685 100644 --- a/src/core/toxcall.h +++ b/src/core/toxcall.h @@ -5,7 +5,7 @@ #include #include -#include "src/core/indexedlist.h" +#include "core/indexedlist.h" #include diff --git a/src/friend.cpp b/src/friend.cpp index 10eaf179a..6d109e5b4 100644 --- a/src/friend.cpp +++ b/src/friend.cpp @@ -23,12 +23,12 @@ #include "widget/friendwidget.h" #include "widget/form/chatform.h" #include "widget/gui.h" -#include "src/core/core.h" -#include "src/persistence/settings.h" -#include "src/persistence/profile.h" -#include "src/nexus.h" -#include "src/grouplist.h" -#include "src/group.h" +#include "core/core.h" +#include "persistence/settings.h" +#include "persistence/profile.h" +#include "nexus.h" +#include "grouplist.h" +#include "group.h" Friend::Friend(uint32_t FriendId, const ToxId &UserId) : userName{Core::getInstance()->getPeerName(UserId)} diff --git a/src/friend.h b/src/friend.h index 1099b5679..60198547e 100644 --- a/src/friend.h +++ b/src/friend.h @@ -22,7 +22,7 @@ #include #include -#include "src/core/corestructs.h" +#include "core/corestructs.h" #include "core/toxid.h" class FriendWidget; diff --git a/src/friendlist.cpp b/src/friendlist.cpp index 302d1d1a2..f60fc4303 100644 --- a/src/friendlist.cpp +++ b/src/friendlist.cpp @@ -19,7 +19,7 @@ #include "friend.h" #include "friendlist.h" -#include "src/persistence/settings.h" +#include "persistence/settings.h" #include #include #include diff --git a/src/group.cpp b/src/group.cpp index 09a10c9ab..e25d13680 100644 --- a/src/group.cpp +++ b/src/group.cpp @@ -22,7 +22,7 @@ #include "widget/form/groupchatform.h" #include "friendlist.h" #include "friend.h" -#include "src/core/core.h" +#include "core/core.h" #include "widget/gui.h" #include #include diff --git a/src/ipc.cpp b/src/ipc.cpp index f7ff6861d..d4d8f4add 100644 --- a/src/ipc.cpp +++ b/src/ipc.cpp @@ -17,8 +17,8 @@ along with qTox. If not, see . */ -#include "src/ipc.h" -#include "src/persistence/settings.h" +#include "ipc.h" +#include "persistence/settings.h" #include #include #include diff --git a/src/main.cpp b/src/main.cpp index af3d2f5ce..eb98b4180 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,15 +19,15 @@ #include "widget/widget.h" #include "persistence/settings.h" -#include "src/nexus.h" -#include "src/ipc.h" -#include "src/net/toxuri.h" -#include "src/net/autoupdate.h" -#include "src/persistence/toxsave.h" -#include "src/persistence/profile.h" -#include "src/widget/loginscreen.h" -#include "src/widget/translator.h" -#include "src/video/camerasource.h" +#include "nexus.h" +#include "ipc.h" +#include "net/toxuri.h" +#include "net/autoupdate.h" +#include "persistence/toxsave.h" +#include "persistence/profile.h" +#include "widget/loginscreen.h" +#include "widget/translator.h" +#include "video/camerasource.h" #include #include #include diff --git a/src/net/autoupdate.cpp b/src/net/autoupdate.cpp index e1471a96d..90a7f7996 100644 --- a/src/net/autoupdate.cpp +++ b/src/net/autoupdate.cpp @@ -17,12 +17,12 @@ along with qTox. If not, see . */ -#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 "src/nexus.h" +#include "net/autoupdate.h" +#include "persistence/serialize.h" +#include "persistence/settings.h" +#include "widget/widget.h" +#include "widget/gui.h" +#include "nexus.h" #include #include #include diff --git a/src/net/avatarbroadcaster.cpp b/src/net/avatarbroadcaster.cpp index f627c81af..a48cfd792 100644 --- a/src/net/avatarbroadcaster.cpp +++ b/src/net/avatarbroadcaster.cpp @@ -19,7 +19,7 @@ #include "avatarbroadcaster.h" -#include "src/core/core.h" +#include "core/core.h" #include #include diff --git a/src/net/toxme.cpp b/src/net/toxme.cpp index 2b84b408c..7ec92f125 100644 --- a/src/net/toxme.cpp +++ b/src/net/toxme.cpp @@ -18,7 +18,7 @@ */ #include "toxme.h" -#include "src/core/core.h" +#include "core/core.h" #include #include #include diff --git a/src/net/toxme.h b/src/net/toxme.h index 90140c24d..b45cdf180 100644 --- a/src/net/toxme.h +++ b/src/net/toxme.h @@ -26,7 +26,7 @@ #include #include #include -#include "src/core/toxid.h" +#include "core/toxid.h" class QNetworkAccessManager; diff --git a/src/net/toxuri.cpp b/src/net/toxuri.cpp index f6b1fbbec..6cec499bd 100644 --- a/src/net/toxuri.cpp +++ b/src/net/toxuri.cpp @@ -18,11 +18,11 @@ */ -#include "src/net/toxuri.h" -#include "src/net/toxme.h" -#include "src/widget/tool/friendrequestdialog.h" -#include "src/nexus.h" -#include "src/core/core.h" +#include "net/toxuri.h" +#include "net/toxme.h" +#include "widget/tool/friendrequestdialog.h" +#include "nexus.h" +#include "core/core.h" #include #include #include diff --git a/src/nexus.cpp b/src/nexus.cpp index a22d30cfb..66c7c48d8 100644 --- a/src/nexus.cpp +++ b/src/nexus.cpp @@ -19,10 +19,10 @@ #include "nexus.h" -#include "src/persistence/profile.h" -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/widget/widget.h" +#include "persistence/profile.h" +#include "core/core.h" +#include "core/coreav.h" +#include "widget/widget.h" #include "persistence/settings.h" #include "video/camerasource.h" #include "widget/gui.h" diff --git a/src/persistence/db/encrypteddb.cpp b/src/persistence/db/encrypteddb.cpp index 4b58826e2..bb330240c 100644 --- a/src/persistence/db/encrypteddb.cpp +++ b/src/persistence/db/encrypteddb.cpp @@ -18,10 +18,10 @@ */ #include "encrypteddb.h" -#include "src/persistence/settings.h" -#include "src/core/core.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" +#include "persistence/settings.h" +#include "core/core.h" +#include "nexus.h" +#include "persistence/profile.h" #include diff --git a/src/persistence/history.h b/src/persistence/history.h index dbce0e80b..3a6a65e02 100644 --- a/src/persistence/history.h +++ b/src/persistence/history.h @@ -27,7 +27,7 @@ #include #include -#include "src/persistence/db/rawdatabase.h" +#include "persistence/db/rawdatabase.h" class Profile; class HistoryKeeper; diff --git a/src/persistence/historykeeper.cpp b/src/persistence/historykeeper.cpp index 2fdd63e0e..d61658941 100644 --- a/src/persistence/historykeeper.cpp +++ b/src/persistence/historykeeper.cpp @@ -18,10 +18,10 @@ */ #include "historykeeper.h" -#include "src/persistence/settings.h" -#include "src/core/core.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" +#include "persistence/settings.h" +#include "core/core.h" +#include "nexus.h" +#include "persistence/profile.h" #include #include @@ -32,8 +32,8 @@ #include #include -#include "src/persistence/db/plaindb.h" -#include "src/persistence/db/encrypteddb.h" +#include "persistence/db/plaindb.h" +#include "persistence/db/encrypteddb.h" /** * @class HistoryKeeper diff --git a/src/persistence/offlinemsgengine.cpp b/src/persistence/offlinemsgengine.cpp index fdfb6a662..a5f53eee2 100644 --- a/src/persistence/offlinemsgengine.cpp +++ b/src/persistence/offlinemsgengine.cpp @@ -18,11 +18,11 @@ */ #include "offlinemsgengine.h" -#include "src/friend.h" -#include "src/persistence/settings.h" -#include "src/core/core.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" +#include "friend.h" +#include "persistence/settings.h" +#include "core/core.h" +#include "nexus.h" +#include "persistence/profile.h" #include #include diff --git a/src/persistence/offlinemsgengine.h b/src/persistence/offlinemsgengine.h index 532152f2b..f6c86aa74 100644 --- a/src/persistence/offlinemsgengine.h +++ b/src/persistence/offlinemsgengine.h @@ -25,7 +25,7 @@ #include #include #include -#include "src/chatlog/chatmessage.h" +#include "chatlog/chatmessage.h" class Friend; class QTimer; diff --git a/src/persistence/profile.cpp b/src/persistence/profile.cpp index 4577b78bf..1ccdab177 100644 --- a/src/persistence/profile.cpp +++ b/src/persistence/profile.cpp @@ -32,10 +32,10 @@ #include "profilelocker.h" #include "settings.h" #include "historykeeper.h" -#include "src/core/core.h" -#include "src/nexus.h" -#include "src/widget/gui.h" -#include "src/widget/widget.h" +#include "core/core.h" +#include "nexus.h" +#include "widget/gui.h" +#include "widget/widget.h" /** * @class Profile diff --git a/src/persistence/profile.h b/src/persistence/profile.h index 11ef83362..8dd130ef1 100644 --- a/src/persistence/profile.h +++ b/src/persistence/profile.h @@ -28,7 +28,7 @@ #include #include #include -#include "src/persistence/history.h" +#include "persistence/history.h" class Core; class QThread; diff --git a/src/persistence/profilelocker.cpp b/src/persistence/profilelocker.cpp index fc9d51505..580e69d43 100644 --- a/src/persistence/profilelocker.cpp +++ b/src/persistence/profilelocker.cpp @@ -19,7 +19,7 @@ #include "profilelocker.h" -#include "src/persistence/settings.h" +#include "persistence/settings.h" #include #include diff --git a/src/persistence/serialize.cpp b/src/persistence/serialize.cpp index 5cd52b63f..99304c2f9 100644 --- a/src/persistence/serialize.cpp +++ b/src/persistence/serialize.cpp @@ -17,7 +17,7 @@ along with qTox. If not, see . */ -#include "src/persistence/serialize.h" +#include "persistence/serialize.h" /** * @file serialize.cpp diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index ee73b9ce6..45598aee7 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -19,20 +19,20 @@ */ #include "settings.h" -#include "src/persistence/smileypack.h" -#include "src/persistence/db/plaindb.h" -#include "src/core/corestructs.h" -#include "src/core/core.h" -#include "src/widget/gui.h" -#include "src/widget/style.h" -#include "src/persistence/profilelocker.h" -#include "src/persistence/settingsserializer.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" +#include "persistence/smileypack.h" +#include "persistence/db/plaindb.h" +#include "core/corestructs.h" +#include "core/core.h" +#include "widget/gui.h" +#include "widget/style.h" +#include "persistence/profilelocker.h" +#include "persistence/settingsserializer.h" +#include "nexus.h" +#include "persistence/profile.h" #ifdef QTOX_PLATFORM_EXT -#include "src/platform/autorun.h" +#include "platform/autorun.h" #endif -#include "src/ipc.h" +#include "ipc.h" #include #include diff --git a/src/persistence/settings.h b/src/persistence/settings.h index 2357b3b73..1252b3264 100644 --- a/src/persistence/settings.h +++ b/src/persistence/settings.h @@ -29,7 +29,7 @@ #include #include #include -#include "src/core/corestructs.h" +#include "core/corestructs.h" class ToxId; class Profile; diff --git a/src/persistence/settingsserializer.cpp b/src/persistence/settingsserializer.cpp index 93595f818..a6bfbff9a 100644 --- a/src/persistence/settingsserializer.cpp +++ b/src/persistence/settingsserializer.cpp @@ -19,9 +19,9 @@ #include "settingsserializer.h" #include "serialize.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" -#include "src/core/core.h" +#include "nexus.h" +#include "persistence/profile.h" +#include "core/core.h" #include #include #include diff --git a/src/persistence/smileypack.cpp b/src/persistence/smileypack.cpp index 86eeef30b..5b13d4233 100644 --- a/src/persistence/smileypack.cpp +++ b/src/persistence/smileypack.cpp @@ -18,8 +18,8 @@ */ #include "smileypack.h" -#include "src/persistence/settings.h" -#include "src/widget/style.h" +#include "persistence/settings.h" +#include "widget/style.h" #include #include diff --git a/src/persistence/toxsave.cpp b/src/persistence/toxsave.cpp index c4990f1e8..53b406996 100644 --- a/src/persistence/toxsave.cpp +++ b/src/persistence/toxsave.cpp @@ -18,10 +18,10 @@ */ #include "toxsave.h" -#include "src/widget/gui.h" -#include "src/core/core.h" -#include "src/persistence/settings.h" -#include "src/widget/tool/profileimporter.h" +#include "widget/gui.h" +#include "core/core.h" +#include "persistence/settings.h" +#include "widget/tool/profileimporter.h" #include #include diff --git a/src/platform/autorun_osx.cpp b/src/platform/autorun_osx.cpp index 1fdb7911f..869ee23de 100644 --- a/src/platform/autorun_osx.cpp +++ b/src/platform/autorun_osx.cpp @@ -18,7 +18,7 @@ */ #if defined(__APPLE__) && defined(__MACH__) -#include "src/platform/autorun.h" +#include "platform/autorun.h" #include #include #include diff --git a/src/platform/autorun_win.cpp b/src/platform/autorun_win.cpp index e7a6e1b0f..891d8be98 100644 --- a/src/platform/autorun_win.cpp +++ b/src/platform/autorun_win.cpp @@ -19,8 +19,8 @@ #include #ifdef Q_OS_WIN32 -#include "src/platform/autorun.h" -#include "src/persistence/settings.h" +#include "platform/autorun.h" +#include "persistence/settings.h" #include #include diff --git a/src/platform/autorun_xdg.cpp b/src/platform/autorun_xdg.cpp index b1825c776..85a74d5aa 100644 --- a/src/platform/autorun_xdg.cpp +++ b/src/platform/autorun_xdg.cpp @@ -19,8 +19,8 @@ #include #if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__) -#include "src/platform/autorun.h" -#include "src/persistence/settings.h" +#include "platform/autorun.h" +#include "persistence/settings.h" #include #include diff --git a/src/platform/camera/avfoundation.h b/src/platform/camera/avfoundation.h index 1ee519392..bba92f6d9 100644 --- a/src/platform/camera/avfoundation.h +++ b/src/platform/camera/avfoundation.h @@ -22,7 +22,7 @@ #include #include #include -#include "src/video/videomode.h" +#include "video/videomode.h" #ifndef Q_OS_MACX #error "This file is only meant to be compiled for Mac OS X targets" diff --git a/src/platform/camera/directshow.h b/src/platform/camera/directshow.h index c0113f8b9..0582c7fd4 100644 --- a/src/platform/camera/directshow.h +++ b/src/platform/camera/directshow.h @@ -24,7 +24,7 @@ #include #include #include -#include "src/video/videomode.h" +#include "video/videomode.h" #ifndef Q_OS_WIN #error "This file is only meant to be compiled for Windows targets" diff --git a/src/platform/camera/v4l2.h b/src/platform/camera/v4l2.h index c9556c84c..d68a2c83f 100644 --- a/src/platform/camera/v4l2.h +++ b/src/platform/camera/v4l2.h @@ -22,7 +22,7 @@ #include #include #include -#include "src/video/videomode.h" +#include "video/videomode.h" #ifndef Q_OS_LINUX #error "This file is only meant to be compiled for Linux targets" diff --git a/src/platform/capslock_osx.cpp b/src/platform/capslock_osx.cpp index e03871b49..dfa94f8c0 100644 --- a/src/platform/capslock_osx.cpp +++ b/src/platform/capslock_osx.cpp @@ -19,7 +19,7 @@ #include #if defined(__APPLE__) && defined(__MACH__) -#include "src/platform/capslock.h" +#include "platform/capslock.h" // TODO: Implement for osx bool Platform::capsLockEnabled() diff --git a/src/platform/capslock_win.cpp b/src/platform/capslock_win.cpp index a90020151..66a0e5968 100644 --- a/src/platform/capslock_win.cpp +++ b/src/platform/capslock_win.cpp @@ -20,7 +20,7 @@ #include #ifdef Q_OS_WIN32 #include -#include "src/platform/capslock.h" +#include "platform/capslock.h" bool Platform::capsLockEnabled() { diff --git a/src/platform/capslock_x11.cpp b/src/platform/capslock_x11.cpp index 62b455bf1..692d602d1 100644 --- a/src/platform/capslock_x11.cpp +++ b/src/platform/capslock_x11.cpp @@ -20,7 +20,7 @@ #include #if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__) #include -#include "src/platform/capslock.h" +#include "platform/capslock.h" #undef KeyPress #undef KeyRelease #undef FocusIn diff --git a/src/platform/timer_osx.cpp b/src/platform/timer_osx.cpp index 8dfa1c899..779c029d4 100644 --- a/src/platform/timer_osx.cpp +++ b/src/platform/timer_osx.cpp @@ -25,7 +25,7 @@ #include #if defined(__APPLE__) && defined(__MACH__) -#include "src/platform/timer.h" +#include "platform/timer.h" #include #include diff --git a/src/platform/timer_win.cpp b/src/platform/timer_win.cpp index a8363b3f4..5a835cf0b 100644 --- a/src/platform/timer_win.cpp +++ b/src/platform/timer_win.cpp @@ -19,7 +19,7 @@ #include #ifdef Q_OS_WIN32 -#include "src/platform/timer.h" +#include "platform/timer.h" #include uint32_t Platform::getIdleTime() diff --git a/src/platform/timer_x11.cpp b/src/platform/timer_x11.cpp index a3a4450ef..2816a1ca6 100644 --- a/src/platform/timer_x11.cpp +++ b/src/platform/timer_x11.cpp @@ -18,7 +18,7 @@ #include #if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__) #include -#include "src/platform/timer.h" +#include "platform/timer.h" #include uint32_t Platform::getIdleTime() diff --git a/src/video/cameradevice.cpp b/src/video/cameradevice.cpp index a1813e6c5..2c74d83ce 100644 --- a/src/video/cameradevice.cpp +++ b/src/video/cameradevice.cpp @@ -26,16 +26,16 @@ extern "C" { #include } #include "cameradevice.h" -#include "src/persistence/settings.h" +#include "persistence/settings.h" #ifdef Q_OS_WIN -#include "src/platform/camera/directshow.h" +#include "platform/camera/directshow.h" #endif #ifdef Q_OS_LINUX -#include "src/platform/camera/v4l2.h" +#include "platform/camera/v4l2.h" #endif #ifdef Q_OS_OSX -#include "src/platform/camera/avfoundation.h" +#include "platform/camera/avfoundation.h" #endif /** diff --git a/src/video/camerasource.cpp b/src/video/camerasource.cpp index d2950d1a8..14155bfd9 100644 --- a/src/video/camerasource.cpp +++ b/src/video/camerasource.cpp @@ -29,7 +29,7 @@ extern "C" { #include #include #include -#include "src/persistence/settings.h" +#include "persistence/settings.h" #include "camerasource.h" #include "cameradevice.h" #include "videoframe.h" diff --git a/src/video/camerasource.h b/src/video/camerasource.h index 08a9c6e1d..2938981e5 100644 --- a/src/video/camerasource.h +++ b/src/video/camerasource.h @@ -26,8 +26,8 @@ #include #include #include -#include "src/video/videosource.h" -#include "src/video/videomode.h" +#include "video/videosource.h" +#include "video/videomode.h" class CameraDevice; struct AVCodecContext; diff --git a/src/video/genericnetcamview.h b/src/video/genericnetcamview.h index 816ee3135..ad3952f13 100644 --- a/src/video/genericnetcamview.h +++ b/src/video/genericnetcamview.h @@ -24,7 +24,7 @@ #include #include -#include "src/video/videosurface.h" +#include "video/videosurface.h" class GenericNetCamView : public QWidget { diff --git a/src/video/groupnetcamview.cpp b/src/video/groupnetcamview.cpp index 4dbeb22d5..a98dcfced 100644 --- a/src/video/groupnetcamview.cpp +++ b/src/video/groupnetcamview.cpp @@ -18,14 +18,14 @@ */ #include "groupnetcamview.h" -#include "src/widget/tool/croppinglabel.h" -#include "src/video/videosurface.h" -#include "src/persistence/profile.h" -#include "src/audio/audio.h" -#include "src/core/core.h" -#include "src/nexus.h" -#include "src/friendlist.h" -#include "src/friend.h" +#include "widget/tool/croppinglabel.h" +#include "video/videosurface.h" +#include "persistence/profile.h" +#include "audio/audio.h" +#include "core/core.h" +#include "nexus.h" +#include "friendlist.h" +#include "friend.h" #include #include #include diff --git a/src/video/netcamview.cpp b/src/video/netcamview.cpp index 608d48adb..dd242ddd3 100644 --- a/src/video/netcamview.cpp +++ b/src/video/netcamview.cpp @@ -19,14 +19,14 @@ #include "netcamview.h" #include "camerasource.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/core/core.h" -#include "src/video/videosurface.h" -#include "src/widget/tool/movablewidget.h" -#include "src/persistence/settings.h" -#include "src/persistence/profile.h" -#include "src/nexus.h" +#include "friend.h" +#include "friendlist.h" +#include "core/core.h" +#include "video/videosurface.h" +#include "widget/tool/movablewidget.h" +#include "persistence/settings.h" +#include "persistence/profile.h" +#include "nexus.h" #include #include #include diff --git a/src/video/videosurface.cpp b/src/video/videosurface.cpp index d7e629643..86a2e8d85 100644 --- a/src/video/videosurface.cpp +++ b/src/video/videosurface.cpp @@ -18,13 +18,13 @@ */ #include "videosurface.h" -#include "src/video/videoframe.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/widget/friendwidget.h" -#include "src/persistence/settings.h" -#include "src/core/core.h" -#include "src/widget/style.h" +#include "video/videoframe.h" +#include "friend.h" +#include "friendlist.h" +#include "widget/friendwidget.h" +#include "persistence/settings.h" +#include "core/core.h" +#include "widget/style.h" #include #include diff --git a/src/video/videosurface.h b/src/video/videosurface.h index 032f12a69..f6961bce0 100644 --- a/src/video/videosurface.h +++ b/src/video/videosurface.h @@ -23,7 +23,7 @@ #include #include #include -#include "src/video/videosource.h" +#include "video/videosource.h" class VideoSurface : public QWidget { diff --git a/src/widget/about/aboutuser.cpp b/src/widget/about/aboutuser.cpp index 7ba63f389..b59077501 100644 --- a/src/widget/about/aboutuser.cpp +++ b/src/widget/about/aboutuser.cpp @@ -1,8 +1,8 @@ #include "aboutuser.h" #include "ui_aboutuser.h" -#include "src/persistence/settings.h" -#include "src/persistence/profile.h" -#include "src/nexus.h" +#include "persistence/settings.h" +#include "persistence/profile.h" +#include "nexus.h" #include #include diff --git a/src/widget/about/aboutuser.h b/src/widget/about/aboutuser.h index 177a2edf3..944701f41 100644 --- a/src/widget/about/aboutuser.h +++ b/src/widget/about/aboutuser.h @@ -2,7 +2,7 @@ #define ABOUTUSER_H #include -#include "src/friend.h" +#include "friend.h" namespace Ui { diff --git a/src/widget/categorywidget.cpp b/src/widget/categorywidget.cpp index a6151707d..68340a8e8 100644 --- a/src/widget/categorywidget.cpp +++ b/src/widget/categorywidget.cpp @@ -21,7 +21,7 @@ #include "friendlistlayout.h" #include "friendlistwidget.h" #include "friendwidget.h" -#include "src/widget/style.h" +#include "widget/style.h" #include "tool/croppinglabel.h" #include #include diff --git a/src/widget/categorywidget.h b/src/widget/categorywidget.h index ab35f6595..74e1602b5 100644 --- a/src/widget/categorywidget.h +++ b/src/widget/categorywidget.h @@ -21,7 +21,7 @@ #define CATEGORYWIDGET_H #include "genericchatitemwidget.h" -#include "src/core/corestructs.h" +#include "core/corestructs.h" class FriendListLayout; class FriendListWidget; diff --git a/src/widget/circlewidget.cpp b/src/widget/circlewidget.cpp index 313b26edb..01e968d90 100644 --- a/src/widget/circlewidget.cpp +++ b/src/widget/circlewidget.cpp @@ -33,9 +33,9 @@ #include "tool/croppinglabel.h" #include "widget.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/persistence/settings.h" +#include "friend.h" +#include "friendlist.h" +#include "persistence/settings.h" QHash CircleWidget::circleList; diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp index 1725de119..fefe1ed1f 100644 --- a/src/widget/contentdialog.cpp +++ b/src/widget/contentdialog.cpp @@ -32,16 +32,16 @@ #include "style.h" #include "widget.h" #include "tool/adjustingscrollarea.h" -#include "src/persistence/settings.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/group.h" -#include "src/grouplist.h" -#include "src/widget/form/chatform.h" -#include "src/core/core.h" -#include "src/widget/friendlistlayout.h" -#include "src/widget/form/settingswidget.h" -#include "src/widget/translator.h" +#include "persistence/settings.h" +#include "friend.h" +#include "friendlist.h" +#include "group.h" +#include "grouplist.h" +#include "widget/form/chatform.h" +#include "core/core.h" +#include "widget/friendlistlayout.h" +#include "widget/form/settingswidget.h" +#include "widget/translator.h" ContentDialog* ContentDialog::currentDialog = nullptr; QHash> ContentDialog::friendList; diff --git a/src/widget/contentdialog.h b/src/widget/contentdialog.h index f660bed27..6fc38f679 100644 --- a/src/widget/contentdialog.h +++ b/src/widget/contentdialog.h @@ -22,9 +22,9 @@ #include -#include "src/core/corestructs.h" -#include "src/widget/genericchatitemlayout.h" -#include "src/widget/tool/activatedialog.h" +#include "core/corestructs.h" +#include "widget/genericchatitemlayout.h" +#include "widget/tool/activatedialog.h" template class QHash; template class QSet; diff --git a/src/widget/contentlayout.cpp b/src/widget/contentlayout.cpp index d65d40835..fc94594cf 100644 --- a/src/widget/contentlayout.cpp +++ b/src/widget/contentlayout.cpp @@ -18,7 +18,7 @@ */ #include "contentlayout.h" -#include "src/persistence/settings.h" +#include "persistence/settings.h" #include "style.h" #include #include diff --git a/src/widget/emoticonswidget.cpp b/src/widget/emoticonswidget.cpp index 2b03db2de..4ca52ea90 100644 --- a/src/widget/emoticonswidget.cpp +++ b/src/widget/emoticonswidget.cpp @@ -18,9 +18,9 @@ */ #include "emoticonswidget.h" -#include "src/widget/style.h" -#include "src/persistence/smileypack.h" -#include "src/persistence/settings.h" +#include "widget/style.h" +#include "persistence/smileypack.h" +#include "persistence/settings.h" #include #include diff --git a/src/widget/form/addfriendform.cpp b/src/widget/form/addfriendform.cpp index 5357b6309..1fdf3c37e 100644 --- a/src/widget/form/addfriendform.cpp +++ b/src/widget/form/addfriendform.cpp @@ -27,16 +27,16 @@ #include #include #include -#include "src/nexus.h" -#include "src/core/core.h" -#include "src/core/cdata.h" -#include "src/net/toxme.h" -#include "src/persistence/settings.h" -#include "src/widget/gui.h" -#include "src/widget/translator.h" -#include "src/widget/contentlayout.h" -#include "src/widget/tool/croppinglabel.h" -#include "src/net/toxme.h" +#include "nexus.h" +#include "core/core.h" +#include "core/cdata.h" +#include "net/toxme.h" +#include "persistence/settings.h" +#include "widget/gui.h" +#include "widget/translator.h" +#include "widget/contentlayout.h" +#include "widget/tool/croppinglabel.h" +#include "net/toxme.h" #include #include diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp index 9ae47bc70..11bd368e7 100644 --- a/src/widget/form/chatform.cpp +++ b/src/widget/form/chatform.cpp @@ -36,34 +36,34 @@ #include #include #include "chatform.h" -#include "src/audio/audio.h" -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/friend.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/form/loadhistorydialog.h" -#include "src/widget/tool/chattextedit.h" -#include "src/widget/widget.h" -#include "src/widget/maskablepixmapwidget.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/video/netcamview.h" -#include "src/persistence/offlinemsgengine.h" -#include "src/widget/tool/screenshotgrabber.h" -#include "src/widget/tool/flyoutoverlaywidget.h" -#include "src/widget/translator.h" -#include "src/video/videosource.h" -#include "src/video/camerasource.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" +#include "audio/audio.h" +#include "core/core.h" +#include "core/coreav.h" +#include "friend.h" +#include "widget/style.h" +#include "persistence/settings.h" +#include "core/cstring.h" +#include "widget/tool/callconfirmwidget.h" +#include "widget/friendwidget.h" +#include "widget/form/loadhistorydialog.h" +#include "widget/tool/chattextedit.h" +#include "widget/widget.h" +#include "widget/maskablepixmapwidget.h" +#include "widget/tool/croppinglabel.h" +#include "chatlog/chatmessage.h" +#include "chatlog/content/filetransferwidget.h" +#include "chatlog/chatlinecontentproxy.h" +#include "chatlog/content/text.h" +#include "chatlog/chatlog.h" +#include "video/netcamview.h" +#include "persistence/offlinemsgengine.h" +#include "widget/tool/screenshotgrabber.h" +#include "widget/tool/flyoutoverlaywidget.h" +#include "widget/translator.h" +#include "video/videosource.h" +#include "video/camerasource.h" +#include "nexus.h" +#include "persistence/profile.h" const QString ChatForm::ACTION_PREFIX = QStringLiteral("/me "); diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h index 7fff759ca..a360e3389 100644 --- a/src/widget/form/chatform.h +++ b/src/widget/form/chatform.h @@ -26,8 +26,8 @@ #include #include "genericchatform.h" -#include "src/core/corestructs.h" -#include "src/widget/tool/screenshotgrabber.h" +#include "core/corestructs.h" +#include "widget/tool/screenshotgrabber.h" class Friend; class FileTransferInstance; diff --git a/src/widget/form/filesform.cpp b/src/widget/form/filesform.cpp index 61c1f949f..19b0f2be3 100644 --- a/src/widget/form/filesform.cpp +++ b/src/widget/form/filesform.cpp @@ -18,9 +18,9 @@ */ #include "filesform.h" -#include "src/widget/widget.h" -#include "src/widget/translator.h" -#include "src/widget/contentlayout.h" +#include "widget/widget.h" +#include "widget/translator.h" +#include "widget/contentlayout.h" #include #include diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 2dcb6ff62..5b0f7134b 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -27,26 +27,26 @@ #include #include -#include "src/chatlog/chatlog.h" -#include "src/chatlog/content/timestamp.h" -#include "src/core/core.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/group.h" -#include "src/grouplist.h" -#include "src/persistence/settings.h" -#include "src/persistence/smileypack.h" -#include "src/video/genericnetcamview.h" -#include "src/widget/contentdialog.h" -#include "src/widget/contentlayout.h" -#include "src/widget/emoticonswidget.h" -#include "src/widget/maskablepixmapwidget.h" -#include "src/widget/style.h" -#include "src/widget/tool/chattextedit.h" -#include "src/widget/tool/croppinglabel.h" -#include "src/widget/tool/flyoutoverlaywidget.h" -#include "src/widget/translator.h" -#include "src/widget/widget.h" +#include "chatlog/chatlog.h" +#include "chatlog/content/timestamp.h" +#include "core/core.h" +#include "friend.h" +#include "friendlist.h" +#include "group.h" +#include "grouplist.h" +#include "persistence/settings.h" +#include "persistence/smileypack.h" +#include "video/genericnetcamview.h" +#include "widget/contentdialog.h" +#include "widget/contentlayout.h" +#include "widget/emoticonswidget.h" +#include "widget/maskablepixmapwidget.h" +#include "widget/style.h" +#include "widget/tool/chattextedit.h" +#include "widget/tool/croppinglabel.h" +#include "widget/tool/flyoutoverlaywidget.h" +#include "widget/translator.h" +#include "widget/widget.h" GenericChatForm::GenericChatForm(QWidget *parent) : QWidget(parent, Qt::Window) diff --git a/src/widget/form/genericchatform.h b/src/widget/form/genericchatform.h index 913ed3468..97adc7ccf 100644 --- a/src/widget/form/genericchatform.h +++ b/src/widget/form/genericchatform.h @@ -24,9 +24,9 @@ #include #include #include -#include "src/core/corestructs.h" -#include "src/chatlog/chatmessage.h" -#include "src/core/toxid.h" +#include "core/corestructs.h" +#include "chatlog/chatmessage.h" +#include "core/toxid.h" /** * Spacing in px inserted when the author of the last message changes diff --git a/src/widget/form/groupchatform.cpp b/src/widget/form/groupchatform.cpp index 1b289cb43..a5c865e86 100644 --- a/src/widget/form/groupchatform.cpp +++ b/src/widget/form/groupchatform.cpp @@ -24,19 +24,19 @@ #include #include "tabcompleter.h" -#include "src/group.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/widget/groupwidget.h" -#include "src/widget/tool/croppinglabel.h" -#include "src/widget/maskablepixmapwidget.h" -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/widget/style.h" -#include "src/widget/flowlayout.h" -#include "src/widget/translator.h" -#include "src/widget/form/chatform.h" -#include "src/video/groupnetcamview.h" +#include "group.h" +#include "friend.h" +#include "friendlist.h" +#include "widget/groupwidget.h" +#include "widget/tool/croppinglabel.h" +#include "widget/maskablepixmapwidget.h" +#include "core/core.h" +#include "core/coreav.h" +#include "widget/style.h" +#include "widget/flowlayout.h" +#include "widget/translator.h" +#include "widget/form/chatform.h" +#include "video/groupnetcamview.h" /** * @var QList GroupChatForm::peerLabels diff --git a/src/widget/form/groupinviteform.cpp b/src/widget/form/groupinviteform.cpp index feb652fb8..08b3acc5e 100644 --- a/src/widget/form/groupinviteform.cpp +++ b/src/widget/form/groupinviteform.cpp @@ -29,14 +29,14 @@ #include #include #include "ui_mainwindow.h" -#include "src/persistence/settings.h" -#include "src/widget/tool/croppinglabel.h" -#include "src/widget/translator.h" -#include "src/nexus.h" -#include "src/core/core.h" -#include "src/widget/gui.h" -#include "src/widget/translator.h" -#include "src/widget/contentlayout.h" +#include "persistence/settings.h" +#include "widget/tool/croppinglabel.h" +#include "widget/translator.h" +#include "nexus.h" +#include "core/core.h" +#include "widget/gui.h" +#include "widget/translator.h" +#include "widget/contentlayout.h" GroupInviteForm::GroupInviteForm() { diff --git a/src/widget/form/groupinviteform.h b/src/widget/form/groupinviteform.h index 4b6b08fc5..5ac356b2f 100644 --- a/src/widget/form/groupinviteform.h +++ b/src/widget/form/groupinviteform.h @@ -23,8 +23,8 @@ #include #include #include -#include "src/widget/tool/croppinglabel.h" -#include "src/widget/gui.h" +#include "widget/tool/croppinglabel.h" +#include "widget/gui.h" #include class QLabel; diff --git a/src/widget/form/profileform.cpp b/src/widget/form/profileform.cpp index 313954eb8..ec4bf63de 100644 --- a/src/widget/form/profileform.cpp +++ b/src/widget/form/profileform.cpp @@ -17,23 +17,23 @@ along with qTox. If not, see . */ -#include "src/core/core.h" -#include "src/nexus.h" +#include "core/core.h" +#include "nexus.h" #include "ui_profileform.h" #include "profileform.h" -#include "src/widget/form/settingswidget.h" -#include "src/widget/maskablepixmapwidget.h" -#include "src/widget/form/setpassworddialog.h" -#include "src/widget/contentlayout.h" -#include "src/widget/tool/croppinglabel.h" -#include "src/widget/widget.h" -#include "src/widget/gui.h" -#include "src/widget/style.h" -#include "src/widget/translator.h" -#include "src/persistence/profilelocker.h" -#include "src/persistence/profile.h" -#include "src/persistence/settings.h" -#include "src/net/toxme.h" +#include "widget/form/settingswidget.h" +#include "widget/maskablepixmapwidget.h" +#include "widget/form/setpassworddialog.h" +#include "widget/contentlayout.h" +#include "widget/tool/croppinglabel.h" +#include "widget/widget.h" +#include "widget/gui.h" +#include "widget/style.h" +#include "widget/translator.h" +#include "persistence/profilelocker.h" +#include "persistence/profile.h" +#include "persistence/settings.h" +#include "net/toxme.h" #include #include #include diff --git a/src/widget/form/profileform.h b/src/widget/form/profileform.h index b30d31236..f0529cfe3 100644 --- a/src/widget/form/profileform.h +++ b/src/widget/form/profileform.h @@ -24,8 +24,8 @@ #include #include #include -#include "src/core/core.h" -#include "src/widget/qrwidget.h" +#include "core/core.h" +#include "widget/qrwidget.h" class CroppingLabel; class Core; diff --git a/src/widget/form/settings/aboutform.cpp b/src/widget/form/settings/aboutform.cpp index fe1daccf5..45f65b140 100644 --- a/src/widget/form/settings/aboutform.cpp +++ b/src/widget/form/settings/aboutform.cpp @@ -24,9 +24,9 @@ #include #include -#include "src/core/recursivesignalblocker.h" -#include "src/net/autoupdate.h" -#include "src/widget/translator.h" +#include "core/recursivesignalblocker.h" +#include "net/autoupdate.h" +#include "widget/translator.h" /** * @class AboutForm diff --git a/src/widget/form/settings/advancedform.cpp b/src/widget/form/settings/advancedform.cpp index 9d1c7df7d..65fab7d83 100644 --- a/src/widget/form/settings/advancedform.cpp +++ b/src/widget/form/settings/advancedform.cpp @@ -27,15 +27,15 @@ #include #include -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/core/recursivesignalblocker.h" -#include "src/nexus.h" -#include "src/persistence/settings.h" -#include "src/persistence/db/plaindb.h" -#include "src/persistence/profile.h" -#include "src/widget/gui.h" -#include "src/widget/translator.h" +#include "core/core.h" +#include "core/coreav.h" +#include "core/recursivesignalblocker.h" +#include "nexus.h" +#include "persistence/settings.h" +#include "persistence/db/plaindb.h" +#include "persistence/profile.h" +#include "widget/gui.h" +#include "widget/translator.h" /** * @class AdvancedForm diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp index 1ddb62ffc..2d591bd88 100644 --- a/src/widget/form/settings/avform.cpp +++ b/src/widget/form/settings/avform.cpp @@ -27,16 +27,16 @@ #include #include -#include "src/audio/audio.h" -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/core/recursivesignalblocker.h" -#include "src/persistence/settings.h" -#include "src/video/cameradevice.h" -#include "src/video/camerasource.h" -#include "src/video/videosurface.h" -#include "src/widget/tool/screenshotgrabber.h" -#include "src/widget/translator.h" +#include "audio/audio.h" +#include "core/core.h" +#include "core/coreav.h" +#include "core/recursivesignalblocker.h" +#include "persistence/settings.h" +#include "video/cameradevice.h" +#include "video/camerasource.h" +#include "video/videosurface.h" +#include "widget/tool/screenshotgrabber.h" +#include "widget/translator.h" #ifndef ALC_ALL_DEVICES_SPECIFIER #define ALC_ALL_DEVICES_SPECIFIER ALC_DEVICE_SPECIFIER diff --git a/src/widget/form/settings/avform.h b/src/widget/form/settings/avform.h index 2e9f56a3d..5c139516e 100644 --- a/src/widget/form/settings/avform.h +++ b/src/widget/form/settings/avform.h @@ -26,7 +26,7 @@ #include "genericsettings.h" #include "ui_avform.h" -#include "src/video/videomode.h" +#include "video/videomode.h" class CameraSource; diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp index 64abb584a..52cfe327a 100644 --- a/src/widget/form/settings/generalform.cpp +++ b/src/widget/form/settings/generalform.cpp @@ -22,18 +22,18 @@ #include -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/core/recursivesignalblocker.h" -#include "src/net/autoupdate.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" -#include "src/persistence/settings.h" -#include "src/persistence/smileypack.h" -#include "src/widget/form/settingswidget.h" -#include "src/widget/style.h" -#include "src/widget/translator.h" -#include "src/widget/widget.h" +#include "core/core.h" +#include "core/coreav.h" +#include "core/recursivesignalblocker.h" +#include "net/autoupdate.h" +#include "nexus.h" +#include "persistence/profile.h" +#include "persistence/settings.h" +#include "persistence/smileypack.h" +#include "widget/form/settingswidget.h" +#include "widget/style.h" +#include "widget/translator.h" +#include "widget/widget.h" static QStringList locales = {"ar", "be", diff --git a/src/widget/form/settings/privacyform.cpp b/src/widget/form/settings/privacyform.cpp index daa4b32ea..705e6f6d6 100644 --- a/src/widget/form/settings/privacyform.cpp +++ b/src/widget/form/settings/privacyform.cpp @@ -24,17 +24,17 @@ #include #include -#include "src/core/core.h" -#include "src/core/recursivesignalblocker.h" -#include "src/nexus.h" -#include "src/persistence/history.h" -#include "src/persistence/profile.h" -#include "src/persistence/settings.h" -#include "src/widget/form/setpassworddialog.h" -#include "src/widget/form/settingswidget.h" -#include "src/widget/gui.h" -#include "src/widget/translator.h" -#include "src/widget/widget.h" +#include "core/core.h" +#include "core/recursivesignalblocker.h" +#include "nexus.h" +#include "persistence/history.h" +#include "persistence/profile.h" +#include "persistence/settings.h" +#include "widget/form/setpassworddialog.h" +#include "widget/form/settingswidget.h" +#include "widget/gui.h" +#include "widget/translator.h" +#include "widget/widget.h" PrivacyForm::PrivacyForm() : GenericForm(QPixmap(":/img/settings/privacy.png")) diff --git a/src/widget/form/settings/userinterfaceform.cpp b/src/widget/form/settings/userinterfaceform.cpp index 22003eeee..89f7c5fe3 100644 --- a/src/widget/form/settings/userinterfaceform.cpp +++ b/src/widget/form/settings/userinterfaceform.cpp @@ -31,18 +31,18 @@ #include #include -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/core/recursivesignalblocker.h" -#include "src/net/autoupdate.h" -#include "src/nexus.h" -#include "src/persistence/profile.h" -#include "src/persistence/settings.h" -#include "src/persistence/smileypack.h" -#include "src/widget/form/settingswidget.h" -#include "src/widget/style.h" -#include "src/widget/translator.h" -#include "src/widget/widget.h" +#include "core/core.h" +#include "core/coreav.h" +#include "core/recursivesignalblocker.h" +#include "net/autoupdate.h" +#include "nexus.h" +#include "persistence/profile.h" +#include "persistence/settings.h" +#include "persistence/smileypack.h" +#include "widget/form/settingswidget.h" +#include "widget/style.h" +#include "widget/translator.h" +#include "widget/widget.h" /** * @class UserInterfaceForm diff --git a/src/widget/form/settings/userinterfaceform.h b/src/widget/form/settings/userinterfaceform.h index 353705d0f..99156fe11 100644 --- a/src/widget/form/settings/userinterfaceform.h +++ b/src/widget/form/settings/userinterfaceform.h @@ -21,7 +21,7 @@ #define USERINTERFACEFORM_H #include "genericsettings.h" -#include "src/widget/form/settingswidget.h" +#include "widget/form/settingswidget.h" namespace Ui { class UserInterfaceSettings; diff --git a/src/widget/form/settingswidget.cpp b/src/widget/form/settingswidget.cpp index 85a2844dc..9b13e57ea 100644 --- a/src/widget/form/settingswidget.cpp +++ b/src/widget/form/settingswidget.cpp @@ -23,16 +23,16 @@ #include #include -#include "src/video/camerasource.h" -#include "src/widget/widget.h" -#include "src/widget/form/settings/generalform.h" -#include "src/widget/form/settings/userinterfaceform.h" -#include "src/widget/form/settings/privacyform.h" -#include "src/widget/form/settings/avform.h" -#include "src/widget/form/settings/advancedform.h" -#include "src/widget/form/settings/aboutform.h" -#include "src/widget/translator.h" -#include "src/widget/contentlayout.h" +#include "video/camerasource.h" +#include "widget/widget.h" +#include "widget/form/settings/generalform.h" +#include "widget/form/settings/userinterfaceform.h" +#include "widget/form/settings/privacyform.h" +#include "widget/form/settings/avform.h" +#include "widget/form/settings/advancedform.h" +#include "widget/form/settings/aboutform.h" +#include "widget/translator.h" +#include "widget/contentlayout.h" SettingsWidget::SettingsWidget(QWidget* parent) : QWidget(parent, Qt::Window) diff --git a/src/widget/form/tabcompleter.cpp b/src/widget/form/tabcompleter.cpp index 7afef6412..00833d99d 100644 --- a/src/widget/form/tabcompleter.cpp +++ b/src/widget/form/tabcompleter.cpp @@ -25,9 +25,9 @@ #include #include -#include "src/core/core.h" -#include "src/group.h" -#include "src/widget/tool/chattextedit.h" +#include "core/core.h" +#include "group.h" +#include "widget/tool/chattextedit.h" /** * @file tabcompleter.h diff --git a/src/widget/form/tabcompleter.h b/src/widget/form/tabcompleter.h index 70047458f..1fe273150 100644 --- a/src/widget/form/tabcompleter.h +++ b/src/widget/form/tabcompleter.h @@ -25,8 +25,8 @@ #include #include -#include "src/group.h" -#include "src/widget/tool/chattextedit.h" +#include "group.h" +#include "widget/tool/chattextedit.h" class TabCompleter : public QObject { diff --git a/src/widget/friendlistlayout.cpp b/src/widget/friendlistlayout.cpp index d7bc995f5..e3154485e 100644 --- a/src/widget/friendlistlayout.cpp +++ b/src/widget/friendlistlayout.cpp @@ -13,8 +13,8 @@ */ #include "friendlistlayout.h" -#include "src/friend.h" -#include "src/friendlist.h" +#include "friend.h" +#include "friendlist.h" #include "friendwidget.h" #include "friendlistwidget.h" #include diff --git a/src/widget/friendlistlayout.h b/src/widget/friendlistlayout.h index 35d48016a..d814a5ee4 100644 --- a/src/widget/friendlistlayout.h +++ b/src/widget/friendlistlayout.h @@ -16,7 +16,7 @@ #define FRIENDLISTLAYOUT_H #include -#include "src/core/corestructs.h" +#include "core/corestructs.h" #include "genericchatitemlayout.h" class FriendWidget; diff --git a/src/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp index 572f6f0a1..ea8cc1f1e 100644 --- a/src/widget/friendlistwidget.cpp +++ b/src/widget/friendlistwidget.cpp @@ -19,9 +19,9 @@ #include "friendlistwidget.h" #include "friendlistlayout.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/persistence/settings.h" +#include "friend.h" +#include "friendlist.h" +#include "persistence/settings.h" #include "friendwidget.h" #include "groupwidget.h" #include "circlewidget.h" diff --git a/src/widget/friendlistwidget.h b/src/widget/friendlistwidget.h index 63c4ac20f..d12cf04dc 100644 --- a/src/widget/friendlistwidget.h +++ b/src/widget/friendlistwidget.h @@ -21,7 +21,7 @@ #define FRIENDLISTWIDGET_H #include -#include "src/core/corestructs.h" +#include "core/corestructs.h" #include "genericchatitemlayout.h" class QVBoxLayout; diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp index 1749f4b7f..379242faf 100644 --- a/src/widget/friendwidget.cpp +++ b/src/widget/friendwidget.cpp @@ -16,22 +16,22 @@ */ #include "friendwidget.h" -#include "src/group.h" -#include "src/grouplist.h" +#include "group.h" +#include "grouplist.h" #include "groupwidget.h" #include "circlewidget.h" #include "friendlistwidget.h" -#include "src/friendlist.h" -#include "src/friend.h" -#include "src/core/core.h" +#include "friendlist.h" +#include "friend.h" +#include "core/core.h" #include "form/chatform.h" #include "maskablepixmapwidget.h" #include "contentdialog.h" -#include "src/widget/tool/croppinglabel.h" -#include "src/widget/style.h" -#include "src/persistence/settings.h" -#include "src/widget/widget.h" -#include "src/widget/about/aboutuser.h" +#include "widget/tool/croppinglabel.h" +#include "widget/style.h" +#include "persistence/settings.h" +#include "widget/widget.h" +#include "widget/about/aboutuser.h" #include #include #include diff --git a/src/widget/genericchatitemwidget.cpp b/src/widget/genericchatitemwidget.cpp index 2600238b0..648c59b11 100644 --- a/src/widget/genericchatitemwidget.cpp +++ b/src/widget/genericchatitemwidget.cpp @@ -18,9 +18,9 @@ */ #include "genericchatitemwidget.h" -#include "src/widget/style.h" -#include "src/persistence/settings.h" -#include "src/widget/tool/croppinglabel.h" +#include "widget/style.h" +#include "persistence/settings.h" +#include "widget/tool/croppinglabel.h" #include GenericChatItemWidget::GenericChatItemWidget(QWidget *parent) diff --git a/src/widget/genericchatroomwidget.cpp b/src/widget/genericchatroomwidget.cpp index 1d668480e..816c1a1dd 100644 --- a/src/widget/genericchatroomwidget.cpp +++ b/src/widget/genericchatroomwidget.cpp @@ -18,10 +18,10 @@ */ #include "genericchatroomwidget.h" -#include "src/widget/style.h" -#include "src/persistence/settings.h" +#include "widget/style.h" +#include "persistence/settings.h" #include "maskablepixmapwidget.h" -#include "src/widget/tool/croppinglabel.h" +#include "widget/tool/croppinglabel.h" #include #include diff --git a/src/widget/groupwidget.cpp b/src/widget/groupwidget.cpp index e37d8edfa..23ed4221a 100644 --- a/src/widget/groupwidget.cpp +++ b/src/widget/groupwidget.cpp @@ -30,15 +30,15 @@ #include "contentdialog.h" #include "form/groupchatform.h" #include "maskablepixmapwidget.h" -#include "src/core/core.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/group.h" -#include "src/grouplist.h" -#include "src/persistence/settings.h" -#include "src/widget/friendwidget.h" -#include "src/widget/style.h" -#include "src/widget/translator.h" +#include "core/core.h" +#include "friend.h" +#include "friendlist.h" +#include "group.h" +#include "grouplist.h" +#include "persistence/settings.h" +#include "widget/friendwidget.h" +#include "widget/style.h" +#include "widget/translator.h" #include "tool/croppinglabel.h" GroupWidget::GroupWidget(int GroupId, QString Name) diff --git a/src/widget/gui.cpp b/src/widget/gui.cpp index 628886492..23c83d60b 100644 --- a/src/widget/gui.cpp +++ b/src/widget/gui.cpp @@ -20,7 +20,7 @@ #include "gui.h" #include "widget.h" -#include "src/nexus.h" +#include "nexus.h" #include #include #include diff --git a/src/widget/loginscreen.cpp b/src/widget/loginscreen.cpp index 46b4a3481..e97d32fce 100644 --- a/src/widget/loginscreen.cpp +++ b/src/widget/loginscreen.cpp @@ -20,14 +20,14 @@ #include "loginscreen.h" #include "ui_loginscreen.h" -#include "src/persistence/profile.h" -#include "src/persistence/profilelocker.h" -#include "src/nexus.h" -#include "src/persistence/settings.h" -#include "src/widget/form/setpassworddialog.h" -#include "src/widget/translator.h" -#include "src/widget/style.h" -#include "src/widget/tool/profileimporter.h" +#include "persistence/profile.h" +#include "persistence/profilelocker.h" +#include "nexus.h" +#include "persistence/settings.h" +#include "widget/form/setpassworddialog.h" +#include "widget/translator.h" +#include "widget/style.h" +#include "widget/tool/profileimporter.h" #include #include #include diff --git a/src/widget/passwordedit.cpp b/src/widget/passwordedit.cpp index bbcc42b13..de156dee7 100644 --- a/src/widget/passwordedit.cpp +++ b/src/widget/passwordedit.cpp @@ -1,6 +1,6 @@ #include "passwordedit.h" #ifdef QTOX_PLATFORM_EXT -#include "src/platform/capslock.h" +#include "platform/capslock.h" #endif #include diff --git a/src/widget/style.cpp b/src/widget/style.cpp index a167e2423..e1d8c9423 100644 --- a/src/widget/style.cpp +++ b/src/widget/style.cpp @@ -18,8 +18,8 @@ */ #include "style.h" -#include "src/persistence/settings.h" -#include "src/widget/gui.h" +#include "persistence/settings.h" +#include "widget/gui.h" #include #include diff --git a/src/widget/systemtrayicon.cpp b/src/widget/systemtrayicon.cpp index 2195cf807..53332686e 100644 --- a/src/widget/systemtrayicon.cpp +++ b/src/widget/systemtrayicon.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "src/persistence/settings.h" +#include "persistence/settings.h" SystemTrayIcon::SystemTrayIcon() { diff --git a/src/widget/systemtrayicon_private.h b/src/widget/systemtrayicon_private.h index bbe8c74d8..399998abc 100644 --- a/src/widget/systemtrayicon_private.h +++ b/src/widget/systemtrayicon_private.h @@ -33,7 +33,7 @@ extern "C" { #include #include #include - #include "src/platform/statusnotifier/statusnotifier.h" + #include "platform/statusnotifier/statusnotifier.h" } #define signals public #endif diff --git a/src/widget/tool/callconfirmwidget.cpp b/src/widget/tool/callconfirmwidget.cpp index 9da42dd61..8de6626b1 100644 --- a/src/widget/tool/callconfirmwidget.cpp +++ b/src/widget/tool/callconfirmwidget.cpp @@ -19,7 +19,7 @@ #include "callconfirmwidget.h" -#include "src/widget/widget.h" +#include "widget/widget.h" #include #include #include diff --git a/src/widget/tool/chattextedit.cpp b/src/widget/tool/chattextedit.cpp index a43449991..f5db4b5e9 100644 --- a/src/widget/tool/chattextedit.cpp +++ b/src/widget/tool/chattextedit.cpp @@ -18,7 +18,7 @@ */ #include "chattextedit.h" -#include "src/widget/translator.h" +#include "widget/translator.h" #include ChatTextEdit::ChatTextEdit(QWidget *parent) : diff --git a/src/widget/tool/micfeedbackwidget.cpp b/src/widget/tool/micfeedbackwidget.cpp index 79fd47d14..77faec761 100644 --- a/src/widget/tool/micfeedbackwidget.cpp +++ b/src/widget/tool/micfeedbackwidget.cpp @@ -18,7 +18,7 @@ */ #include "micfeedbackwidget.h" -#include "src/audio/audio.h" +#include "audio/audio.h" #include #include diff --git a/src/widget/tool/profileimporter.cpp b/src/widget/tool/profileimporter.cpp index 9298c74f9..5e004f386 100644 --- a/src/widget/tool/profileimporter.cpp +++ b/src/widget/tool/profileimporter.cpp @@ -24,8 +24,8 @@ #include #include -#include "src/core/core.h" -#include "src/persistence/settings.h" +#include "core/core.h" +#include "persistence/settings.h" /** * @class ProfileImporter diff --git a/src/widget/tool/removefrienddialog.h b/src/widget/tool/removefrienddialog.h index 4f99ccb59..a7c7594f3 100644 --- a/src/widget/tool/removefrienddialog.h +++ b/src/widget/tool/removefrienddialog.h @@ -4,7 +4,7 @@ #include #include "ui_removefrienddialog.h" -#include "src/friend.h" +#include "friend.h" class RemoveFriendDialog : public QDialog diff --git a/src/widget/tool/screenshotgrabber.cpp b/src/widget/tool/screenshotgrabber.cpp index d80f914fd..88ea07bf2 100644 --- a/src/widget/tool/screenshotgrabber.cpp +++ b/src/widget/tool/screenshotgrabber.cpp @@ -33,7 +33,7 @@ #include "screengrabberchooserrectitem.h" #include "screengrabberoverlayitem.h" #include "toolboxgraphicsitem.h" -#include "src/widget/widget.h" +#include "widget/widget.h" ScreenshotGrabber::ScreenshotGrabber() : QObject() diff --git a/src/widget/translator.cpp b/src/widget/translator.cpp index 880166a5a..d98a1c81a 100644 --- a/src/widget/translator.cpp +++ b/src/widget/translator.cpp @@ -19,7 +19,7 @@ #include "translator.h" -#include "src/persistence/settings.h" +#include "persistence/settings.h" #include #include #include diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 788bd959c..6007d7ddd 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -46,28 +46,28 @@ #include "friendwidget.h" #include "groupwidget.h" #include "maskablepixmapwidget.h" -#include "src/audio/audio.h" -#include "src/core/core.h" -#include "src/core/coreav.h" -#include "src/friend.h" -#include "src/friendlist.h" -#include "src/group.h" -#include "src/grouplist.h" -#include "src/net/autoupdate.h" -#include "src/nexus.h" -#include "src/persistence/offlinemsgengine.h" -#include "src/persistence/profile.h" -#include "src/persistence/settings.h" -#include "src/platform/timer.h" -#include "src/widget/form/addfriendform.h" -#include "src/widget/form/chatform.h" -#include "src/widget/form/filesform.h" -#include "src/widget/form/groupinviteform.h" -#include "src/widget/form/profileform.h" -#include "src/widget/form/settingswidget.h" -#include "src/widget/gui.h" -#include "src/widget/style.h" -#include "src/widget/translator.h" +#include "audio/audio.h" +#include "core/core.h" +#include "core/coreav.h" +#include "friend.h" +#include "friendlist.h" +#include "group.h" +#include "grouplist.h" +#include "net/autoupdate.h" +#include "nexus.h" +#include "persistence/offlinemsgengine.h" +#include "persistence/profile.h" +#include "persistence/settings.h" +#include "platform/timer.h" +#include "widget/form/addfriendform.h" +#include "widget/form/chatform.h" +#include "widget/form/filesform.h" +#include "widget/form/groupinviteform.h" +#include "widget/form/profileform.h" +#include "widget/form/settingswidget.h" +#include "widget/gui.h" +#include "widget/style.h" +#include "widget/translator.h" #include "systemtrayicon.h" #include "tool/removefrienddialog.h" diff --git a/src/widget/widget.h b/src/widget/widget.h index a6189fdae..68081e134 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -27,7 +27,7 @@ #include #include "genericchatitemwidget.h" -#include "src/core/corestructs.h" +#include "core/corestructs.h" #define PIXELS_TO_ACT 7