cleanup: Minimise direct dependencies on core.h.

And transitively on tox.h. This reduces the amount of rebuild that needs to happen when we change tox.h.
TokTok · Nov 17, 2024 · b699420 · b699420
1 parent ac039b9
commit b699420
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 43 deletions.
diff --git a/src/chatlog/chatwidget.cpp b/src/chatlog/chatwidget.cpp
@@ -10,6 +10,7 @@
 #include "content/filetransferwidget.h"
 #include "content/text.h"
 #include "src/chatlog/chatlinestorage.h"
+#include "src/core/core.h"
 #include "src/persistence/settings.h"
 #include "src/widget/style.h"
 #include "src/widget/translator.h"

diff --git a/src/core/corefile.h b/src/core/corefile.h
@@ -6,10 +6,9 @@
 
 #pragma once
 
-#include <tox/tox.h>
+#include <tox/tox.h> // Tox_File_Control
 
 #include "toxfile.h"
-#include "src/core/core.h"
 #include "src/core/toxpk.h"
 #include "src/model/status.h"
 
@@ -23,6 +22,7 @@
 #include <memory>
 
 struct Tox;
+class Core;
 class CoreFile;
 
 using CoreFilePtr = std::unique_ptr<CoreFile>;

diff --git a/src/model/chatroom/friendchatroom.cpp b/src/model/chatroom/friendchatroom.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "src/model/chatroom/friendchatroom.h"
+#include "src/core/core.h"
 #include "src/grouplist.h"
 #include "src/model/dialogs/idialogsmanager.h"
 #include "src/model/friend.h"

diff --git a/src/model/friend.h b/src/model/friend.h
@@ -7,7 +7,6 @@
 
 #include "chat.h"
 #include "src/core/chatid.h"
-#include "src/core/core.h"
 #include "src/core/extension.h"
 #include "src/core/toxpk.h"
 #include "src/model/status.h"

diff --git a/src/model/ichatlog.h b/src/model/ichatlog.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "message.h"
-#include "src/core/core.h"
 #include "src/core/toxfile.h"
 #include "src/core/toxpk.h"
 #include "src/friendlist.h"

diff --git a/src/model/imessagedispatcher.h b/src/model/imessagedispatcher.h
@@ -8,6 +8,7 @@
 #include "src/model/brokenmessagereason.h"
 #include "src/model/friend.h"
 #include "src/model/message.h"
+#include "util/strongtype.h"
 
 #include <QObject>
 #include <QString>

diff --git a/src/persistence/history.cpp b/src/persistence/history.cpp
@@ -6,7 +6,8 @@
 #include <QDebug>
 #include <cassert>
 
-#include "history.h"
+#include <tox/tox.h>
+
 #include "profile.h"
 #include "settings.h"
 #include "db/rawdatabase.h"

diff --git a/src/persistence/offlinemsgengine.h b/src/persistence/offlinemsgengine.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "src/chatlog/chatmessage.h"
-#include "src/core/core.h"
+#include "src/core/receiptnum.h"
 #include "src/model/message.h"
 #include "src/persistence/db/rawdatabase.h"
 
@@ -17,7 +17,6 @@
 #include <QSet>
 #include <chrono>
 
-
 class OfflineMsgEngine : public QObject
 {
     Q_OBJECT

diff --git a/src/persistence/profile.h b/src/persistence/profile.h
@@ -6,11 +6,8 @@
 
 #pragma once
 
-#include "src/core/core.h"
 #include "src/core/toxencrypt.h"
-
 #include "src/net/avatarbroadcaster.h"
-
 #include "src/net/bootstrapnodeupdater.h"
 #include "src/persistence/history.h"
 
@@ -21,11 +18,13 @@
 #include <QVector>
 #include <memory>
 
-class Settings;
-class QCommandLineParser;
-class ToxPk;
 class CameraSource;
+class Core;
+class CoreAV;
 class IMessageBoxManager;
+class QCommandLineParser;
+class Settings;
+class ToxPk;
 
 class Profile : public QObject
 {

diff --git a/src/widget/categorywidget.h b/src/widget/categorywidget.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "genericchatitemwidget.h"
-#include "src/core/core.h"
 #include "src/model/status.h"
 
 class FriendListLayout;

diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h
@@ -11,7 +11,6 @@
 #include <QTimer>
 
 #include "genericchatform.h"
-#include "src/core/core.h"
 #include "src/model/ichatlog.h"
 #include "src/model/imessagedispatcher.h"
 #include "src/model/status.h"
@@ -20,23 +19,24 @@
 #include "src/widget/tool/screenshotgrabber.h"
 
 class CallConfirmWidget;
+class ContentDialogManager;
+class Core;
+class DocumentCache;
 class FileTransferInstance;
 class Friend;
+class FriendList;
+class GroupList;
 class History;
+class ImagePreviewButton;
+class IMessageBoxManager;
 class OfflineMsgEngine;
-class QPixmap;
+class Profile;
 class QHideEvent;
 class QMoveEvent;
-class ImagePreviewButton;
-class DocumentCache;
-class SmileyPack;
+class QPixmap;
 class Settings;
+class SmileyPack;
 class Style;
-class Profile;
-class IMessageBoxManager;
-class ContentDialogManager;
-class FriendList;
-class GroupList;
 
 class ChatForm : public GenericChatForm
 {

diff --git a/src/widget/form/filesform.cpp b/src/widget/form/filesform.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "filesform.h"
+#include "src/core/corefile.h"
 #include "src/core/toxfile.h"
 #include "src/friendlist.h"
 #include "src/widget/contentlayout.h"

diff --git a/src/widget/form/filesform.h b/src/widget/form/filesform.h
@@ -5,7 +5,6 @@
 
 #pragma once
 
-#include "src/core/corefile.h"
 #include "src/core/toxfile.h"
 
 #include <QAbstractTableModel>
@@ -19,12 +18,13 @@
 #include <QVBoxLayout>
 
 class ContentLayout;
+class CoreFile;
+class FriendList;
+class IMessageBoxManager;
+class QFileInfo;
 class QTableView;
 class Settings;
 class Style;
-class QFileInfo;
-class IMessageBoxManager;
-class FriendList;
 
 namespace FileTransferList {
 

diff --git a/src/widget/friendlistlayout.h b/src/widget/friendlistlayout.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "genericchatitemlayout.h"
-#include "src/core/core.h"
 #include "src/model/status.h"
 #include <QBoxLayout>
 

diff --git a/src/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp
@@ -8,6 +8,7 @@
 #include "friendwidget.h"
 #include "groupwidget.h"
 #include "widget.h"
+#include "src/core/core.h"
 #include "src/friendlist.h"
 #include "src/model/friend.h"
 #include "src/model/friendlist/friendlistmanager.h"

diff --git a/src/widget/friendlistwidget.h b/src/widget/friendlistwidget.h
@@ -6,30 +6,30 @@
 #pragma once
 
 #include "genericchatitemlayout.h"
-#include "src/core/core.h"
 #include "src/model/status.h"
 #include "src/persistence/settings.h"
 
 #include <QWidget>
 
-class QVBoxLayout;
-class QGridLayout;
-class QPixmap;
-class Widget;
-class FriendWidget;
-class GroupWidget;
+class CategoryWidget;
 class CircleWidget;
+class Core;
+class Friend;
+class FriendList;
 class FriendListManager;
+class FriendWidget;
 class GenericChatroomWidget;
-class CategoryWidget;
-class Friend;
+class GroupList;
+class GroupWidget;
 class IFriendListItem;
-class Settings;
-class Style;
 class IMessageBoxManager;
-class FriendList;
-class GroupList;
 class Profile;
+class QGridLayout;
+class QPixmap;
+class QVBoxLayout;
+class Settings;
+class Style;
+class Widget;
 
 class FriendListWidget : public QWidget
 {

diff --git a/src/widget/widget.h b/src/widget/widget.h
@@ -17,7 +17,6 @@
 
 #include "audio/iaudiocontrol.h"
 #include "audio/iaudiosink.h"
-#include "src/core/core.h"
 #include "src/core/groupid.h"
 #include "src/core/toxfile.h"
 #include "src/core/toxid.h"

diff --git a/test/model/friendmessagedispatcher_test.cpp b/test/model/friendmessagedispatcher_test.cpp
@@ -14,6 +14,8 @@
 #include <deque>
 #include <set>
 
+#include <tox/tox.h> // tox_max_message_length
+
 namespace {
 constexpr uint64_t testMaxExtendedMessageSize = 10 * 1024 * 1024;
 }

diff --git a/test/model/groupmessagedispatcher_test.cpp b/test/model/groupmessagedispatcher_test.cpp
@@ -21,6 +21,7 @@
 #include <deque>
 #include <set>
 
+#include <tox/tox.h> // tox_max_message_length
 
 class MockGroupMessageSender : public ICoreGroupMessageSender
 {

diff --git a/test/widget/filesform_test.cpp b/test/widget/filesform_test.cpp
@@ -10,6 +10,8 @@
 #include <QTest>
 #include <limits>
 
+#include <tox/tox.h> // TOX_FILE_KIND_*
+
 class TestFileTransferList : public QObject
 {
     Q_OBJECT