Browse Source

Forward declare as much as possible

adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
e288de7ec1
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 1
      src/base/bittorrent/magneturi.cpp
  2. 7
      src/base/bittorrent/magneturi.h
  3. 4
      src/base/bittorrent/peerinfo.h
  4. 1
      src/base/bittorrent/private/bandwidthscheduler.cpp
  5. 4
      src/base/bittorrent/private/filterparserthread.h
  6. 4
      src/base/bittorrent/private/portforwarderimpl.cpp
  7. 1
      src/base/bittorrent/private/resumedatasavingmanager.cpp
  8. 3
      src/base/bittorrent/private/resumedatasavingmanager.h
  9. 1
      src/base/bittorrent/session.h
  10. 1
      src/base/bittorrent/torrentinfo.h
  11. 4
      src/base/filesystemwatcher.h
  12. 3
      src/base/iconprovider.h
  13. 2
      src/base/net/smtp.cpp
  14. 17
      src/base/preferences.cpp
  15. 13
      src/base/preferences.h
  16. 2
      src/base/private/profile_p.cpp
  17. 2
      src/base/profile.h
  18. 1
      src/base/rss/rss_autodownloader.cpp
  19. 2
      src/base/rss/rss_autodownloadrule.h
  20. 1
      src/base/search/searchhandler.h
  21. 1
      src/base/settingvalue.h
  22. 18
      src/base/utils/fs.cpp
  23. 2
      src/base/utils/random.cpp
  24. 3
      src/gui/optionsdialog.cpp
  25. 1
      src/gui/optionsdialog.h
  26. 2
      src/gui/properties/propertieswidget.cpp
  27. 7
      src/gui/properties/propertieswidget.h
  28. 5
      src/gui/properties/speedwidget.cpp
  29. 2
      src/gui/properties/speedwidget.h
  30. 2
      src/gui/transferlistdelegate.cpp
  31. 3
      src/webui/api/authcontroller.cpp
  32. 3
      src/webui/api/authcontroller.h
  33. 6
      src/webui/webapplication.cpp

1
src/base/bittorrent/magneturi.cpp

@ -34,6 +34,7 @@
#include <libtorrent/sha1_hash.hpp> #include <libtorrent/sha1_hash.hpp>
#include <QRegularExpression> #include <QRegularExpression>
#include <QUrl>
#include "infohash.h" #include "infohash.h"

7
src/base/bittorrent/magneturi.h

@ -29,15 +29,16 @@
#ifndef BITTORRENT_MAGNETURI_H #ifndef BITTORRENT_MAGNETURI_H
#define BITTORRENT_MAGNETURI_H #define BITTORRENT_MAGNETURI_H
#include <libtorrent/add_torrent_params.hpp>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <QUrl>
#include <libtorrent/add_torrent_params.hpp>
#include "infohash.h" #include "infohash.h"
#include "trackerentry.h" #include "trackerentry.h"
class QUrl;
namespace BitTorrent namespace BitTorrent
{ {
class MagnetUri class MagnetUri

4
src/base/bittorrent/peerinfo.h

@ -29,12 +29,12 @@
#ifndef BITTORRENT_PEERINFO_H #ifndef BITTORRENT_PEERINFO_H
#define BITTORRENT_PEERINFO_H #define BITTORRENT_PEERINFO_H
#include <libtorrent/peer_info.hpp>
#include <QBitArray> #include <QBitArray>
#include <QCoreApplication> #include <QCoreApplication>
#include <QHostAddress> #include <QHostAddress>
#include <libtorrent/peer_info.hpp>
namespace BitTorrent namespace BitTorrent
{ {
class TorrentHandle; class TorrentHandle;

1
src/base/bittorrent/private/bandwidthscheduler.cpp

@ -33,6 +33,7 @@
#include <QDate> #include <QDate>
#include <QTime> #include <QTime>
#include <QTimer>
#include "base/preferences.h" #include "base/preferences.h"

4
src/base/bittorrent/private/filterparserthread.h

@ -29,10 +29,10 @@
#ifndef FILTERPARSERTHREAD_H #ifndef FILTERPARSERTHREAD_H
#define FILTERPARSERTHREAD_H #define FILTERPARSERTHREAD_H
#include <QThread>
#include <libtorrent/ip_filter.hpp> #include <libtorrent/ip_filter.hpp>
#include <QThread>
class QDataStream; class QDataStream;
class FilterParserThread : public QThread class FilterParserThread : public QThread

4
src/base/bittorrent/private/portforwarderimpl.cpp

@ -28,10 +28,10 @@
#include "portforwarderimpl.h" #include "portforwarderimpl.h"
#include <QDebug>
#include <libtorrent/session.hpp> #include <libtorrent/session.hpp>
#include <QDebug>
#include "base/logger.h" #include "base/logger.h"
#include "base/settingsstorage.h" #include "base/settingsstorage.h"

1
src/base/bittorrent/private/resumedatasavingmanager.cpp

@ -28,6 +28,7 @@
#include "resumedatasavingmanager.h" #include "resumedatasavingmanager.h"
#include <QByteArray>
#include <QDebug> #include <QDebug>
#include <QSaveFile> #include <QSaveFile>

3
src/base/bittorrent/private/resumedatasavingmanager.h

@ -28,10 +28,11 @@
#pragma once #pragma once
#include <QByteArray>
#include <QDir> #include <QDir>
#include <QObject> #include <QObject>
class QByteArray;
class ResumeDataSavingManager : public QObject class ResumeDataSavingManager : public QObject
{ {
Q_OBJECT Q_OBJECT

1
src/base/bittorrent/session.h

@ -43,7 +43,6 @@
#include <QSet> #include <QSet>
#include "base/settingvalue.h" #include "base/settingvalue.h"
#include "base/tristatebool.h"
#include "base/types.h" #include "base/types.h"
#include "addtorrentparams.h" #include "addtorrentparams.h"
#include "cachestatus.h" #include "cachestatus.h"

1
src/base/bittorrent/torrentinfo.h

@ -29,7 +29,6 @@
#ifndef BITTORRENT_TORRENTINFO_H #ifndef BITTORRENT_TORRENTINFO_H
#define BITTORRENT_TORRENTINFO_H #define BITTORRENT_TORRENTINFO_H
#include <libtorrent/fwd.hpp>
#include <libtorrent/torrent_info.hpp> #include <libtorrent/torrent_info.hpp>
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>

4
src/base/filesystemwatcher.h

@ -32,9 +32,11 @@
#include <QDir> #include <QDir>
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
#include <QHash> #include <QHash>
#include <QStringList> #include <QList>
#include <QTimer> #include <QTimer>
class QStringList;
/* /*
* Subclassing QFileSystemWatcher in order to support Network File * Subclassing QFileSystemWatcher in order to support Network File
* System watching (NFS, CIFS) on Linux and Mac OS. * System watching (NFS, CIFS) on Linux and Mac OS.

3
src/base/iconprovider.h

@ -31,7 +31,8 @@
#define ICONPROVIDER_H #define ICONPROVIDER_H
#include <QObject> #include <QObject>
#include <QString>
class QString;
class IconProvider : public QObject class IconProvider : public QObject
{ {

2
src/base/net/smtp.cpp

@ -33,10 +33,12 @@
#include "smtp.h" #include "smtp.h"
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QDateTime>
#include <QDebug> #include <QDebug>
#include <QHostInfo> #include <QHostInfo>
#include <QStringList> #include <QStringList>
#include <QTextCodec> #include <QTextCodec>
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
#include <QSslSocket> #include <QSslSocket>
#else #else

17
src/base/preferences.cpp

@ -29,9 +29,21 @@
#include "preferences.h" #include "preferences.h"
#ifdef Q_OS_MAC
#include <CoreServices/CoreServices.h>
#endif
#ifdef Q_OS_WIN
#include <shlobj.h>
#endif
#include <QDateTime>
#include <QDir> #include <QDir>
#include <QLocale> #include <QLocale>
#include <QNetworkCookie>
#include <QSettings> #include <QSettings>
#include <QSize>
#include <QTime>
#include <QVariant>
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
#include <QApplication> #include <QApplication>
@ -40,14 +52,9 @@
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <shlobj.h>
#include <QRegularExpression> #include <QRegularExpression>
#endif #endif
#ifdef Q_OS_MAC
#include <CoreServices/CoreServices.h>
#endif
#include "algorithm.h" #include "algorithm.h"
#include "global.h" #include "global.h"
#include "settingsstorage.h" #include "settingsstorage.h"

13
src/base/preferences.h

@ -30,16 +30,17 @@
#ifndef PREFERENCES_H #ifndef PREFERENCES_H
#define PREFERENCES_H #define PREFERENCES_H
#include <QDateTime>
#include <QList> #include <QList>
#include <QNetworkCookie>
#include <QSize>
#include <QStringList> #include <QStringList>
#include <QTime>
#include <QVariant>
#include "base/utils/net.h" #include "base/utils/net.h"
class QDateTime;
class QNetworkCookie;
class QSize;
class QTime;
class QVariant;
enum SchedulerDays enum SchedulerDays
{ {
EVERY_DAY, EVERY_DAY,
@ -74,8 +75,6 @@ namespace DNS
}; };
} }
class SettingsStorage;
class Preferences : public QObject class Preferences : public QObject
{ {
Q_OBJECT Q_OBJECT

2
src/base/private/profile_p.cpp

@ -31,8 +31,6 @@
#include <QCoreApplication> #include <QCoreApplication>
#include "base/utils/fs.h"
Private::Profile::Profile(const QString &configurationName) Private::Profile::Profile(const QString &configurationName)
: m_configurationSuffix {configurationName.isEmpty() ? QString() : QLatin1Char('_') + configurationName} : m_configurationSuffix {configurationName.isEmpty() ? QString() : QLatin1Char('_') + configurationName}
{ {

2
src/base/profile.h

@ -33,8 +33,8 @@
#include <memory> #include <memory>
#include <QSettings> #include <QSettings>
#include <QString>
class QString;
class Application; class Application;
namespace Private namespace Private

1
src/base/rss/rss_autodownloader.cpp

@ -37,6 +37,7 @@
#include <QSaveFile> #include <QSaveFile>
#include <QThread> #include <QThread>
#include <QTimer> #include <QTimer>
#include <QUrl>
#include <QVariant> #include <QVariant>
#include <QVector> #include <QVector>

2
src/base/rss/rss_autodownloadrule.h

@ -29,10 +29,10 @@
#pragma once #pragma once
#include <QDateTime>
#include <QSharedDataPointer> #include <QSharedDataPointer>
#include <QVariant> #include <QVariant>
class QDateTime;
class QJsonObject; class QJsonObject;
class QRegularExpression; class QRegularExpression;
class TriStateBool; class TriStateBool;

1
src/base/search/searchhandler.h

@ -32,6 +32,7 @@
#include <QByteArray> #include <QByteArray>
#include <QList> #include <QList>
#include <QObject> #include <QObject>
#include <QString>
class QProcess; class QProcess;
class QTimer; class QTimer;

1
src/base/settingvalue.h

@ -33,7 +33,6 @@
#include <QMetaEnum> #include <QMetaEnum>
#include <QString> #include <QString>
#include <QVariant>
#include "settingsstorage.h" #include "settingsstorage.h"

18
src/base/utils/fs.cpp

@ -34,15 +34,6 @@
#include <memory> #include <memory>
#endif #endif
#include <QCoreApplication>
#include <QDebug>
#include <QDir>
#include <QDirIterator>
#include <QFile>
#include <QFileInfo>
#include <QStorageInfo>
#include <QRegularExpression>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -58,6 +49,15 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <QCoreApplication>
#include <QDebug>
#include <QDir>
#include <QDirIterator>
#include <QFile>
#include <QFileInfo>
#include <QStorageInfo>
#include <QRegularExpression>
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h" #include "base/global.h"

2
src/base/utils/random.cpp

@ -43,6 +43,8 @@
#include <cstdio> #include <cstdio>
#endif #endif
#include <QString>
#include "misc.h" #include "misc.h"
namespace namespace

3
src/gui/optionsdialog.cpp

@ -29,6 +29,7 @@
#include "optionsdialog.h" #include "optionsdialog.h"
#include <cstdlib> #include <cstdlib>
#include <limits>
#include <QApplication> #include <QApplication>
#include <QCloseEvent> #include <QCloseEvent>
@ -62,8 +63,8 @@
#include "advancedsettings.h" #include "advancedsettings.h"
#include "app/application.h" #include "app/application.h"
#include "banlistoptionsdialog.h" #include "banlistoptionsdialog.h"
#include "ipsubnetwhitelistoptionsdialog.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
#include "ipsubnetwhitelistoptionsdialog.h"
#include "rss/automatedrssdownloader.h" #include "rss/automatedrssdownloader.h"
#include "scanfoldersdelegate.h" #include "scanfoldersdelegate.h"
#include "ui_optionsdialog.h" #include "ui_optionsdialog.h"

1
src/gui/optionsdialog.h

@ -29,7 +29,6 @@
#ifndef OPTIONSDIALOG_H #ifndef OPTIONSDIALOG_H
#define OPTIONSDIALOG_H #define OPTIONSDIALOG_H
#include <QButtonGroup>
#include <QDialog> #include <QDialog>
class QAbstractButton; class QAbstractButton;

2
src/gui/properties/propertieswidget.cpp

@ -29,12 +29,14 @@
#include "propertieswidget.h" #include "propertieswidget.h"
#include <QAction> #include <QAction>
#include <QDateTime>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QHeaderView> #include <QHeaderView>
#include <QListWidgetItem> #include <QListWidgetItem>
#include <QMenu> #include <QMenu>
#include <QSplitter> #include <QSplitter>
#include <QShortcut>
#include <QStackedWidget> #include <QStackedWidget>
#include <QThread> #include <QThread>
#include <QUrl> #include <QUrl>

7
src/gui/properties/propertieswidget.h

@ -29,14 +29,13 @@
#ifndef PROPERTIESWIDGET_H #ifndef PROPERTIESWIDGET_H
#define PROPERTIESWIDGET_H #define PROPERTIESWIDGET_H
#include <QShortcut> #include <QList>
#include <QWidget> #include <QWidget>
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
class QAction;
class QPushButton; class QPushButton;
class QTimer; class QShortcut;
class QTreeView; class QTreeView;
class DownloadedPiecesBar; class DownloadedPiecesBar;
@ -45,8 +44,6 @@ class PeerListWidget;
class PieceAvailabilityBar; class PieceAvailabilityBar;
class PropListDelegate; class PropListDelegate;
class PropTabBar; class PropTabBar;
class SpeedWidget;
class torrent_file;
class TorrentContentFilterModel; class TorrentContentFilterModel;
class TrackerListWidget; class TrackerListWidget;

5
src/gui/properties/speedwidget.cpp

@ -28,13 +28,12 @@
#include "speedwidget.h" #include "speedwidget.h"
#include <QVBoxLayout> #include <QDateTime>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
#include <QMenu> #include <QMenu>
#include <QTimer> #include <QTimer>
#include <QVBoxLayout>
#include <libtorrent/session_status.hpp>
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/sessionstatus.h" #include "base/bittorrent/sessionstatus.h"

2
src/gui/properties/speedwidget.h

@ -34,10 +34,10 @@
#include "speedplotview.h" #include "speedplotview.h"
class QVBoxLayout;
class QHBoxLayout; class QHBoxLayout;
class QLabel; class QLabel;
class QMenu; class QMenu;
class QVBoxLayout;
class PropertiesWidget; class PropertiesWidget;
class ComboBoxMenuButton : public QComboBox class ComboBoxMenuButton : public QComboBox

2
src/gui/transferlistdelegate.cpp

@ -29,6 +29,7 @@
#include "transferlistdelegate.h" #include "transferlistdelegate.h"
#include <QApplication> #include <QApplication>
#include <QDateTime>
#include <QModelIndex> #include <QModelIndex>
#include <QPainter> #include <QPainter>
#include <QStyleOptionViewItem> #include <QStyleOptionViewItem>
@ -37,7 +38,6 @@
#include <QProxyStyle> #include <QProxyStyle>
#endif #endif
#include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/types.h" #include "base/types.h"

3
src/webui/api/authcontroller.cpp

@ -28,6 +28,9 @@
#include "authcontroller.h" #include "authcontroller.h"
#include <QDateTime>
#include <QString>
#include "base/logger.h" #include "base/logger.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/utils/password.h" #include "base/utils/password.h"

3
src/webui/api/authcontroller.h

@ -29,10 +29,11 @@
#pragma once #pragma once
#include <QHash> #include <QHash>
#include <QString>
#include "apicontroller.h" #include "apicontroller.h"
class QString;
class AuthController : public APIController class AuthController : public APIController
{ {
Q_OBJECT Q_OBJECT

6
src/webui/webapplication.cpp

@ -29,10 +29,6 @@
#include "webapplication.h" #include "webapplication.h"
#include <algorithm> #include <algorithm>
#include <functional>
#include <queue>
#include <stdexcept>
#include <vector>
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>
@ -41,13 +37,13 @@
#include <QJsonDocument> #include <QJsonDocument>
#include <QMimeDatabase> #include <QMimeDatabase>
#include <QMimeType> #include <QMimeType>
#include <QNetworkCookie>
#include <QRegExp> #include <QRegExp>
#include <QUrl> #include <QUrl>
#include "base/algorithm.h" #include "base/algorithm.h"
#include "base/global.h" #include "base/global.h"
#include "base/http/httperror.h" #include "base/http/httperror.h"
#include "base/iconprovider.h"
#include "base/logger.h" #include "base/logger.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/utils/bytearray.h" #include "base/utils/bytearray.h"

Loading…
Cancel
Save