From 7645754d6e40157fe30a997b584f16363760d294 Mon Sep 17 00:00:00 2001 From: Nodir Temirkhodjaev Date: Sat, 25 Dec 2021 12:40:28 +0300 Subject: [PATCH] Refactor #include-s --- src/driver/proxycb/fortpcb_drv.h | 2 +- src/ui/3rdparty/sqlite/sqlitedb.h | 2 +- src/ui/3rdparty/sqlite/sqlitestmt.h | 2 +- src/ui/appinfo/appinfocache.cpp | 5 +- src/ui/appinfo/appinfocache.h | 5 +- src/ui/appinfo/appinfojob.h | 3 +- src/ui/appinfo/appinfomanager.h | 7 ++- src/ui/appinfo/appinfoutil.cpp | 5 +- src/ui/appinfo/appinfoworker.h | 2 +- src/ui/conf/appgroup.cpp | 4 +- src/ui/conf/confmanager.cpp | 37 ++++++------ src/ui/conf/confmanager.h | 8 +-- src/ui/conf/firewallconf.cpp | 5 +- src/ui/conf/inioptions.h | 2 +- src/ui/control/controlmanager.cpp | 19 +++--- src/ui/control/controlmanager.h | 5 +- src/ui/driver/drivermanager.cpp | 11 ++-- src/ui/driver/drivermanager.h | 4 +- src/ui/driver/driverworker.cpp | 8 +-- src/ui/form/controls/appinforow.cpp | 7 ++- src/ui/form/controls/controlutil.cpp | 2 +- src/ui/form/controls/labelcolor.cpp | 3 +- .../form/controls/textarea2splitterhandle.cpp | 5 +- src/ui/form/dialog/passworddialog.cpp | 6 +- src/ui/form/graph/axistickerspeed.cpp | 2 +- src/ui/form/graph/graphwindow.cpp | 17 +++--- src/ui/form/graph/graphwindow.h | 2 +- src/ui/form/opt/optionscontroller.cpp | 20 +++---- src/ui/form/opt/optionswindow.cpp | 13 +++-- src/ui/form/opt/optionswindow.h | 2 +- .../opt/pages/addresses/addressescolumn.cpp | 4 +- src/ui/form/opt/pages/addressespage.cpp | 33 ++++++----- src/ui/form/opt/pages/applicationspage.cpp | 33 ++++++----- src/ui/form/opt/pages/apps/appscolumn.cpp | 4 +- src/ui/form/opt/pages/optbasepage.cpp | 10 ++-- src/ui/form/opt/pages/optionspage.cpp | 32 +++++----- src/ui/form/opt/pages/optmainpage.cpp | 12 ++-- src/ui/form/opt/pages/schedulepage.cpp | 16 ++--- src/ui/form/opt/pages/servicespage.cpp | 18 +++--- src/ui/form/opt/pages/statisticspage.cpp | 18 +++--- src/ui/form/prog/programeditdialog.cpp | 21 +++---- src/ui/form/prog/programeditdialog.h | 2 +- src/ui/form/prog/programscontroller.cpp | 16 ++--- src/ui/form/prog/programswindow.cpp | 27 ++++----- src/ui/form/prog/programswindow.h | 2 +- src/ui/form/stat/pages/connectionspage.cpp | 26 ++++----- src/ui/form/stat/pages/statbasepage.cpp | 8 +-- src/ui/form/stat/pages/statmainpage.cpp | 9 +-- src/ui/form/stat/pages/trafficpage.cpp | 22 +++---- src/ui/form/stat/statisticscontroller.cpp | 12 ++-- src/ui/form/stat/statisticswindow.cpp | 11 ++-- src/ui/form/stat/statisticswindow.h | 2 +- src/ui/form/tray/traycontroller.cpp | 16 ++--- src/ui/form/tray/trayicon.cpp | 28 ++++----- src/ui/form/zone/zonescontroller.cpp | 14 ++--- src/ui/form/zone/zoneswindow.cpp | 36 ++++++------ src/ui/form/zone/zoneswindow.h | 2 +- src/ui/fortmanager.cpp | 58 +++++++++---------- src/ui/fortmanager.h | 2 +- src/ui/fortsettings.cpp | 14 ++--- src/ui/fortsettings.h | 2 +- src/ui/hostinfo/hostinfocache.h | 5 +- src/ui/hostinfo/hostinfojob.cpp | 2 +- src/ui/hostinfo/hostinfojob.h | 2 +- src/ui/hostinfo/hostinfomanager.h | 2 +- src/ui/log/logbuffer.cpp | 3 +- src/ui/log/logentry.cpp | 4 +- src/ui/log/logentry.h | 2 +- src/ui/log/logmanager.cpp | 17 +++--- src/ui/log/logmanager.h | 2 +- src/ui/manager/envmanager.cpp | 2 +- src/ui/manager/hotkeymanager.cpp | 5 +- src/ui/manager/hotkeymanager.h | 2 +- src/ui/manager/logger.cpp | 6 +- src/ui/manager/nativeeventfilter.h | 4 +- src/ui/manager/translationmanager.cpp | 4 +- src/ui/manager/translationmanager.h | 4 +- src/ui/manager/windowmanager.cpp | 27 ++++----- src/ui/manager/windowmanager.h | 2 +- src/ui/model/applistmodel.cpp | 20 +++---- src/ui/model/applistmodel.h | 2 +- src/ui/model/appstatmodel.cpp | 15 ++--- src/ui/model/appstatmodel.h | 2 +- src/ui/model/connlistmodel.cpp | 16 ++--- src/ui/model/connlistmodel.h | 2 +- src/ui/model/servicelistmodel.cpp | 10 ++-- src/ui/model/servicelistmodel.h | 2 +- src/ui/model/traflistmodel.cpp | 10 ++-- src/ui/model/traflistmodel.h | 2 +- src/ui/model/zonelistmodel.cpp | 11 ++-- src/ui/model/zonelistmodel.h | 4 +- src/ui/model/zonesourcewrapper.h | 2 +- src/ui/model/zonetypewrapper.h | 2 +- src/ui/rpc/appinfomanagerrpc.cpp | 4 +- src/ui/rpc/appinfomanagerrpc.h | 2 +- src/ui/rpc/confmanagerrpc.cpp | 12 ++-- src/ui/rpc/confmanagerrpc.h | 2 +- src/ui/rpc/drivermanagerrpc.cpp | 6 +- src/ui/rpc/drivermanagerrpc.h | 2 +- src/ui/rpc/logmanagerrpc.h | 2 +- src/ui/rpc/quotamanagerrpc.h | 2 +- src/ui/rpc/rpcmanager.cpp | 24 ++++---- src/ui/rpc/rpcmanager.h | 4 +- src/ui/rpc/statmanagerrpc.cpp | 6 +- src/ui/rpc/statmanagerrpc.h | 2 +- src/ui/rpc/taskmanagerrpc.cpp | 6 +- src/ui/rpc/taskmanagerrpc.h | 2 +- src/ui/rpc/windowmanagerfake.h | 2 +- src/ui/serviceinfo/serviceinfomanager.h | 3 +- src/ui/stat/quotamanager.cpp | 6 +- src/ui/stat/quotamanager.h | 2 +- src/ui/stat/statmanager.cpp | 19 +++--- src/ui/stat/statmanager.h | 6 +- src/ui/task/taskdownloader.cpp | 2 +- src/ui/task/taskinfo.cpp | 3 +- src/ui/task/taskinfo.h | 2 +- src/ui/task/taskinfoupdatechecker.cpp | 5 +- src/ui/task/taskinfozonedownloader.cpp | 17 +++--- src/ui/task/tasklistmodel.h | 3 +- src/ui/task/taskmanager.cpp | 9 +-- src/ui/task/taskmanager.h | 2 +- src/ui/task/taskupdatechecker.cpp | 6 +- src/ui/task/taskzonedownloader.cpp | 10 ++-- src/ui/task/taskzonedownloader.h | 3 +- src/ui/user/iniuser.h | 2 +- src/ui/user/usersettings.cpp | 4 +- src/ui/user/usersettings.h | 5 +- src/ui/util/conf/addressrange.h | 2 +- src/ui/util/conf/confutil.cpp | 19 +++--- src/ui/util/dateutil.cpp | 2 +- src/ui/util/ini/mapsettings.h | 2 +- src/ui/util/ini/settings.cpp | 2 +- src/ui/util/net/ip4range.cpp | 3 +- src/ui/util/net/ip4range.h | 2 +- src/ui/util/regkey.h | 2 +- src/ui/util/stringutil.h | 2 +- src/ui/util/worker/workerjob.h | 2 +- src/ui/util/worker/workermanager.h | 2 +- src/ui_bin/main.cpp | 18 +++--- 139 files changed, 602 insertions(+), 563 deletions(-) diff --git a/src/driver/proxycb/fortpcb_drv.h b/src/driver/proxycb/fortpcb_drv.h index 5302fe57..4f332727 100644 --- a/src/driver/proxycb/fortpcb_drv.h +++ b/src/driver/proxycb/fortpcb_drv.h @@ -1,7 +1,7 @@ #ifndef FORTPCB_DRV_H #define FORTPCB_DRV_H -#include "../fortdrv.h" +#include "fortpcb_def.h" #define FORT_DRIVER_MAJOR_FUNC_MAX (IRP_MJ_MAXIMUM_FUNCTION + 1) static_assert(FORT_DRIVER_MAJOR_FUNC_MAX == 28, "Driver Major Functions Count Mismatch"); diff --git a/src/ui/3rdparty/sqlite/sqlitedb.h b/src/ui/3rdparty/sqlite/sqlitedb.h index 99cf5a06..b53cdaa1 100644 --- a/src/ui/3rdparty/sqlite/sqlitedb.h +++ b/src/ui/3rdparty/sqlite/sqlitedb.h @@ -5,7 +5,7 @@ #include #include -#include "../../util/classhelpers.h" +#include struct sqlite3; diff --git a/src/ui/3rdparty/sqlite/sqlitestmt.h b/src/ui/3rdparty/sqlite/sqlitestmt.h index 594c61b2..12197f9a 100644 --- a/src/ui/3rdparty/sqlite/sqlitestmt.h +++ b/src/ui/3rdparty/sqlite/sqlitestmt.h @@ -5,7 +5,7 @@ #include #include -#include "../../util/classhelpers.h" +#include struct sqlite3_stmt; diff --git a/src/ui/appinfo/appinfocache.cpp b/src/ui/appinfo/appinfocache.cpp index b9c54997..dc091cf7 100644 --- a/src/ui/appinfo/appinfocache.cpp +++ b/src/ui/appinfo/appinfocache.cpp @@ -3,8 +3,9 @@ #include #include -#include "../util/iconcache.h" -#include "../util/ioc/ioccontainer.h" +#include +#include + #include "appinfomanager.h" AppInfoCache::AppInfoCache(QObject *parent) : QObject(parent), m_cache(1000) diff --git a/src/ui/appinfo/appinfocache.h b/src/ui/appinfo/appinfocache.h index df3342b8..5ae9b328 100644 --- a/src/ui/appinfo/appinfocache.h +++ b/src/ui/appinfo/appinfocache.h @@ -4,8 +4,9 @@ #include #include -#include "../util/ioc/iocservice.h" -#include "../util/triggertimer.h" +#include +#include + #include "appinfo.h" class AppInfoCache : public QObject, public IocService diff --git a/src/ui/appinfo/appinfojob.h b/src/ui/appinfo/appinfojob.h index 911f7923..05266011 100644 --- a/src/ui/appinfo/appinfojob.h +++ b/src/ui/appinfo/appinfojob.h @@ -1,7 +1,8 @@ #ifndef APPINFOJOB_H #define APPINFOJOB_H -#include "../util/worker/workerjob.h" +#include + #include "appinfo.h" class AppInfoJob : public WorkerJob diff --git a/src/ui/appinfo/appinfomanager.h b/src/ui/appinfo/appinfomanager.h index 67a9b246..e6dcf25d 100644 --- a/src/ui/appinfo/appinfomanager.h +++ b/src/ui/appinfo/appinfomanager.h @@ -3,9 +3,10 @@ #include -#include "../util/classhelpers.h" -#include "../util/ioc/iocservice.h" -#include "../util/worker/workermanager.h" +#include +#include +#include + #include "appinfo.h" class SqliteDb; diff --git a/src/ui/appinfo/appinfoutil.cpp b/src/ui/appinfo/appinfoutil.cpp index 29d0f48c..c8c0916f 100644 --- a/src/ui/appinfo/appinfoutil.cpp +++ b/src/ui/appinfo/appinfoutil.cpp @@ -9,8 +9,9 @@ #include #include -#include "../util/fileutil.h" -#include "../util/osutil.h" +#include +#include + #include "appinfo.h" #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) diff --git a/src/ui/appinfo/appinfoworker.h b/src/ui/appinfo/appinfoworker.h index 2ab8ac84..c9546d71 100644 --- a/src/ui/appinfo/appinfoworker.h +++ b/src/ui/appinfo/appinfoworker.h @@ -1,7 +1,7 @@ #ifndef APPINFOWORKER_H #define APPINFOWORKER_H -#include "../util/worker/workerobject.h" +#include class AppInfo; class AppInfoManager; diff --git a/src/ui/conf/appgroup.cpp b/src/ui/conf/appgroup.cpp index 87d7c2a0..8616abfa 100644 --- a/src/ui/conf/appgroup.cpp +++ b/src/ui/conf/appgroup.cpp @@ -1,7 +1,7 @@ #include "appgroup.h" -#include "../util/dateutil.h" -#include "../util/net/netutil.h" +#include +#include AppGroup::AppGroup(QObject *parent) : QObject(parent), diff --git a/src/ui/conf/confmanager.cpp b/src/ui/conf/confmanager.cpp index 36419758..6f50465b 100644 --- a/src/ui/conf/confmanager.cpp +++ b/src/ui/conf/confmanager.cpp @@ -5,24 +5,25 @@ #include #include -#include "../appinfo/appinfocache.h" -#include "../appinfo/appinfoutil.h" -#include "../driver/drivercommon.h" -#include "../driver/drivermanager.h" -#include "../fortsettings.h" -#include "../log/logentryblocked.h" -#include "../manager/envmanager.h" -#include "../manager/windowmanager.h" -#include "../task/taskinfo.h" -#include "../task/taskmanager.h" -#include "../user/iniuser.h" -#include "../user/usersettings.h" -#include "../util/conf/confutil.h" -#include "../util/dateutil.h" -#include "../util/fileutil.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/osutil.h" -#include "../util/startuputil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "addressgroup.h" #include "appgroup.h" #include "firewallconf.h" diff --git a/src/ui/conf/confmanager.h b/src/ui/conf/confmanager.h index 97ff7e29..92c39bb0 100644 --- a/src/ui/conf/confmanager.h +++ b/src/ui/conf/confmanager.h @@ -4,10 +4,10 @@ #include #include -#include "../util/classhelpers.h" -#include "../util/conf/confappswalker.h" -#include "../util/ioc/iocservice.h" -#include "../util/triggertimer.h" +#include +#include +#include +#include class FirewallConf; class IniOptions; diff --git a/src/ui/conf/firewallconf.cpp b/src/ui/conf/firewallconf.cpp index b1de7577..aac1eb77 100644 --- a/src/ui/conf/firewallconf.cpp +++ b/src/ui/conf/firewallconf.cpp @@ -1,7 +1,8 @@ #include "firewallconf.h" -#include "../util/fileutil.h" -#include "../util/net/netutil.h" +#include +#include + #include "addressgroup.h" #include "appgroup.h" diff --git a/src/ui/conf/inioptions.h b/src/ui/conf/inioptions.h index 393e5688..eb9e0e29 100644 --- a/src/ui/conf/inioptions.h +++ b/src/ui/conf/inioptions.h @@ -1,7 +1,7 @@ #ifndef INIOPTIONS_H #define INIOPTIONS_H -#include "../util/ini/mapsettings.h" +#include #define DEFAULT_APP_GROUP_BITS 0xFFFF #define DEFAULT_MONTH_START 1 diff --git a/src/ui/control/controlmanager.cpp b/src/ui/control/controlmanager.cpp index 9680e8a7..4e35de86 100644 --- a/src/ui/control/controlmanager.cpp +++ b/src/ui/control/controlmanager.cpp @@ -7,15 +7,16 @@ #include -#include "../conf/appgroup.h" -#include "../conf/confmanager.h" -#include "../conf/firewallconf.h" -#include "../fortsettings.h" -#include "../manager/windowmanager.h" -#include "../rpc/rpcmanager.h" -#include "../util/fileutil.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/osutil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "controlworker.h" Q_DECLARE_LOGGING_CATEGORY(CLOG_CONTROL_MANAGER) diff --git a/src/ui/control/controlmanager.h b/src/ui/control/controlmanager.h index b26bedbc..b370a692 100644 --- a/src/ui/control/controlmanager.h +++ b/src/ui/control/controlmanager.h @@ -4,8 +4,9 @@ #include #include -#include "../util/classhelpers.h" -#include "../util/ioc/iocservice.h" +#include +#include + #include "control.h" QT_FORWARD_DECLARE_CLASS(QLocalServer) diff --git a/src/ui/driver/drivermanager.cpp b/src/ui/driver/drivermanager.cpp index 70fb15db..025ff95a 100644 --- a/src/ui/driver/drivermanager.cpp +++ b/src/ui/driver/drivermanager.cpp @@ -3,11 +3,12 @@ #include #include -#include "../conf/firewallconf.h" -#include "../driver/drivercommon.h" -#include "../util/device.h" -#include "../util/fileutil.h" -#include "../util/osutil.h" +#include +#include +#include +#include +#include + #include "driverworker.h" DriverManager::DriverManager(QObject *parent, bool useDevice) : QObject(parent) diff --git a/src/ui/driver/drivermanager.h b/src/ui/driver/drivermanager.h index 82126ec7..b31edfa3 100644 --- a/src/ui/driver/drivermanager.h +++ b/src/ui/driver/drivermanager.h @@ -3,8 +3,8 @@ #include -#include "../util/classhelpers.h" -#include "../util/ioc/iocservice.h" +#include +#include class Device; class DriverWorker; diff --git a/src/ui/driver/driverworker.cpp b/src/ui/driver/driverworker.cpp index 6a39bc8c..18ca0733 100644 --- a/src/ui/driver/driverworker.cpp +++ b/src/ui/driver/driverworker.cpp @@ -1,9 +1,9 @@ #include "driverworker.h" -#include "../driver/drivercommon.h" -#include "../log/logbuffer.h" -#include "../util/device.h" -#include "../util/osutil.h" +#include +#include +#include +#include DriverWorker::DriverWorker(Device *device, QObject *parent) : QObject(parent), m_device(device) { } diff --git a/src/ui/form/controls/appinforow.cpp b/src/ui/form/controls/appinforow.cpp index 1436a643..70a5f4ac 100644 --- a/src/ui/form/controls/appinforow.cpp +++ b/src/ui/form/controls/appinforow.cpp @@ -5,9 +5,10 @@ #include #include -#include "../../appinfo/appinfocache.h" -#include "../../appinfo/appinfoutil.h" -#include "../../util/guiutil.h" +#include +#include +#include + #include "controlutil.h" AppInfoRow::AppInfoRow(QWidget *parent) : QWidget(parent) diff --git a/src/ui/form/controls/controlutil.cpp b/src/ui/form/controls/controlutil.cpp index f3082b8b..9f20ecc0 100644 --- a/src/ui/form/controls/controlutil.cpp +++ b/src/ui/form/controls/controlutil.cpp @@ -11,7 +11,7 @@ #include #include -#include "../../util/iconcache.h" +#include QCheckBox *ControlUtil::createCheckBox( bool checked, const std::function &onToggled) diff --git a/src/ui/form/controls/labelcolor.cpp b/src/ui/form/controls/labelcolor.cpp index 80c56785..66c94594 100644 --- a/src/ui/form/controls/labelcolor.cpp +++ b/src/ui/form/controls/labelcolor.cpp @@ -4,7 +4,8 @@ #include #include -#include "../dialog/dialogutil.h" +#include
+ #include "controlutil.h" LabelColor::LabelColor(QWidget *parent) : QWidget(parent) diff --git a/src/ui/form/controls/textarea2splitterhandle.cpp b/src/ui/form/controls/textarea2splitterhandle.cpp index 5679dae2..b2370c0d 100644 --- a/src/ui/form/controls/textarea2splitterhandle.cpp +++ b/src/ui/form/controls/textarea2splitterhandle.cpp @@ -6,8 +6,9 @@ #include #include -#include "../../util/textareautil.h" -#include "../controls/controlutil.h" +#include +#include + #include "textarea2splitter.h" TextArea2SplitterHandle::TextArea2SplitterHandle(Qt::Orientation o, QSplitter *parent) : diff --git a/src/ui/form/dialog/passworddialog.cpp b/src/ui/form/dialog/passworddialog.cpp index 49fb16ea..585796f8 100644 --- a/src/ui/form/dialog/passworddialog.cpp +++ b/src/ui/form/dialog/passworddialog.cpp @@ -7,9 +7,9 @@ #include #include -#include "../../manager/windowmanager.h" -#include "../../util/guiutil.h" -#include "../controls/controlutil.h" +#include +#include +#include PasswordDialog::PasswordDialog(QWidget *parent) : QDialog(parent) { diff --git a/src/ui/form/graph/axistickerspeed.cpp b/src/ui/form/graph/axistickerspeed.cpp index da11844f..16767dfa 100644 --- a/src/ui/form/graph/axistickerspeed.cpp +++ b/src/ui/form/graph/axistickerspeed.cpp @@ -1,6 +1,6 @@ #include "axistickerspeed.h" -#include "../../util/net/netutil.h" +#include double AxisTickerSpeed::getTickStep(const QCPRange &range) { diff --git a/src/ui/form/graph/graphwindow.cpp b/src/ui/form/graph/graphwindow.cpp index 1d79d3f0..7e10b409 100644 --- a/src/ui/form/graph/graphwindow.cpp +++ b/src/ui/form/graph/graphwindow.cpp @@ -4,14 +4,15 @@ #include #include -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../fortcompat.h" -#include "../../user/iniuser.h" -#include "../../util/dateutil.h" -#include "../../util/ioc/ioccontainer.h" -#include "../../util/net/netutil.h" -#include "../../util/window/widgetwindowstatewatcher.h" +#include +#include +#include +#include +#include +#include +#include +#include + #include "axistickerspeed.h" #include "graphplot.h" diff --git a/src/ui/form/graph/graphwindow.h b/src/ui/form/graph/graphwindow.h index af0f4bf9..93699836 100644 --- a/src/ui/form/graph/graphwindow.h +++ b/src/ui/form/graph/graphwindow.h @@ -3,7 +3,7 @@ #include -#include "../../util/window/widgetwindow.h" +#include class ConfManager; class FirewallConf; diff --git a/src/ui/form/opt/optionscontroller.cpp b/src/ui/form/opt/optionscontroller.cpp index 66710a7b..ac11d704 100644 --- a/src/ui/form/opt/optionscontroller.cpp +++ b/src/ui/form/opt/optionscontroller.cpp @@ -1,15 +1,15 @@ #include "optionscontroller.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../driver/drivermanager.h" -#include "../../fortmanager.h" -#include "../../fortsettings.h" -#include "../../manager/translationmanager.h" -#include "../../manager/windowmanager.h" -#include "../../model/zonelistmodel.h" -#include "../../task/taskmanager.h" -#include "../../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include OptionsController::OptionsController(QObject *parent) : QObject(parent) { diff --git a/src/ui/form/opt/optionswindow.cpp b/src/ui/form/opt/optionswindow.cpp index 2c57769d..4583ffe9 100644 --- a/src/ui/form/opt/optionswindow.cpp +++ b/src/ui/form/opt/optionswindow.cpp @@ -3,12 +3,13 @@ #include #include -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../manager/windowmanager.h" -#include "../../user/iniuser.h" -#include "../../util/guiutil.h" -#include "../../util/window/widgetwindowstatewatcher.h" +#include +#include +#include +#include +#include +#include + #include "optionscontroller.h" #include "pages/optmainpage.h" diff --git a/src/ui/form/opt/optionswindow.h b/src/ui/form/opt/optionswindow.h index e1c0db91..3a113474 100644 --- a/src/ui/form/opt/optionswindow.h +++ b/src/ui/form/opt/optionswindow.h @@ -1,7 +1,7 @@ #ifndef OPTIONSWINDOW_H #define OPTIONSWINDOW_H -#include "../../util/window/widgetwindow.h" +#include class ConfManager; class FirewallConf; diff --git a/src/ui/form/opt/pages/addresses/addressescolumn.cpp b/src/ui/form/opt/pages/addresses/addressescolumn.cpp index 5877e0bf..7e37d929 100644 --- a/src/ui/form/opt/pages/addresses/addressescolumn.cpp +++ b/src/ui/form/opt/pages/addresses/addressescolumn.cpp @@ -6,8 +6,8 @@ #include #include -#include "../../../controls/controlutil.h" -#include "../../../controls/plaintextedit.h" +#include +#include AddressesColumn::AddressesColumn(QWidget *parent) : QWidget(parent) { diff --git a/src/ui/form/opt/pages/addressespage.cpp b/src/ui/form/opt/pages/addressespage.cpp index 750877ac..2a66aa74 100644 --- a/src/ui/form/opt/pages/addressespage.cpp +++ b/src/ui/form/opt/pages/addressespage.cpp @@ -10,22 +10,23 @@ #include #include -#include "../../../conf/addressgroup.h" -#include "../../../conf/confmanager.h" -#include "../../../conf/firewallconf.h" -#include "../../../driver/drivercommon.h" -#include "../../../fortmanager.h" -#include "../../../fortsettings.h" -#include "../../../model/zonelistmodel.h" -#include "../../../user/iniuser.h" -#include "../../../util/iconcache.h" -#include "../../../util/net/netutil.h" -#include "../../../util/textareautil.h" -#include "../../controls/controlutil.h" -#include "../../controls/plaintextedit.h" -#include "../../controls/textarea2splitter.h" -#include "../../controls/textarea2splitterhandle.h" -#include "../optionscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "addresses/addressescolumn.h" AddressesPage::AddressesPage(OptionsController *ctrl, QWidget *parent) : OptBasePage(ctrl, parent) diff --git a/src/ui/form/opt/pages/applicationspage.cpp b/src/ui/form/opt/pages/applicationspage.cpp index e348cadb..6536c5f3 100644 --- a/src/ui/form/opt/pages/applicationspage.cpp +++ b/src/ui/form/opt/pages/applicationspage.cpp @@ -11,22 +11,23 @@ #include #include -#include "../../../conf/appgroup.h" -#include "../../../conf/firewallconf.h" -#include "../../../fortsettings.h" -#include "../../../user/iniuser.h" -#include "../../../util/iconcache.h" -#include "../../../util/net/netutil.h" -#include "../../../util/textareautil.h" -#include "../../controls/checkspincombo.h" -#include "../../controls/checktimeperiod.h" -#include "../../controls/controlutil.h" -#include "../../controls/plaintextedit.h" -#include "../../controls/tabbar.h" -#include "../../controls/textarea2splitter.h" -#include "../../controls/textarea2splitterhandle.h" -#include "../../dialog/dialogutil.h" -#include "../optionscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "apps/appscolumn.h" namespace { diff --git a/src/ui/form/opt/pages/apps/appscolumn.cpp b/src/ui/form/opt/pages/apps/appscolumn.cpp index b27ada84..7dae7c07 100644 --- a/src/ui/form/opt/pages/apps/appscolumn.cpp +++ b/src/ui/form/opt/pages/apps/appscolumn.cpp @@ -3,8 +3,8 @@ #include #include -#include "../../../controls/controlutil.h" -#include "../../../controls/plaintextedit.h" +#include +#include AppsColumn::AppsColumn(QWidget *parent) : QWidget(parent) { diff --git a/src/ui/form/opt/pages/optbasepage.cpp b/src/ui/form/opt/pages/optbasepage.cpp index 8651d253..9feffa6b 100644 --- a/src/ui/form/opt/pages/optbasepage.cpp +++ b/src/ui/form/opt/pages/optbasepage.cpp @@ -2,11 +2,11 @@ #include -#include "../../../conf/firewallconf.h" -#include "../../../fortmanager.h" -#include "../../../user/iniuser.h" -#include "../../../util/osutil.h" -#include "../optionscontroller.h" +#include +#include +#include +#include +#include OptBasePage::OptBasePage(OptionsController *ctrl, QWidget *parent) : QFrame(parent), m_ctrl(ctrl) { diff --git a/src/ui/form/opt/pages/optionspage.cpp b/src/ui/form/opt/pages/optionspage.cpp index 68ce6f81..3c52ef51 100644 --- a/src/ui/form/opt/pages/optionspage.cpp +++ b/src/ui/form/opt/pages/optionspage.cpp @@ -12,22 +12,22 @@ #include #include -#include "../../../conf/confmanager.h" -#include "../../../conf/firewallconf.h" -#include "../../../driver/drivermanager.h" -#include "../../../fortmanager.h" -#include "../../../fortsettings.h" -#include "../../../manager/translationmanager.h" -#include "../../../manager/windowmanager.h" -#include "../../../task/taskinfoupdatechecker.h" -#include "../../../task/taskmanager.h" -#include "../../../user/iniuser.h" -#include "../../../util/iconcache.h" -#include "../../../util/osutil.h" -#include "../../../util/startuputil.h" -#include "../../controls/controlutil.h" -#include "../../dialog/passworddialog.h" -#include "../optionscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/form/opt/pages/optmainpage.cpp b/src/ui/form/opt/pages/optmainpage.cpp index 56ecbcf6..4e07497d 100644 --- a/src/ui/form/opt/pages/optmainpage.cpp +++ b/src/ui/form/opt/pages/optmainpage.cpp @@ -9,10 +9,11 @@ #include -#include "../../../fortsettings.h" -#include "../../../util/iconcache.h" -#include "../../controls/controlutil.h" -#include "../optionscontroller.h" +#include +#include +#include +#include + #include "addressespage.h" #include "applicationspage.h" #include "optionspage.h" @@ -92,8 +93,7 @@ QLayout *OptMainPage::setupDialogButtons() auto buttonsLayout = new QHBoxLayout(); m_btLogs = ControlUtil::createLinkButton(":/icons/folder.png", settings()->logsPath()); - m_btProfile = - ControlUtil::createLinkButton(":/icons/folder.png", settings()->profilePath()); + m_btProfile = ControlUtil::createLinkButton(":/icons/folder.png", settings()->profilePath()); m_btStat = ControlUtil::createLinkButton(":/icons/folder.png", settings()->statPath()); m_btReleases = ControlUtil::createLinkButton(":/icons/github.png", APP_UPDATES_URL); diff --git a/src/ui/form/opt/pages/schedulepage.cpp b/src/ui/form/opt/pages/schedulepage.cpp index c92d1df5..f735a11f 100644 --- a/src/ui/form/opt/pages/schedulepage.cpp +++ b/src/ui/form/opt/pages/schedulepage.cpp @@ -9,14 +9,14 @@ #include #include -#include "../../../conf/firewallconf.h" -#include "../../../task/taskinfo.h" -#include "../../../task/tasklistmodel.h" -#include "../../../task/taskmanager.h" -#include "../../controls/checkspincombo.h" -#include "../../controls/controlutil.h" -#include "../../controls/tableview.h" -#include "../optionscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/form/opt/pages/servicespage.cpp b/src/ui/form/opt/pages/servicespage.cpp index debb7e4b..454e4f19 100644 --- a/src/ui/form/opt/pages/servicespage.cpp +++ b/src/ui/form/opt/pages/servicespage.cpp @@ -6,15 +6,15 @@ #include #include -#include "../../../conf/firewallconf.h" -#include "../../../model/servicelistmodel.h" -#include "../../../serviceinfo/serviceinfomanager.h" -#include "../../../user/iniuser.h" -#include "../../../util/iconcache.h" -#include "../../../util/ioc/ioccontainer.h" -#include "../../controls/controlutil.h" -#include "../../controls/tableview.h" -#include "../optionscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include ServicesPage::ServicesPage(OptionsController *ctrl, QWidget *parent) : OptBasePage(ctrl, parent), m_serviceListModel(new ServiceListModel(this)) diff --git a/src/ui/form/opt/pages/statisticspage.cpp b/src/ui/form/opt/pages/statisticspage.cpp index f2b9a05c..96eb5727 100644 --- a/src/ui/form/opt/pages/statisticspage.cpp +++ b/src/ui/form/opt/pages/statisticspage.cpp @@ -8,15 +8,15 @@ #include #include -#include "../../../conf/firewallconf.h" -#include "../../../util/iconcache.h" -#include "../../../util/net/netutil.h" -#include "../../controls/checktimeperiod.h" -#include "../../controls/controlutil.h" -#include "../../controls/labelcolor.h" -#include "../../controls/labelspin.h" -#include "../../controls/labelspincombo.h" -#include "../optionscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/form/prog/programeditdialog.cpp b/src/ui/form/prog/programeditdialog.cpp index 449de29b..6e1d05ad 100644 --- a/src/ui/form/prog/programeditdialog.cpp +++ b/src/ui/form/prog/programeditdialog.cpp @@ -11,16 +11,17 @@ #include #include -#include "../../appinfo/appinfocache.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../fortmanager.h" -#include "../../manager/windowmanager.h" -#include "../../util/iconcache.h" -#include "../../util/ioc/ioccontainer.h" -#include "../controls/checkspincombo.h" -#include "../controls/controlutil.h" -#include "../dialog/dialogutil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "programscontroller.h" namespace { diff --git a/src/ui/form/prog/programeditdialog.h b/src/ui/form/prog/programeditdialog.h index 0964607e..e3dd62ca 100644 --- a/src/ui/form/prog/programeditdialog.h +++ b/src/ui/form/prog/programeditdialog.h @@ -3,7 +3,7 @@ #include -#include "../../model/applistmodel.h" +#include QT_FORWARD_DECLARE_CLASS(QCheckBox) QT_FORWARD_DECLARE_CLASS(QComboBox) diff --git a/src/ui/form/prog/programscontroller.cpp b/src/ui/form/prog/programscontroller.cpp index b3ad6a48..1a1e98ae 100644 --- a/src/ui/form/prog/programscontroller.cpp +++ b/src/ui/form/prog/programscontroller.cpp @@ -1,13 +1,13 @@ #include "programscontroller.h" -#include "../../appinfo/appinfocache.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../fortmanager.h" -#include "../../manager/translationmanager.h" -#include "../../manager/windowmanager.h" -#include "../../model/applistmodel.h" -#include "../../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include +#include +#include ProgramsController::ProgramsController(QObject *parent) : QObject(parent), m_appListModel(new AppListModel(this)) diff --git a/src/ui/form/prog/programswindow.cpp b/src/ui/form/prog/programswindow.cpp index e22f024d..d4aeb23b 100644 --- a/src/ui/form/prog/programswindow.cpp +++ b/src/ui/form/prog/programswindow.cpp @@ -6,19 +6,20 @@ #include #include -#include "../../appinfo/appinfocache.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../fortsettings.h" -#include "../../manager/windowmanager.h" -#include "../../model/applistmodel.h" -#include "../../user/iniuser.h" -#include "../../util/guiutil.h" -#include "../../util/iconcache.h" -#include "../../util/window/widgetwindowstatewatcher.h" -#include "../controls/appinforow.h" -#include "../controls/controlutil.h" -#include "../controls/tableview.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "programeditdialog.h" #include "programscontroller.h" diff --git a/src/ui/form/prog/programswindow.h b/src/ui/form/prog/programswindow.h index b72a3e33..4f818baa 100644 --- a/src/ui/form/prog/programswindow.h +++ b/src/ui/form/prog/programswindow.h @@ -1,7 +1,7 @@ #ifndef PROGRAMSWINDOW_H #define PROGRAMSWINDOW_H -#include "../../util/window/widgetwindow.h" +#include QT_FORWARD_DECLARE_CLASS(QCheckBox) QT_FORWARD_DECLARE_CLASS(QPushButton) diff --git a/src/ui/form/stat/pages/connectionspage.cpp b/src/ui/form/stat/pages/connectionspage.cpp index b18da6a4..0ed9d08c 100644 --- a/src/ui/form/stat/pages/connectionspage.cpp +++ b/src/ui/form/stat/pages/connectionspage.cpp @@ -6,19 +6,19 @@ #include #include -#include "../../../appinfo/appinfocache.h" -#include "../../../conf/confmanager.h" -#include "../../../conf/firewallconf.h" -#include "../../../fortsettings.h" -#include "../../../manager/windowmanager.h" -#include "../../../model/connlistmodel.h" -#include "../../../user/iniuser.h" -#include "../../../util/guiutil.h" -#include "../../../util/iconcache.h" -#include "../../controls/appinforow.h" -#include "../../controls/controlutil.h" -#include "../../controls/tableview.h" -#include "../statisticscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/form/stat/pages/statbasepage.cpp b/src/ui/form/stat/pages/statbasepage.cpp index b22de4c6..a1404f1d 100644 --- a/src/ui/form/stat/pages/statbasepage.cpp +++ b/src/ui/form/stat/pages/statbasepage.cpp @@ -2,10 +2,10 @@ #include -#include "../../../conf/firewallconf.h" -#include "../../../fortmanager.h" -#include "../../../user/iniuser.h" -#include "../statisticscontroller.h" +#include +#include +#include +#include StatBasePage::StatBasePage(StatisticsController *ctrl, QWidget *parent) : QFrame(parent), m_ctrl(ctrl) diff --git a/src/ui/form/stat/pages/statmainpage.cpp b/src/ui/form/stat/pages/statmainpage.cpp index 5ff883a1..b81befdc 100644 --- a/src/ui/form/stat/pages/statmainpage.cpp +++ b/src/ui/form/stat/pages/statmainpage.cpp @@ -5,10 +5,11 @@ #include #include -#include "../../../fortsettings.h" -#include "../../../util/iconcache.h" -#include "../../controls/controlutil.h" -#include "../statisticscontroller.h" +#include +#include +#include +#include + #include "connectionspage.h" #include "trafficpage.h" diff --git a/src/ui/form/stat/pages/trafficpage.cpp b/src/ui/form/stat/pages/trafficpage.cpp index 3450b5af..ce85742e 100644 --- a/src/ui/form/stat/pages/trafficpage.cpp +++ b/src/ui/form/stat/pages/trafficpage.cpp @@ -13,17 +13,17 @@ #include #include -#include "../../../appinfo/appinfocache.h" -#include "../../../conf/confmanager.h" -#include "../../../manager/windowmanager.h" -#include "../../../model/appstatmodel.h" -#include "../../../model/traflistmodel.h" -#include "../../../user/iniuser.h" -#include "../../../util/iconcache.h" -#include "../../controls/appinforow.h" -#include "../../controls/controlutil.h" -#include "../../controls/listview.h" -#include "../statisticscontroller.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include TrafficPage::TrafficPage(StatisticsController *ctrl, QWidget *parent) : StatBasePage(ctrl, parent), diff --git a/src/ui/form/stat/statisticscontroller.cpp b/src/ui/form/stat/statisticscontroller.cpp index a85b94f0..03adfb20 100644 --- a/src/ui/form/stat/statisticscontroller.cpp +++ b/src/ui/form/stat/statisticscontroller.cpp @@ -1,11 +1,11 @@ #include "statisticscontroller.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../fortmanager.h" -#include "../../manager/translationmanager.h" -#include "../../manager/windowmanager.h" -#include "../../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include StatisticsController::StatisticsController(QObject *parent) : QObject(parent) { diff --git a/src/ui/form/stat/statisticswindow.cpp b/src/ui/form/stat/statisticswindow.cpp index 3f6d99bd..444653a7 100644 --- a/src/ui/form/stat/statisticswindow.cpp +++ b/src/ui/form/stat/statisticswindow.cpp @@ -2,11 +2,12 @@ #include -#include "../../conf/confmanager.h" -#include "../../manager/windowmanager.h" -#include "../../user/iniuser.h" -#include "../../util/guiutil.h" -#include "../../util/window/widgetwindowstatewatcher.h" +#include +#include +#include +#include +#include + #include "pages/statmainpage.h" #include "statisticscontroller.h" diff --git a/src/ui/form/stat/statisticswindow.h b/src/ui/form/stat/statisticswindow.h index 8158cf22..350eacdc 100644 --- a/src/ui/form/stat/statisticswindow.h +++ b/src/ui/form/stat/statisticswindow.h @@ -1,7 +1,7 @@ #ifndef STATISTICSWINDOW_H #define STATISTICSWINDOW_H -#include "../../util/window/widgetwindow.h" +#include class ConfManager; class IniUser; diff --git a/src/ui/form/tray/traycontroller.cpp b/src/ui/form/tray/traycontroller.cpp index d30b6623..5157f196 100644 --- a/src/ui/form/tray/traycontroller.cpp +++ b/src/ui/form/tray/traycontroller.cpp @@ -1,13 +1,13 @@ #include "traycontroller.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../fortmanager.h" -#include "../../fortsettings.h" -#include "../../manager/hotkeymanager.h" -#include "../../manager/translationmanager.h" -#include "../../manager/windowmanager.h" -#include "../../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include +#include +#include TrayController::TrayController(QObject *parent) : QObject(parent) { diff --git a/src/ui/form/tray/trayicon.cpp b/src/ui/form/tray/trayicon.cpp index 6cfb2088..69942898 100644 --- a/src/ui/form/tray/trayicon.cpp +++ b/src/ui/form/tray/trayicon.cpp @@ -4,17 +4,18 @@ #include #include -#include "../../conf/addressgroup.h" -#include "../../conf/appgroup.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../fortsettings.h" -#include "../../manager/hotkeymanager.h" -#include "../../manager/windowmanager.h" -#include "../../user/iniuser.h" -#include "../../util/guiutil.h" -#include "../../util/iconcache.h" -#include "../controls/mainwindow.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "traycontroller.h" namespace { @@ -132,9 +133,8 @@ void TrayIcon::onTrayActivated(QSystemTrayIcon::ActivationReason reason) void TrayIcon::updateTrayIcon(bool alerted) { - const auto icon = alerted - ? GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/error.png") - : IconCache::icon(":/icons/sheild-96.png"); + const auto icon = alerted ? GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/error.png") + : IconCache::icon(":/icons/sheild-96.png"); this->setIcon(icon); } diff --git a/src/ui/form/zone/zonescontroller.cpp b/src/ui/form/zone/zonescontroller.cpp index 08e3e67f..48f567fb 100644 --- a/src/ui/form/zone/zonescontroller.cpp +++ b/src/ui/form/zone/zonescontroller.cpp @@ -1,12 +1,12 @@ #include "zonescontroller.h" -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../manager/translationmanager.h" -#include "../../manager/windowmanager.h" -#include "../../model/zonelistmodel.h" -#include "../../task/taskmanager.h" -#include "../../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include +#include ZonesController::ZonesController(QObject *parent) : QObject(parent) { diff --git a/src/ui/form/zone/zoneswindow.cpp b/src/ui/form/zone/zoneswindow.cpp index f73b8b17..31921426 100644 --- a/src/ui/form/zone/zoneswindow.cpp +++ b/src/ui/form/zone/zoneswindow.cpp @@ -11,22 +11,23 @@ #include #include -#include "../../conf/confmanager.h" -#include "../../conf/firewallconf.h" -#include "../../manager/windowmanager.h" -#include "../../model/zonelistmodel.h" -#include "../../model/zonesourcewrapper.h" -#include "../../task/taskinfozonedownloader.h" -#include "../../task/taskmanager.h" -#include "../../user/iniuser.h" -#include "../../util/conf/confutil.h" -#include "../../util/guiutil.h" -#include "../../util/iconcache.h" -#include "../../util/ioc/ioccontainer.h" -#include "../../util/window/widgetwindowstatewatcher.h" -#include "../controls/controlutil.h" -#include "../controls/tableview.h" -#include "../dialog/dialogutil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "zonescontroller.h" namespace { @@ -166,8 +167,7 @@ void ZonesWindow::setupUi() this->setFont(WindowManager::defaultFont()); // Icon - this->setWindowIcon( - GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/ip_class.png")); + this->setWindowIcon(GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/ip_class.png")); // Size this->setMinimumSize(500, 400); diff --git a/src/ui/form/zone/zoneswindow.h b/src/ui/form/zone/zoneswindow.h index c5feed4d..5c51bbb2 100644 --- a/src/ui/form/zone/zoneswindow.h +++ b/src/ui/form/zone/zoneswindow.h @@ -1,7 +1,7 @@ #ifndef ZONESWINDOW_H #define ZONESWINDOW_H -#include "../../util/window/widgetwindow.h" +#include QT_FORWARD_DECLARE_CLASS(QCheckBox) QT_FORWARD_DECLARE_CLASS(QComboBox) diff --git a/src/ui/fortmanager.cpp b/src/ui/fortmanager.cpp index 3c514139..945a783f 100644 --- a/src/ui/fortmanager.cpp +++ b/src/ui/fortmanager.cpp @@ -8,35 +8,35 @@ #include -#include "appinfo/appinfocache.h" -#include "conf/firewallconf.h" -#include "control/controlmanager.h" -#include "form/dialog/passworddialog.h" -#include "fortsettings.h" -#include "hostinfo/hostinfocache.h" -#include "manager/envmanager.h" -#include "manager/hotkeymanager.h" -#include "manager/logger.h" -#include "manager/nativeeventfilter.h" -#include "manager/translationmanager.h" -#include "model/zonelistmodel.h" -#include "rpc/appinfomanagerrpc.h" -#include "rpc/confmanagerrpc.h" -#include "rpc/drivermanagerrpc.h" -#include "rpc/logmanagerrpc.h" -#include "rpc/quotamanagerrpc.h" -#include "rpc/rpcmanager.h" -#include "rpc/statmanagerrpc.h" -#include "rpc/taskmanagerrpc.h" -#include "rpc/windowmanagerfake.h" -#include "serviceinfo/serviceinfomanager.h" -#include "task/taskinfozonedownloader.h" -#include "user/usersettings.h" -#include "util/dateutil.h" -#include "util/fileutil.h" -#include "util/ioc/ioccontainer.h" -#include "util/osutil.h" -#include "util/startuputil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include FortManager::FortManager(QObject *parent) : QObject(parent), m_initialized(false) { } diff --git a/src/ui/fortmanager.h b/src/ui/fortmanager.h index 37a2e4ed..7a0a863d 100644 --- a/src/ui/fortmanager.h +++ b/src/ui/fortmanager.h @@ -3,7 +3,7 @@ #include -#include "util/classhelpers.h" +#include class FirewallConf; diff --git a/src/ui/fortsettings.cpp b/src/ui/fortsettings.cpp index f9132246..b165f26c 100644 --- a/src/ui/fortsettings.cpp +++ b/src/ui/fortsettings.cpp @@ -5,13 +5,13 @@ #include -#include "conf/firewallconf.h" -#include "manager/envmanager.h" -#include "util/dateutil.h" -#include "util/fileutil.h" -#include "util/osutil.h" -#include "util/startuputil.h" -#include "util/stringutil.h" +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/fortsettings.h b/src/ui/fortsettings.h index c5dd33e4..a19c803e 100644 --- a/src/ui/fortsettings.h +++ b/src/ui/fortsettings.h @@ -1,7 +1,7 @@ #ifndef FORTSETTINGS_H #define FORTSETTINGS_H -#include "util/ini/settings.h" +#include class EnvManager; class FirewallConf; diff --git a/src/ui/hostinfo/hostinfocache.h b/src/ui/hostinfo/hostinfocache.h index da6a5f57..80145e09 100644 --- a/src/ui/hostinfo/hostinfocache.h +++ b/src/ui/hostinfo/hostinfocache.h @@ -4,8 +4,9 @@ #include #include -#include "../util/ioc/iocservice.h" -#include "../util/triggertimer.h" +#include +#include + #include "hostinfo.h" class HostInfoManager; diff --git a/src/ui/hostinfo/hostinfojob.cpp b/src/ui/hostinfo/hostinfojob.cpp index 6a2ccd0c..15193dcd 100644 --- a/src/ui/hostinfo/hostinfojob.cpp +++ b/src/ui/hostinfo/hostinfojob.cpp @@ -1,6 +1,6 @@ #include "hostinfojob.h" -#include "../util/net/netutil.h" +#include HostInfoJob::HostInfoJob(const QString &address) : WorkerJob(address) { } diff --git a/src/ui/hostinfo/hostinfojob.h b/src/ui/hostinfo/hostinfojob.h index f5db645f..4493e695 100644 --- a/src/ui/hostinfo/hostinfojob.h +++ b/src/ui/hostinfo/hostinfojob.h @@ -1,7 +1,7 @@ #ifndef HOSTINFOJOB_H #define HOSTINFOJOB_H -#include "../util/worker/workerjob.h" +#include class HostInfoJob : public WorkerJob { diff --git a/src/ui/hostinfo/hostinfomanager.h b/src/ui/hostinfo/hostinfomanager.h index 7457a9dc..bd18c99a 100644 --- a/src/ui/hostinfo/hostinfomanager.h +++ b/src/ui/hostinfo/hostinfomanager.h @@ -1,7 +1,7 @@ #ifndef HOSTINFOMANAGER_H #define HOSTINFOMANAGER_H -#include "../util/worker/workermanager.h" +#include class HostInfoManager : public WorkerManager { diff --git a/src/ui/log/logbuffer.cpp b/src/ui/log/logbuffer.cpp index 4039e78f..57f91bf9 100644 --- a/src/ui/log/logbuffer.cpp +++ b/src/ui/log/logbuffer.cpp @@ -1,6 +1,7 @@ #include "logbuffer.h" -#include "../driver/drivercommon.h" +#include + #include "logentryblocked.h" #include "logentryblockedip.h" #include "logentryprocnew.h" diff --git a/src/ui/log/logentry.cpp b/src/ui/log/logentry.cpp index fde8d930..edc51790 100644 --- a/src/ui/log/logentry.cpp +++ b/src/ui/log/logentry.cpp @@ -1,7 +1,7 @@ #include "logentry.h" -#include "../util/fileutil.h" -#include "../util/osutil.h" +#include +#include QString LogEntry::getAppPath(const QString &kernelPath, quint32 pid) { diff --git a/src/ui/log/logentry.h b/src/ui/log/logentry.h index c8386256..bfe3b0cf 100644 --- a/src/ui/log/logentry.h +++ b/src/ui/log/logentry.h @@ -3,7 +3,7 @@ #include -#include "../util/classhelpers.h" +#include class LogEntry { diff --git a/src/ui/log/logmanager.cpp b/src/ui/log/logmanager.cpp index af530011..67c378e6 100644 --- a/src/ui/log/logmanager.cpp +++ b/src/ui/log/logmanager.cpp @@ -2,14 +2,15 @@ #include -#include "../conf/confmanager.h" -#include "../driver/drivercommon.h" -#include "../driver/drivermanager.h" -#include "../driver/driverworker.h" -#include "../stat/statmanager.h" -#include "../util/dateutil.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/osutil.h" +#include +#include +#include +#include +#include +#include +#include +#include + #include "logbuffer.h" #include "logentryblocked.h" #include "logentryblockedip.h" diff --git a/src/ui/log/logmanager.h b/src/ui/log/logmanager.h index 3e27cfab..be5db291 100644 --- a/src/ui/log/logmanager.h +++ b/src/ui/log/logmanager.h @@ -3,7 +3,7 @@ #include -#include "../util/ioc/iocservice.h" +#include class LogBuffer; class LogEntry; diff --git a/src/ui/manager/envmanager.cpp b/src/ui/manager/envmanager.cpp index 09f3f442..9694e5d0 100644 --- a/src/ui/manager/envmanager.cpp +++ b/src/ui/manager/envmanager.cpp @@ -3,7 +3,7 @@ #include #include -#include "../util/fileutil.h" +#include EnvManager::EnvManager(QObject *parent) : QObject(parent) { diff --git a/src/ui/manager/hotkeymanager.cpp b/src/ui/manager/hotkeymanager.cpp index 58633b47..f2182d0f 100644 --- a/src/ui/manager/hotkeymanager.cpp +++ b/src/ui/manager/hotkeymanager.cpp @@ -3,8 +3,9 @@ #include #include -#include "../util/ioc/ioccontainer.h" -#include "../util/osutil.h" +#include +#include + #include "nativeeventfilter.h" HotKeyManager::HotKeyManager(QObject *parent) : QObject(parent) { } diff --git a/src/ui/manager/hotkeymanager.h b/src/ui/manager/hotkeymanager.h index ab5f586a..711def1f 100644 --- a/src/ui/manager/hotkeymanager.h +++ b/src/ui/manager/hotkeymanager.h @@ -4,7 +4,7 @@ #include #include -#include "../util/ioc/iocservice.h" +#include class NativeEventFilter; diff --git a/src/ui/manager/logger.cpp b/src/ui/manager/logger.cpp index b7012485..abbca1aa 100644 --- a/src/ui/manager/logger.cpp +++ b/src/ui/manager/logger.cpp @@ -2,9 +2,9 @@ #include -#include "../util/dateutil.h" -#include "../util/fileutil.h" -#include "../util/osutil.h" +#include +#include +#include namespace { diff --git a/src/ui/manager/nativeeventfilter.h b/src/ui/manager/nativeeventfilter.h index 6c6bc3b4..d47d6a45 100644 --- a/src/ui/manager/nativeeventfilter.h +++ b/src/ui/manager/nativeeventfilter.h @@ -5,8 +5,8 @@ #include #include -#include "../util/classhelpers.h" -#include "../util/ioc/iocservice.h" +#include +#include class NativeEventFilter : public QObject, public QAbstractNativeEventFilter, public IocService { diff --git a/src/ui/manager/translationmanager.cpp b/src/ui/manager/translationmanager.cpp index 24643db1..588c1bac 100644 --- a/src/ui/manager/translationmanager.cpp +++ b/src/ui/manager/translationmanager.cpp @@ -4,8 +4,8 @@ #include #include -#include "util/fileutil.h" -#include "util/stringutil.h" +#include +#include #define TRANSLATION_FILE_PREFIX "i18n_" #define TRANSLATION_FILE_SUFFIX ".qm" diff --git a/src/ui/manager/translationmanager.h b/src/ui/manager/translationmanager.h index e6e77f17..e3e56e8b 100644 --- a/src/ui/manager/translationmanager.h +++ b/src/ui/manager/translationmanager.h @@ -6,8 +6,8 @@ #include #include -#include "../util/classhelpers.h" -#include "../util/ioc/iocservice.h" +#include +#include QT_FORWARD_DECLARE_CLASS(QTranslator) diff --git a/src/ui/manager/windowmanager.cpp b/src/ui/manager/windowmanager.cpp index 7d3e5afa..a51235fd 100644 --- a/src/ui/manager/windowmanager.cpp +++ b/src/ui/manager/windowmanager.cpp @@ -7,20 +7,21 @@ #include #include -#include "../conf/confmanager.h" -#include "../form/controls/mainwindow.h" -#include "../form/dialog/passworddialog.h" -#include "../form/graph/graphwindow.h" -#include "../form/opt/optionswindow.h" -#include "../form/prog/programswindow.h" -#include "../form/stat/statisticswindow.h" -#include "../form/tray/trayicon.h" -#include "../form/zone/zoneswindow.h" -#include "../fortcompat.h" -#include "../fortsettings.h" -#include "../stat/statmanager.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "nativeeventfilter.h" -#include "util/ioc/ioccontainer.h" namespace { diff --git a/src/ui/manager/windowmanager.h b/src/ui/manager/windowmanager.h index c7d390d4..2ec3d917 100644 --- a/src/ui/manager/windowmanager.h +++ b/src/ui/manager/windowmanager.h @@ -3,7 +3,7 @@ #include -#include "../util/ioc/iocservice.h" +#include class GraphWindow; class MainWindow; diff --git a/src/ui/model/applistmodel.cpp b/src/ui/model/applistmodel.cpp index 44ce72e0..3dd0768d 100644 --- a/src/ui/model/applistmodel.cpp +++ b/src/ui/model/applistmodel.cpp @@ -6,16 +6,16 @@ #include #include -#include "../appinfo/appinfocache.h" -#include "../appinfo/appinfoutil.h" -#include "../conf/appgroup.h" -#include "../conf/confmanager.h" -#include "../conf/firewallconf.h" -#include "../util/fileutil.h" -#include "../util/guiutil.h" -#include "../util/iconcache.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/net/netutil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/model/applistmodel.h b/src/ui/model/applistmodel.h index 62e30cd6..fc4210ec 100644 --- a/src/ui/model/applistmodel.h +++ b/src/ui/model/applistmodel.h @@ -3,7 +3,7 @@ #include -#include "../util/model/tablesqlmodel.h" +#include class AppGroup; class AppInfoCache; diff --git a/src/ui/model/appstatmodel.cpp b/src/ui/model/appstatmodel.cpp index 4cdc2ba5..9b2e63a2 100644 --- a/src/ui/model/appstatmodel.cpp +++ b/src/ui/model/appstatmodel.cpp @@ -2,13 +2,14 @@ #include -#include "../appinfo/appinfo.h" -#include "../appinfo/appinfocache.h" -#include "../fortmanager.h" -#include "../stat/statmanager.h" -#include "../util/fileutil.h" -#include "../util/iconcache.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include +#include + #include "traflistmodel.h" AppStatModel::AppStatModel(QObject *parent) : StringListModel(parent) { } diff --git a/src/ui/model/appstatmodel.h b/src/ui/model/appstatmodel.h index 59fc6d19..7e2e9720 100644 --- a/src/ui/model/appstatmodel.h +++ b/src/ui/model/appstatmodel.h @@ -1,7 +1,7 @@ #ifndef APPSTATMODEL_H #define APPSTATMODEL_H -#include "../util/model/stringlistmodel.h" +#include class AppInfoCache; class StatManager; diff --git a/src/ui/model/connlistmodel.cpp b/src/ui/model/connlistmodel.cpp index dda148b0..c91fe7f0 100644 --- a/src/ui/model/connlistmodel.cpp +++ b/src/ui/model/connlistmodel.cpp @@ -6,14 +6,14 @@ #include #include -#include "../appinfo/appinfocache.h" -#include "../fortmanager.h" -#include "../hostinfo/hostinfocache.h" -#include "../log/logentryblockedip.h" -#include "../stat/statmanager.h" -#include "../util/iconcache.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/net/netutil.h" +#include +#include +#include +#include +#include +#include +#include +#include ConnListModel::ConnListModel(QObject *parent) : TableSqlModel(parent), m_connMode(ConnNone), m_resolveAddress(false) diff --git a/src/ui/model/connlistmodel.h b/src/ui/model/connlistmodel.h index ac569259..7f0003d0 100644 --- a/src/ui/model/connlistmodel.h +++ b/src/ui/model/connlistmodel.h @@ -3,7 +3,7 @@ #include -#include "../util/model/tablesqlmodel.h" +#include class AppInfoCache; class FortManager; diff --git a/src/ui/model/servicelistmodel.cpp b/src/ui/model/servicelistmodel.cpp index 80a3b6c2..87f23320 100644 --- a/src/ui/model/servicelistmodel.cpp +++ b/src/ui/model/servicelistmodel.cpp @@ -1,10 +1,10 @@ #include "servicelistmodel.h" -#include "../conf/appgroup.h" -#include "../conf/confmanager.h" -#include "../conf/firewallconf.h" -#include "../serviceinfo/serviceinfomanager.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include ServiceListModel::ServiceListModel(QObject *parent) : TableItemModel(parent) { } diff --git a/src/ui/model/servicelistmodel.h b/src/ui/model/servicelistmodel.h index 7f49e407..a52b4feb 100644 --- a/src/ui/model/servicelistmodel.h +++ b/src/ui/model/servicelistmodel.h @@ -3,7 +3,7 @@ #include -#include "../util/model/tableitemmodel.h" +#include class ConfManager; class FirewallConf; diff --git a/src/ui/model/traflistmodel.cpp b/src/ui/model/traflistmodel.cpp index bf60acf6..61f1a5de 100644 --- a/src/ui/model/traflistmodel.cpp +++ b/src/ui/model/traflistmodel.cpp @@ -2,11 +2,11 @@ #include -#include "../stat/statmanager.h" -#include "../stat/statsql.h" -#include "../util/dateutil.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/net/netutil.h" +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/model/traflistmodel.h b/src/ui/model/traflistmodel.h index 8d79cf8a..9fa28eca 100644 --- a/src/ui/model/traflistmodel.h +++ b/src/ui/model/traflistmodel.h @@ -1,7 +1,7 @@ #ifndef TRAFLISTMODEL_H #define TRAFLISTMODEL_H -#include "../util/model/tableitemmodel.h" +#include class StatManager; diff --git a/src/ui/model/zonelistmodel.cpp b/src/ui/model/zonelistmodel.cpp index 7b4b7f91..e63a6dc6 100644 --- a/src/ui/model/zonelistmodel.cpp +++ b/src/ui/model/zonelistmodel.cpp @@ -6,11 +6,12 @@ #include #include -#include "../conf/confmanager.h" -#include "../util/conf/confutil.h" -#include "../util/fileutil.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/json/jsonutil.h" +#include +#include +#include +#include +#include + #include "zonesourcewrapper.h" #include "zonetypewrapper.h" diff --git a/src/ui/model/zonelistmodel.h b/src/ui/model/zonelistmodel.h index 5f0d31a7..a9748089 100644 --- a/src/ui/model/zonelistmodel.h +++ b/src/ui/model/zonelistmodel.h @@ -3,8 +3,8 @@ #include -#include "../util/ioc/iocservice.h" -#include "../util/model/tablesqlmodel.h" +#include +#include class ConfManager; class SqliteDb; diff --git a/src/ui/model/zonesourcewrapper.h b/src/ui/model/zonesourcewrapper.h index 5244a5a7..2d368fa8 100644 --- a/src/ui/model/zonesourcewrapper.h +++ b/src/ui/model/zonesourcewrapper.h @@ -1,7 +1,7 @@ #ifndef ZONESOURCEWRAPPER_H #define ZONESOURCEWRAPPER_H -#include "../util/json/mapwrapper.h" +#include class ZoneSourceWrapper : public MapWrapper { diff --git a/src/ui/model/zonetypewrapper.h b/src/ui/model/zonetypewrapper.h index 5ac9619d..468fc46b 100644 --- a/src/ui/model/zonetypewrapper.h +++ b/src/ui/model/zonetypewrapper.h @@ -1,7 +1,7 @@ #ifndef ZONEWRAPPER_H #define ZONEWRAPPER_H -#include "../util/json/mapwrapper.h" +#include class ZoneTypeWrapper : public MapWrapper { diff --git a/src/ui/rpc/appinfomanagerrpc.cpp b/src/ui/rpc/appinfomanagerrpc.cpp index c4a64234..6f6f0e3c 100644 --- a/src/ui/rpc/appinfomanagerrpc.cpp +++ b/src/ui/rpc/appinfomanagerrpc.cpp @@ -2,8 +2,8 @@ #include -#include "../rpc/rpcmanager.h" -#include "../util/ioc/ioccontainer.h" +#include +#include AppInfoManagerRpc::AppInfoManagerRpc(const QString &filePath, QObject *parent) : AppInfoManager(filePath, parent, SqliteDb::OpenDefaultReadOnly) diff --git a/src/ui/rpc/appinfomanagerrpc.h b/src/ui/rpc/appinfomanagerrpc.h index 1769c637..87a2d62e 100644 --- a/src/ui/rpc/appinfomanagerrpc.h +++ b/src/ui/rpc/appinfomanagerrpc.h @@ -1,7 +1,7 @@ #ifndef APPINFOMANAGERRPC_H #define APPINFOMANAGERRPC_H -#include "../appinfo/appinfomanager.h" +#include class AppInfoManagerRpc : public AppInfoManager { diff --git a/src/ui/rpc/confmanagerrpc.cpp b/src/ui/rpc/confmanagerrpc.cpp index 069ac4bf..74d0332d 100644 --- a/src/ui/rpc/confmanagerrpc.cpp +++ b/src/ui/rpc/confmanagerrpc.cpp @@ -2,12 +2,12 @@ #include -#include "../conf/firewallconf.h" -#include "../fortsettings.h" -#include "../manager/windowmanager.h" -#include "../rpc/rpcmanager.h" -#include "../task/taskmanager.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include ConfManagerRpc::ConfManagerRpc(const QString &filePath, QObject *parent) : ConfManager(filePath, parent, SqliteDb::OpenDefaultReadOnly) diff --git a/src/ui/rpc/confmanagerrpc.h b/src/ui/rpc/confmanagerrpc.h index d7208888..68fa7012 100644 --- a/src/ui/rpc/confmanagerrpc.h +++ b/src/ui/rpc/confmanagerrpc.h @@ -1,7 +1,7 @@ #ifndef CONFMANAGERRPC_H #define CONFMANAGERRPC_H -#include "../conf/confmanager.h" +#include class RpcManager; class TaskManager; diff --git a/src/ui/rpc/drivermanagerrpc.cpp b/src/ui/rpc/drivermanagerrpc.cpp index 333af2a9..59bc4088 100644 --- a/src/ui/rpc/drivermanagerrpc.cpp +++ b/src/ui/rpc/drivermanagerrpc.cpp @@ -1,8 +1,8 @@ #include "drivermanagerrpc.h" -#include "../control/controlworker.h" -#include "../rpc/rpcmanager.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include DriverManagerRpc::DriverManagerRpc(QObject *parent) : DriverManager(parent, false), m_isDeviceOpened(false) diff --git a/src/ui/rpc/drivermanagerrpc.h b/src/ui/rpc/drivermanagerrpc.h index 041e2af6..ddad5219 100644 --- a/src/ui/rpc/drivermanagerrpc.h +++ b/src/ui/rpc/drivermanagerrpc.h @@ -1,7 +1,7 @@ #ifndef DRIVERMANAGERRPC_H #define DRIVERMANAGERRPC_H -#include "../driver/drivermanager.h" +#include class DriverManagerRpc : public DriverManager { diff --git a/src/ui/rpc/logmanagerrpc.h b/src/ui/rpc/logmanagerrpc.h index ae78e630..a31fe6f3 100644 --- a/src/ui/rpc/logmanagerrpc.h +++ b/src/ui/rpc/logmanagerrpc.h @@ -1,7 +1,7 @@ #ifndef LOGMANAGERRPC_H #define LOGMANAGERRPC_H -#include "../log/logmanager.h" +#include class LogManagerRpc : public LogManager { diff --git a/src/ui/rpc/quotamanagerrpc.h b/src/ui/rpc/quotamanagerrpc.h index 230677b5..da87abbb 100644 --- a/src/ui/rpc/quotamanagerrpc.h +++ b/src/ui/rpc/quotamanagerrpc.h @@ -1,7 +1,7 @@ #ifndef QUOTAMANAGERRPC_H #define QUOTAMANAGERRPC_H -#include "../stat/quotamanager.h" +#include class QuotaManagerRpc : public QuotaManager { diff --git a/src/ui/rpc/rpcmanager.cpp b/src/ui/rpc/rpcmanager.cpp index 1c883e1a..789bf5d3 100644 --- a/src/ui/rpc/rpcmanager.cpp +++ b/src/ui/rpc/rpcmanager.cpp @@ -1,17 +1,17 @@ #include "rpcmanager.h" -#include "../conf/firewallconf.h" -#include "../control/controlmanager.h" -#include "../control/controlworker.h" -#include "../fortsettings.h" -#include "../manager/windowmanager.h" -#include "../rpc/appinfomanagerrpc.h" -#include "../rpc/confmanagerrpc.h" -#include "../rpc/drivermanagerrpc.h" -#include "../rpc/quotamanagerrpc.h" -#include "../rpc/statmanagerrpc.h" -#include "../rpc/taskmanagerrpc.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/ui/rpc/rpcmanager.h b/src/ui/rpc/rpcmanager.h index 1a78fe85..6c6f218d 100644 --- a/src/ui/rpc/rpcmanager.h +++ b/src/ui/rpc/rpcmanager.h @@ -4,8 +4,8 @@ #include #include -#include "../control/control.h" -#include "../util/ioc/iocservice.h" +#include +#include struct ProcessCommandArgs; class ControlWorker; diff --git a/src/ui/rpc/statmanagerrpc.cpp b/src/ui/rpc/statmanagerrpc.cpp index 617581c8..287f9fe6 100644 --- a/src/ui/rpc/statmanagerrpc.cpp +++ b/src/ui/rpc/statmanagerrpc.cpp @@ -2,9 +2,9 @@ #include -#include "../fortmanager.h" -#include "../rpc/rpcmanager.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include StatManagerRpc::StatManagerRpc(const QString &filePath, QObject *parent) : StatManager(filePath, parent, SqliteDb::OpenDefaultReadOnly) diff --git a/src/ui/rpc/statmanagerrpc.h b/src/ui/rpc/statmanagerrpc.h index 00f7c21d..7cb0b7a3 100644 --- a/src/ui/rpc/statmanagerrpc.h +++ b/src/ui/rpc/statmanagerrpc.h @@ -1,7 +1,7 @@ #ifndef STATMANAGERRPC_H #define STATMANAGERRPC_H -#include "../stat/statmanager.h" +#include class StatManagerRpc : public StatManager { diff --git a/src/ui/rpc/taskmanagerrpc.cpp b/src/ui/rpc/taskmanagerrpc.cpp index 89c26893..7f162131 100644 --- a/src/ui/rpc/taskmanagerrpc.cpp +++ b/src/ui/rpc/taskmanagerrpc.cpp @@ -1,8 +1,8 @@ #include "taskmanagerrpc.h" -#include "../rpc/rpcmanager.h" -#include "../task/taskinfo.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include TaskManagerRpc::TaskManagerRpc(QObject *parent) : TaskManager(parent) { } diff --git a/src/ui/rpc/taskmanagerrpc.h b/src/ui/rpc/taskmanagerrpc.h index ca2818a0..db61b79a 100644 --- a/src/ui/rpc/taskmanagerrpc.h +++ b/src/ui/rpc/taskmanagerrpc.h @@ -1,7 +1,7 @@ #ifndef TASKMANAGERRPC_H #define TASKMANAGERRPC_H -#include "../task/taskmanager.h" +#include class TaskManagerRpc : public TaskManager { diff --git a/src/ui/rpc/windowmanagerfake.h b/src/ui/rpc/windowmanagerfake.h index 98e958bd..9550cfab 100644 --- a/src/ui/rpc/windowmanagerfake.h +++ b/src/ui/rpc/windowmanagerfake.h @@ -1,7 +1,7 @@ #ifndef WINDOWMANAGERFAKE_H #define WINDOWMANAGERFAKE_H -#include "../manager/windowmanager.h" +#include class WindowManagerFake : public WindowManager { diff --git a/src/ui/serviceinfo/serviceinfomanager.h b/src/ui/serviceinfo/serviceinfomanager.h index f6785c56..bd082be2 100644 --- a/src/ui/serviceinfo/serviceinfomanager.h +++ b/src/ui/serviceinfo/serviceinfomanager.h @@ -4,7 +4,8 @@ #include #include -#include "../util/ioc/iocservice.h" +#include + #include "serviceinfo.h" class ServiceInfoManager : public QObject, public IocService diff --git a/src/ui/stat/quotamanager.cpp b/src/ui/stat/quotamanager.cpp index 6a3e6c35..b722aca0 100644 --- a/src/ui/stat/quotamanager.cpp +++ b/src/ui/stat/quotamanager.cpp @@ -1,8 +1,8 @@ #include "quotamanager.h" -#include "../conf/confmanager.h" -#include "../conf/firewallconf.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include QuotaManager::QuotaManager(QObject *parent) : QObject(parent) { } diff --git a/src/ui/stat/quotamanager.h b/src/ui/stat/quotamanager.h index 33bb6574..736a2065 100644 --- a/src/ui/stat/quotamanager.h +++ b/src/ui/stat/quotamanager.h @@ -3,7 +3,7 @@ #include -#include "../util/ioc/iocservice.h" +#include class QuotaManager : public QObject, public IocService { diff --git a/src/ui/stat/statmanager.cpp b/src/ui/stat/statmanager.cpp index a3393e0a..00578f55 100644 --- a/src/ui/stat/statmanager.cpp +++ b/src/ui/stat/statmanager.cpp @@ -5,15 +5,16 @@ #include #include -#include "../conf/firewallconf.h" -#include "../driver/drivercommon.h" -#include "../log/logentryblockedip.h" -#include "../log/logentryprocnew.h" -#include "../log/logentrystattraf.h" -#include "../util/dateutil.h" -#include "../util/fileutil.h" -#include "../util/ioc/ioccontainer.h" -#include "../util/osutil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "quotamanager.h" #include "statsql.h" diff --git a/src/ui/stat/statmanager.h b/src/ui/stat/statmanager.h index 8dfcbaa7..c67ef6a4 100644 --- a/src/ui/stat/statmanager.h +++ b/src/ui/stat/statmanager.h @@ -6,9 +6,9 @@ #include #include -#include "../util/classhelpers.h" -#include "../util/ioc/iocservice.h" -#include "../util/triggertimer.h" +#include +#include +#include class FirewallConf; class IniOptions; diff --git a/src/ui/task/taskdownloader.cpp b/src/ui/task/taskdownloader.cpp index f025316f..a5ba65bd 100644 --- a/src/ui/task/taskdownloader.cpp +++ b/src/ui/task/taskdownloader.cpp @@ -1,6 +1,6 @@ #include "taskdownloader.h" -#include "../util/net/netdownloader.h" +#include TaskDownloader::TaskDownloader(QObject *parent) : TaskWorker(parent) { } diff --git a/src/ui/task/taskinfo.cpp b/src/ui/task/taskinfo.cpp index 01c016da..153cc11c 100644 --- a/src/ui/task/taskinfo.cpp +++ b/src/ui/task/taskinfo.cpp @@ -2,7 +2,8 @@ #include -#include "../util/dateutil.h" +#include + #include "taskeditinfo.h" #include "taskmanager.h" #include "taskupdatechecker.h" diff --git a/src/ui/task/taskinfo.h b/src/ui/task/taskinfo.h index 2e94b8e9..4177c1c5 100644 --- a/src/ui/task/taskinfo.h +++ b/src/ui/task/taskinfo.h @@ -4,7 +4,7 @@ #include #include -#include "../util/classhelpers.h" +#include class TaskManager; class TaskWorker; diff --git a/src/ui/task/taskinfoupdatechecker.cpp b/src/ui/task/taskinfoupdatechecker.cpp index c9fae5ef..dddbb586 100644 --- a/src/ui/task/taskinfoupdatechecker.cpp +++ b/src/ui/task/taskinfoupdatechecker.cpp @@ -4,8 +4,9 @@ #include -#include "../manager/windowmanager.h" -#include "../util/ioc/ioccontainer.h" +#include +#include + #include "taskupdatechecker.h" #define TASK_INFO_VERSION 2 diff --git a/src/ui/task/taskinfozonedownloader.cpp b/src/ui/task/taskinfozonedownloader.cpp index 2f97ca6d..4ebcc4bc 100644 --- a/src/ui/task/taskinfozonedownloader.cpp +++ b/src/ui/task/taskinfozonedownloader.cpp @@ -2,14 +2,15 @@ #include -#include "../conf/confmanager.h" -#include "../fortsettings.h" -#include "../manager/windowmanager.h" -#include "../model/zonelistmodel.h" -#include "../model/zonesourcewrapper.h" -#include "../model/zonetypewrapper.h" -#include "../util/fileutil.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include +#include +#include +#include +#include +#include + #include "taskzonedownloader.h" TaskInfoZoneDownloader::TaskInfoZoneDownloader(TaskManager &taskManager) : diff --git a/src/ui/task/tasklistmodel.h b/src/ui/task/tasklistmodel.h index 4ad37e7b..96dbb8fb 100644 --- a/src/ui/task/tasklistmodel.h +++ b/src/ui/task/tasklistmodel.h @@ -3,7 +3,8 @@ #include -#include "../util/model/tableitemmodel.h" +#include + #include "taskeditinfo.h" class TaskInfo; diff --git a/src/ui/task/taskmanager.cpp b/src/ui/task/taskmanager.cpp index 97c2450e..cfa0470b 100644 --- a/src/ui/task/taskmanager.cpp +++ b/src/ui/task/taskmanager.cpp @@ -1,9 +1,10 @@ #include "taskmanager.h" -#include "../conf/confmanager.h" -#include "../model/zonelistmodel.h" -#include "../util/dateutil.h" -#include "../util/ioc/ioccontainer.h" +#include +#include +#include +#include + #include "taskinfoupdatechecker.h" #include "taskinfozonedownloader.h" diff --git a/src/ui/task/taskmanager.h b/src/ui/task/taskmanager.h index 71786d4c..343c8082 100644 --- a/src/ui/task/taskmanager.h +++ b/src/ui/task/taskmanager.h @@ -5,7 +5,7 @@ #include #include -#include "../util/ioc/iocservice.h" +#include class TaskInfo; class TaskInfoUpdateChecker; diff --git a/src/ui/task/taskupdatechecker.cpp b/src/ui/task/taskupdatechecker.cpp index 1229f5da..a328ec75 100644 --- a/src/ui/task/taskupdatechecker.cpp +++ b/src/ui/task/taskupdatechecker.cpp @@ -6,9 +6,9 @@ #include -#include "../util/net/netdownloader.h" -#include "../util/net/netutil.h" -#include "../util/json/jsonutil.h" +#include +#include +#include TaskUpdateChecker::TaskUpdateChecker(QObject *parent) : TaskDownloader(parent) { } diff --git a/src/ui/task/taskzonedownloader.cpp b/src/ui/task/taskzonedownloader.cpp index 750a4cfe..5113e3e9 100644 --- a/src/ui/task/taskzonedownloader.cpp +++ b/src/ui/task/taskzonedownloader.cpp @@ -5,11 +5,11 @@ #include #include -#include "../util/conf/confutil.h" -#include "../util/fileutil.h" -#include "../util/net/ip4range.h" -#include "../util/net/netdownloader.h" -#include "../util/stringutil.h" +#include +#include +#include +#include +#include TaskZoneDownloader::TaskZoneDownloader(QObject *parent) : TaskDownloader(parent), m_zoneEnabled(false), m_sort(false) diff --git a/src/ui/task/taskzonedownloader.h b/src/ui/task/taskzonedownloader.h index c1ea90cb..9a7733e4 100644 --- a/src/ui/task/taskzonedownloader.h +++ b/src/ui/task/taskzonedownloader.h @@ -3,7 +3,8 @@ #include -#include "../fortcompat.h" +#include + #include "taskdownloader.h" class TaskZoneDownloader : public TaskDownloader diff --git a/src/ui/user/iniuser.h b/src/ui/user/iniuser.h index 6e146dcc..e0574131 100644 --- a/src/ui/user/iniuser.h +++ b/src/ui/user/iniuser.h @@ -1,7 +1,7 @@ #ifndef INIUSER_H #define INIUSER_H -#include "../util/ini/mapsettings.h" +#include class IniUser : public MapSettings { diff --git a/src/ui/user/usersettings.cpp b/src/ui/user/usersettings.cpp index c69be33b..8dc1c442 100644 --- a/src/ui/user/usersettings.cpp +++ b/src/ui/user/usersettings.cpp @@ -2,8 +2,8 @@ #include -#include "../fortsettings.h" -#include "../util/ioc/ioccontainer.h" +#include +#include UserSettings::UserSettings(QObject *parent) : Settings(parent), m_iniUser(this) { } diff --git a/src/ui/user/usersettings.h b/src/ui/user/usersettings.h index fdebc6af..c45b7fa5 100644 --- a/src/ui/user/usersettings.h +++ b/src/ui/user/usersettings.h @@ -1,8 +1,9 @@ #ifndef USERSETTINGS_H #define USERSETTINGS_H -#include "../util/ini/settings.h" -#include "../util/ioc/iocservice.h" +#include +#include + #include "iniuser.h" class UserSettings : public Settings, public IocService diff --git a/src/ui/util/conf/addressrange.h b/src/ui/util/conf/addressrange.h index ab35f4e4..a87beb8a 100644 --- a/src/ui/util/conf/addressrange.h +++ b/src/ui/util/conf/addressrange.h @@ -4,7 +4,7 @@ #include #include -#include "../net/ip4range.h" +#include class AddressRange { diff --git a/src/ui/util/conf/confutil.cpp b/src/ui/util/conf/confutil.cpp index 7db789bd..642d15ce 100644 --- a/src/ui/util/conf/confutil.cpp +++ b/src/ui/util/conf/confutil.cpp @@ -5,15 +5,16 @@ #include #include -#include "../../conf/addressgroup.h" -#include "../../conf/appgroup.h" -#include "../../conf/firewallconf.h" -#include "../../driver/drivercommon.h" -#include "../../manager/envmanager.h" -#include "../dateutil.h" -#include "../fileutil.h" -#include "../net/ip4range.h" -#include "../stringutil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "confappswalker.h" #define APP_GROUP_MAX FORT_CONF_GROUP_MAX diff --git a/src/ui/util/dateutil.cpp b/src/ui/util/dateutil.cpp index 8de91ea3..7bd21d53 100644 --- a/src/ui/util/dateutil.cpp +++ b/src/ui/util/dateutil.cpp @@ -2,7 +2,7 @@ #include -#include "../fortcompat.h" +#include DateUtil::DateUtil(QObject *parent) : QObject(parent) { } diff --git a/src/ui/util/ini/mapsettings.h b/src/ui/util/ini/mapsettings.h index 3fe90097..94aec9c2 100644 --- a/src/ui/util/ini/mapsettings.h +++ b/src/ui/util/ini/mapsettings.h @@ -3,7 +3,7 @@ #include -#include "../json/mapwrapper.h" +#include class Settings; diff --git a/src/ui/util/ini/settings.cpp b/src/ui/util/ini/settings.cpp index 41c11ef6..95855444 100644 --- a/src/ui/util/ini/settings.cpp +++ b/src/ui/util/ini/settings.cpp @@ -2,7 +2,7 @@ #include -#include "../fileutil.h" +#include Settings::Settings(QObject *parent) : QObject(parent), m_iniExists(false) { } diff --git a/src/ui/util/net/ip4range.cpp b/src/ui/util/net/ip4range.cpp index 9958557a..fe712eeb 100644 --- a/src/ui/util/net/ip4range.cpp +++ b/src/ui/util/net/ip4range.cpp @@ -3,7 +3,8 @@ #include #include -#include "../stringutil.h" +#include + #include "netutil.h" Ip4Range::Ip4Range(QObject *parent) : QObject(parent) { } diff --git a/src/ui/util/net/ip4range.h b/src/ui/util/net/ip4range.h index 05cfc871..bb864160 100644 --- a/src/ui/util/net/ip4range.h +++ b/src/ui/util/net/ip4range.h @@ -5,7 +5,7 @@ #include #include -#include "../../fortcompat.h" +#include using Ip4Pair = struct { diff --git a/src/ui/util/regkey.h b/src/ui/util/regkey.h index 889cdf29..a6b8ca0b 100644 --- a/src/ui/util/regkey.h +++ b/src/ui/util/regkey.h @@ -4,7 +4,7 @@ #include #include -#include "../util/classhelpers.h" +#include class RegKey { diff --git a/src/ui/util/stringutil.h b/src/ui/util/stringutil.h index b6218920..769487ce 100644 --- a/src/ui/util/stringutil.h +++ b/src/ui/util/stringutil.h @@ -3,7 +3,7 @@ #include -#include "../fortcompat.h" +#include class StringUtil { diff --git a/src/ui/util/worker/workerjob.h b/src/ui/util/worker/workerjob.h index 5bf6a476..56b38974 100644 --- a/src/ui/util/worker/workerjob.h +++ b/src/ui/util/worker/workerjob.h @@ -3,7 +3,7 @@ #include -#include "../classhelpers.h" +#include class WorkerJob { diff --git a/src/ui/util/worker/workermanager.h b/src/ui/util/worker/workermanager.h index 59fb2cc3..8214fdf5 100644 --- a/src/ui/util/worker/workermanager.h +++ b/src/ui/util/worker/workermanager.h @@ -8,7 +8,7 @@ #include #include -#include "../classhelpers.h" +#include class WorkerJob; class WorkerObject; diff --git a/src/ui_bin/main.cpp b/src/ui_bin/main.cpp index 2a1c1736..c22c6e61 100644 --- a/src/ui_bin/main.cpp +++ b/src/ui_bin/main.cpp @@ -7,15 +7,15 @@ #include #include -#include "control/controlmanager.h" -#include "driver/drivercommon.h" -#include "fortmanager.h" -#include "fortsettings.h" -#include "manager/envmanager.h" -#include "util/fileutil.h" -#include "util/ioc/ioccontainer.h" -#include "util/serviceworker.h" -#include "util/startuputil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace {