Forward declare some classes

src/gui/cookiesdialog.h

@@ -31,13 +31,13 @@
 
 #include <QDialog>
 
+class CookiesModel;
+
 namespace Ui
 {
     class CookiesDialog;
 }
 
-class CookiesModel;
-
 class CookiesDialog : public QDialog
 {
     Q_OBJECT

src/gui/executionlogwidget.h

@@ -32,11 +32,12 @@
 #include <QWidget>
 #include "base/logger.h"
 
+class LogListWidget;
+
 namespace Ui
 {
     class ExecutionLogWidget;
 }
-class LogListWidget;
 
 class ExecutionLogWidget : public QWidget
 {

src/gui/properties/peerlistwidget.h

@@ -42,11 +42,6 @@ class PeerListDelegate;
 class PeerListSortModel;
 class PropertiesWidget;
 
-namespace Net
-{
-    class ReverseResolution;
-}
-
 namespace BitTorrent
 {
     class TorrentHandle;
@@ -54,6 +49,11 @@ namespace BitTorrent
     struct PeerAddress;
 }
 
+namespace Net
+{
+    class ReverseResolution;
+}
+
 class PeerListWidget : public QTreeView
 {
     Q_OBJECT

src/gui/properties/propertieswidget.cpp

@@ -44,6 +44,7 @@
 
 #include "base/bittorrent/downloadpriority.h"
 #include "base/bittorrent/session.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "base/preferences.h"
 #include "base/unicodestrings.h"
 #include "base/utils/fs.h"

src/gui/properties/propertieswidget.h

@@ -32,8 +32,6 @@
 #include <QList>
 #include <QWidget>
 
-#include "base/bittorrent/torrenthandle.h"
-
 class QPushButton;
 class QTreeView;
 
@@ -46,6 +44,11 @@ class PropTabBar;
 class TorrentContentFilterModel;
 class TrackerListWidget;
 
+namespace BitTorrent
+{
+    class TorrentHandle;
+}
+
 namespace Ui
 {
     class PropertiesWidget;

src/gui/properties/proplistdelegate.cpp

@@ -41,6 +41,7 @@
 #endif
 
 #include "base/bittorrent/downloadpriority.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "base/unicodestrings.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"

src/gui/properties/speedwidget.cpp

@@ -39,6 +39,7 @@
 #include "base/bittorrent/sessionstatus.h"
 #include "base/preferences.h"
 #include "propertieswidget.h"
+#include "speedplotview.h"
 
 ComboBoxMenuButton::ComboBoxMenuButton(QWidget *parent, QMenu *menu)
     : QComboBox(parent)

src/gui/properties/speedwidget.h

@@ -32,14 +32,13 @@
 #include <QComboBox>
 #include <QWidget>
 
-#include "speedplotview.h"
-
 class QHBoxLayout;
 class QLabel;
 class QMenu;
 class QVBoxLayout;
 
 class PropertiesWidget;
+class SpeedPlotView;
 
 class ComboBoxMenuButton : public QComboBox
 {

src/gui/search/searchjobwidget.h

@@ -38,14 +38,14 @@ class QHeaderView;
 class QModelIndex;
 class QStandardItemModel;
 
-template <typename T> class CachedSettingValue;
-
 class LineEdit;
 class SearchHandler;
 class SearchListDelegate;
 class SearchSortModel;
 struct SearchResult;
 
+template <typename T> class CachedSettingValue;
+
 namespace Ui
 {
     class SearchJobWidget;

src/gui/torrentcontentmodelfolder.cpp

@@ -28,6 +28,8 @@
 
 #include "torrentcontentmodelfolder.h"
 
+#include <QVariant>
+
 #include "base/bittorrent/torrenthandle.h"
 #include "base/global.h"
 

src/gui/torrentcontentmodelitem.cpp

@@ -28,6 +28,8 @@
 
 #include "torrentcontentmodelitem.h"
 
+#include <QVariant>
+
 #include "torrentcontentmodelfolder.h"
 
 TorrentContentModelItem::TorrentContentModelItem(TorrentContentModelFolder *parent)

src/gui/torrentcreatordialog.h

@@ -34,14 +34,14 @@
 
 #include "base/settingvalue.h"
 
-namespace Ui
+namespace BitTorrent
 {
-    class TorrentCreatorDialog;
+    class TorrentCreatorThread;
 }
 
-namespace BitTorrent
+namespace Ui
 {
-    class TorrentCreatorThread;
+    class TorrentCreatorDialog;
 }
 
 class TorrentCreatorDialog : public QDialog

src/gui/transferlistdelegate.h

@@ -39,7 +39,6 @@ namespace BitTorrent
 {
     enum class TorrentState;
 }
-// Defines for download list list columns
 
 class TransferListDelegate : public QItemDelegate
 {

src/gui/transferlistwidget.h

@@ -33,16 +33,16 @@
 #include <QTreeView>
 #include <QVector>
 
-namespace BitTorrent
-{
-    class TorrentHandle;
-}
-
 class MainWindow;
 class TransferListDelegate;
 class TransferListModel;
 class TransferListSortModel;
 
+namespace BitTorrent
+{
+    class TorrentHandle;
+}
+
 class TransferListWidget : public QTreeView
 {
     Q_OBJECT