Refactor #include-s

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");

src/ui/3rdparty/sqlite/sqlitedb.h

@@ -5,7 +5,7 @@
 #include <QString>
 #include <QVariant>
 
-#include "../../util/classhelpers.h"
+#include <util/classhelpers.h>
 
 struct sqlite3;
 

src/ui/3rdparty/sqlite/sqlitestmt.h

@@ -5,7 +5,7 @@
 #include <QString>
 #include <QVariant>
 
-#include "../../util/classhelpers.h"
+#include <util/classhelpers.h>
 
 struct sqlite3_stmt;
 

src/ui/appinfo/appinfocache.cpp

@@ -3,8 +3,9 @@
 #include <QIcon>
 #include <QImage>
 
-#include "../util/iconcache.h"
-#include "../util/ioc/ioccontainer.h"
+#include <util/iconcache.h>
+#include <util/ioc/ioccontainer.h>
+
 #include "appinfomanager.h"
 
 AppInfoCache::AppInfoCache(QObject *parent) : QObject(parent), m_cache(1000)

src/ui/appinfo/appinfocache.h

@@ -4,8 +4,9 @@
 #include <QCache>
 #include <QObject>
 
-#include "../util/ioc/iocservice.h"
-#include "../util/triggertimer.h"
+#include <util/ioc/iocservice.h>
+#include <util/triggertimer.h>
+
 #include "appinfo.h"
 
 class AppInfoCache : public QObject, public IocService

src/ui/appinfo/appinfojob.h

@@ -1,7 +1,8 @@
 #ifndef APPINFOJOB_H
 #define APPINFOJOB_H
 
-#include "../util/worker/workerjob.h"
+#include <util/worker/workerjob.h>
+
 #include "appinfo.h"
 
 class AppInfoJob : public WorkerJob

src/ui/appinfo/appinfomanager.h

@@ -3,9 +3,10 @@
 
 #include <QMutex>
 
-#include "../util/classhelpers.h"
-#include "../util/ioc/iocservice.h"
-#include "../util/worker/workermanager.h"
+#include <util/classhelpers.h>
+#include <util/ioc/iocservice.h>
+#include <util/worker/workermanager.h>
+
 #include "appinfo.h"
 
 class SqliteDb;

src/ui/appinfo/appinfoutil.cpp

@@ -9,8 +9,9 @@
 #include <objbase.h>
 #include <shellapi.h>
 
-#include "../util/fileutil.h"
-#include "../util/osutil.h"
+#include <util/fileutil.h>
+#include <util/osutil.h>
+
 #include "appinfo.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

src/ui/appinfo/appinfoworker.h

@@ -1,7 +1,7 @@
 #ifndef APPINFOWORKER_H
 #define APPINFOWORKER_H
 
-#include "../util/worker/workerobject.h"
+#include <util/worker/workerobject.h>
 
 class AppInfo;
 class AppInfoManager;

src/ui/conf/appgroup.cpp

@@ -1,7 +1,7 @@
 #include "appgroup.h"
 
-#include "../util/dateutil.h"
-#include "../util/net/netutil.h"
+#include <util/dateutil.h>
+#include <util/net/netutil.h>
 
 AppGroup::AppGroup(QObject *parent) :
     QObject(parent),

src/ui/conf/confmanager.cpp

@@ -5,24 +5,25 @@
 #include <sqlite/sqlitedb.h>
 #include <sqlite/sqlitestmt.h>
 
-#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 <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 "addressgroup.h"
 #include "appgroup.h"
 #include "firewallconf.h"

src/ui/conf/confmanager.h

@@ -4,10 +4,10 @@
 #include <QObject>
 #include <QTimer>
 
-#include "../util/classhelpers.h"
-#include "../util/conf/confappswalker.h"
-#include "../util/ioc/iocservice.h"
-#include "../util/triggertimer.h"
+#include <util/classhelpers.h>
+#include <util/conf/confappswalker.h>
+#include <util/ioc/iocservice.h>
+#include <util/triggertimer.h>
 
 class FirewallConf;
 class IniOptions;

src/ui/conf/firewallconf.cpp

@@ -1,7 +1,8 @@
 #include "firewallconf.h"
 
-#include "../util/fileutil.h"
-#include "../util/net/netutil.h"
+#include <util/fileutil.h>
+#include <util/net/netutil.h>
+
 #include "addressgroup.h"
 #include "appgroup.h"
 

src/ui/conf/inioptions.h

@@ -1,7 +1,7 @@
 #ifndef INIOPTIONS_H
 #define INIOPTIONS_H
 
-#include "../util/ini/mapsettings.h"
+#include <util/ini/mapsettings.h>
 
 #define DEFAULT_APP_GROUP_BITS         0xFFFF
 #define DEFAULT_MONTH_START            1

src/ui/control/controlmanager.cpp

@@ -7,15 +7,16 @@
 
 #include <fort_version.h>
 
-#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 <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 "controlworker.h"
 
 Q_DECLARE_LOGGING_CATEGORY(CLOG_CONTROL_MANAGER)

src/ui/control/controlmanager.h

@@ -4,8 +4,9 @@
 #include <QObject>
 #include <QVariant>
 
-#include "../util/classhelpers.h"
-#include "../util/ioc/iocservice.h"
+#include <util/classhelpers.h>
+#include <util/ioc/iocservice.h>
+
 #include "control.h"
 
 QT_FORWARD_DECLARE_CLASS(QLocalServer)

src/ui/driver/drivermanager.cpp

@@ -3,11 +3,12 @@
 #include <QProcess>
 #include <QThreadPool>
 
-#include "../conf/firewallconf.h"
-#include "../driver/drivercommon.h"
-#include "../util/device.h"
-#include "../util/fileutil.h"
-#include "../util/osutil.h"
+#include <conf/firewallconf.h>
+#include <driver/drivercommon.h>
+#include <util/device.h>
+#include <util/fileutil.h>
+#include <util/osutil.h>
+
 #include "driverworker.h"
 
 DriverManager::DriverManager(QObject *parent, bool useDevice) : QObject(parent)

src/ui/driver/drivermanager.h

@@ -3,8 +3,8 @@
 
 #include <QObject>
 
-#include "../util/classhelpers.h"
-#include "../util/ioc/iocservice.h"
+#include <util/classhelpers.h>
+#include <util/ioc/iocservice.h>
 
 class Device;
 class DriverWorker;

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 <driver/drivercommon.h>
+#include <log/logbuffer.h>
+#include <util/device.h>
+#include <util/osutil.h>
 
 DriverWorker::DriverWorker(Device *device, QObject *parent) : QObject(parent), m_device(device) { }
 

src/ui/form/controls/appinforow.cpp

@@ -5,9 +5,10 @@
 #include <QLineEdit>
 #include <QPushButton>
 
-#include "../../appinfo/appinfocache.h"
-#include "../../appinfo/appinfoutil.h"
-#include "../../util/guiutil.h"
+#include <appinfo/appinfocache.h>
+#include <appinfo/appinfoutil.h>
+#include <util/guiutil.h>
+
 #include "controlutil.h"
 
 AppInfoRow::AppInfoRow(QWidget *parent) : QWidget(parent)

src/ui/form/controls/controlutil.cpp

@@ -11,7 +11,7 @@
 #include <QToolButton>
 #include <QWidgetAction>
 
-#include "../../util/iconcache.h"
+#include <util/iconcache.h>
 
 QCheckBox *ControlUtil::createCheckBox(
         bool checked, const std::function<void(bool checked)> &onToggled)

src/ui/form/controls/labelcolor.cpp

@@ -4,7 +4,8 @@
 #include <QLabel>
 #include <QPushButton>
 
-#include "../dialog/dialogutil.h"
+#include <form/dialog/dialogutil.h>
+
 #include "controlutil.h"
 
 LabelColor::LabelColor(QWidget *parent) : QWidget(parent)

src/ui/form/controls/textarea2splitterhandle.cpp

@@ -6,8 +6,9 @@
 #include <QPushButton>
 #include <QStyleOption>
 
-#include "../../util/textareautil.h"
-#include "../controls/controlutil.h"
+#include <form/controls/controlutil.h>
+#include <util/textareautil.h>
+
 #include "textarea2splitter.h"
 
 TextArea2SplitterHandle::TextArea2SplitterHandle(Qt::Orientation o, QSplitter *parent) :

src/ui/form/dialog/passworddialog.cpp

@@ -7,9 +7,9 @@
 #include <QLineEdit>
 #include <QPushButton>
 
-#include "../../manager/windowmanager.h"
-#include "../../util/guiutil.h"
-#include "../controls/controlutil.h"
+#include <form/controls/controlutil.h>
+#include <manager/windowmanager.h>
+#include <util/guiutil.h>
 
 PasswordDialog::PasswordDialog(QWidget *parent) : QDialog(parent)
 {

src/ui/form/graph/axistickerspeed.cpp

@@ -1,6 +1,6 @@
 #include "axistickerspeed.h"
 
-#include "../../util/net/netutil.h"
+#include <util/net/netutil.h>
 
 double AxisTickerSpeed::getTickStep(const QCPRange &range)
 {

src/ui/form/graph/graphwindow.cpp

@@ -4,14 +4,15 @@
 #include <QScreen>
 #include <QVBoxLayout>
 
-#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 <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 "axistickerspeed.h"
 #include "graphplot.h"
 

src/ui/form/graph/graphwindow.h

@@ -3,7 +3,7 @@
 
 #include <QTimer>
 
-#include "../../util/window/widgetwindow.h"
+#include <util/window/widgetwindow.h>
 
 class ConfManager;
 class FirewallConf;

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 <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>
 
 OptionsController::OptionsController(QObject *parent) : QObject(parent)
 {

src/ui/form/opt/optionswindow.cpp

@@ -3,12 +3,13 @@
 #include <QKeyEvent>
 #include <QVBoxLayout>
 
-#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 <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 "optionscontroller.h"
 #include "pages/optmainpage.h"
 

src/ui/form/opt/optionswindow.h

@@ -1,7 +1,7 @@
 #ifndef OPTIONSWINDOW_H
 #define OPTIONSWINDOW_H
 
-#include "../../util/window/widgetwindow.h"
+#include <util/window/widgetwindow.h>
 
 class ConfManager;
 class FirewallConf;

src/ui/form/opt/pages/addresses/addressescolumn.cpp

@@ -6,8 +6,8 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "../../../controls/controlutil.h"
-#include "../../../controls/plaintextedit.h"
+#include <form/controls/controlutil.h>
+#include <form/controls/plaintextedit.h>
 
 AddressesColumn::AddressesColumn(QWidget *parent) : QWidget(parent)
 {

src/ui/form/opt/pages/addressespage.cpp

@@ -10,22 +10,23 @@
 #include <QTabBar>
 #include <QVBoxLayout>
 
-#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 <conf/addressgroup.h>
+#include <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <driver/drivercommon.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/plaintextedit.h>
+#include <form/controls/textarea2splitter.h>
+#include <form/controls/textarea2splitterhandle.h>
+#include <form/opt/optionscontroller.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 "addresses/addressescolumn.h"
 
 AddressesPage::AddressesPage(OptionsController *ctrl, QWidget *parent) : OptBasePage(ctrl, parent)

src/ui/form/opt/pages/applicationspage.cpp

@@ -11,22 +11,23 @@
 #include <QTimeEdit>
 #include <QVBoxLayout>
 
-#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 <conf/appgroup.h>
+#include <conf/firewallconf.h>
+#include <form/controls/checkspincombo.h>
+#include <form/controls/checktimeperiod.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/plaintextedit.h>
+#include <form/controls/tabbar.h>
+#include <form/controls/textarea2splitter.h>
+#include <form/controls/textarea2splitterhandle.h>
+#include <form/dialog/dialogutil.h>
+#include <form/opt/optionscontroller.h>
+#include <fortsettings.h>
+#include <user/iniuser.h>
+#include <util/iconcache.h>
+#include <util/net/netutil.h>
+#include <util/textareautil.h>
+
 #include "apps/appscolumn.h"
 
 namespace {

src/ui/form/opt/pages/apps/appscolumn.cpp

@@ -3,8 +3,8 @@
 #include <QLabel>
 #include <QVBoxLayout>
 
-#include "../../../controls/controlutil.h"
-#include "../../../controls/plaintextedit.h"
+#include <form/controls/controlutil.h>
+#include <form/controls/plaintextedit.h>
 
 AppsColumn::AppsColumn(QWidget *parent) : QWidget(parent)
 {

src/ui/form/opt/pages/optbasepage.cpp

@@ -2,11 +2,11 @@
 
 #include <QAbstractButton>
 
-#include "../../../conf/firewallconf.h"
-#include "../../../fortmanager.h"
-#include "../../../user/iniuser.h"
-#include "../../../util/osutil.h"
-#include "../optionscontroller.h"
+#include <conf/firewallconf.h>
+#include <form/opt/optionscontroller.h>
+#include <fortmanager.h>
+#include <user/iniuser.h>
+#include <util/osutil.h>
 
 OptBasePage::OptBasePage(OptionsController *ctrl, QWidget *parent) : QFrame(parent), m_ctrl(ctrl)
 {

src/ui/form/opt/pages/optionspage.cpp

@@ -12,22 +12,22 @@
 #include <QStandardItemModel>
 #include <QVBoxLayout>
 
-#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 <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <driver/drivermanager.h>
+#include <form/controls/controlutil.h>
+#include <form/dialog/passworddialog.h>
+#include <form/opt/optionscontroller.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>
 
 namespace {
 

src/ui/form/opt/pages/optmainpage.cpp

@@ -9,10 +9,11 @@
 
 #include <fort_version.h>
 
-#include "../../../fortsettings.h"
-#include "../../../util/iconcache.h"
-#include "../../controls/controlutil.h"
-#include "../optionscontroller.h"
+#include <form/controls/controlutil.h>
+#include <form/opt/optionscontroller.h>
+#include <fortsettings.h>
+#include <util/iconcache.h>
+
 #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);
 

src/ui/form/opt/pages/schedulepage.cpp

@@ -9,14 +9,14 @@
 #include <QTableView>
 #include <QVBoxLayout>
 
-#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 <conf/firewallconf.h>
+#include <form/controls/checkspincombo.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/tableview.h>
+#include <form/opt/optionscontroller.h>
+#include <task/taskinfo.h>
+#include <task/tasklistmodel.h>
+#include <task/taskmanager.h>
 
 namespace {
 

src/ui/form/opt/pages/servicespage.cpp

@@ -6,15 +6,15 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#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 <conf/firewallconf.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/tableview.h>
+#include <form/opt/optionscontroller.h>
+#include <model/servicelistmodel.h>
+#include <serviceinfo/serviceinfomanager.h>
+#include <user/iniuser.h>
+#include <util/iconcache.h>
+#include <util/ioc/ioccontainer.h>
 
 ServicesPage::ServicesPage(OptionsController *ctrl, QWidget *parent) :
     OptBasePage(ctrl, parent), m_serviceListModel(new ServiceListModel(this))

src/ui/form/opt/pages/statisticspage.cpp

@@ -8,15 +8,15 @@
 #include <QTimeEdit>
 #include <QVBoxLayout>
 
-#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 <conf/firewallconf.h>
+#include <form/controls/checktimeperiod.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/labelcolor.h>
+#include <form/controls/labelspin.h>
+#include <form/controls/labelspincombo.h>
+#include <form/opt/optionscontroller.h>
+#include <util/iconcache.h>
+#include <util/net/netutil.h>
 
 namespace {
 

src/ui/form/prog/programeditdialog.cpp

@@ -11,16 +11,17 @@
 #include <QRadioButton>
 #include <QSpinBox>
 
-#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 <appinfo/appinfocache.h>
+#include <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <form/controls/checkspincombo.h>
+#include <form/controls/controlutil.h>
+#include <form/dialog/dialogutil.h>
+#include <fortmanager.h>
+#include <manager/windowmanager.h>
+#include <util/iconcache.h>
+#include <util/ioc/ioccontainer.h>
+
 #include "programscontroller.h"
 
 namespace {

src/ui/form/prog/programeditdialog.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 
-#include "../../model/applistmodel.h"
+#include <model/applistmodel.h>
 
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
 QT_FORWARD_DECLARE_CLASS(QComboBox)

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 <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>
 
 ProgramsController::ProgramsController(QObject *parent) :
     QObject(parent), m_appListModel(new AppListModel(this))

src/ui/form/prog/programswindow.cpp

@@ -6,19 +6,20 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#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 <appinfo/appinfocache.h>
+#include <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <form/controls/appinforow.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/tableview.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 "programeditdialog.h"
 #include "programscontroller.h"
 

src/ui/form/prog/programswindow.h

@@ -1,7 +1,7 @@
 #ifndef PROGRAMSWINDOW_H
 #define PROGRAMSWINDOW_H
 
-#include "../../util/window/widgetwindow.h"
+#include <util/window/widgetwindow.h>
 
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
 QT_FORWARD_DECLARE_CLASS(QPushButton)

src/ui/form/stat/pages/connectionspage.cpp

@@ -6,19 +6,19 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#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 <appinfo/appinfocache.h>
+#include <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <form/controls/appinforow.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/tableview.h>
+#include <form/stat/statisticscontroller.h>
+#include <fortsettings.h>
+#include <manager/windowmanager.h>
+#include <model/connlistmodel.h>
+#include <user/iniuser.h>
+#include <util/guiutil.h>
+#include <util/iconcache.h>
 
 namespace {
 

src/ui/form/stat/pages/statbasepage.cpp

@@ -2,10 +2,10 @@
 
 #include <QAbstractButton>
 
-#include "../../../conf/firewallconf.h"
-#include "../../../fortmanager.h"
-#include "../../../user/iniuser.h"
-#include "../statisticscontroller.h"
+#include <conf/firewallconf.h>
+#include <form/stat/statisticscontroller.h>
+#include <fortmanager.h>
+#include <user/iniuser.h>
 
 StatBasePage::StatBasePage(StatisticsController *ctrl, QWidget *parent) :
     QFrame(parent), m_ctrl(ctrl)

src/ui/form/stat/pages/statmainpage.cpp

@@ -5,10 +5,11 @@
 #include <QTabWidget>
 #include <QVBoxLayout>
 
-#include "../../../fortsettings.h"
-#include "../../../util/iconcache.h"
-#include "../../controls/controlutil.h"
-#include "../statisticscontroller.h"
+#include <form/controls/controlutil.h>
+#include <form/stat/statisticscontroller.h>
+#include <fortsettings.h>
+#include <util/iconcache.h>
+
 #include "connectionspage.h"
 #include "trafficpage.h"
 

src/ui/form/stat/pages/trafficpage.cpp

@@ -13,17 +13,17 @@
 #include <QTimeEdit>
 #include <QVBoxLayout>
 
-#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 <appinfo/appinfocache.h>
+#include <conf/confmanager.h>
+#include <form/controls/appinforow.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/listview.h>
+#include <form/stat/statisticscontroller.h>
+#include <manager/windowmanager.h>
+#include <model/appstatmodel.h>
+#include <model/traflistmodel.h>
+#include <user/iniuser.h>
+#include <util/iconcache.h>
 
 TrafficPage::TrafficPage(StatisticsController *ctrl, QWidget *parent) :
     StatBasePage(ctrl, parent),

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 <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <fortmanager.h>
+#include <manager/translationmanager.h>
+#include <manager/windowmanager.h>
+#include <util/ioc/ioccontainer.h>
 
 StatisticsController::StatisticsController(QObject *parent) : QObject(parent)
 {

src/ui/form/stat/statisticswindow.cpp

@@ -2,11 +2,12 @@
 
 #include <QVBoxLayout>
 
-#include "../../conf/confmanager.h"
-#include "../../manager/windowmanager.h"
-#include "../../user/iniuser.h"
-#include "../../util/guiutil.h"
-#include "../../util/window/widgetwindowstatewatcher.h"
+#include <conf/confmanager.h>
+#include <manager/windowmanager.h>
+#include <user/iniuser.h>
+#include <util/guiutil.h>
+#include <util/window/widgetwindowstatewatcher.h>
+
 #include "pages/statmainpage.h"
 #include "statisticscontroller.h"
 

src/ui/form/stat/statisticswindow.h

@@ -1,7 +1,7 @@
 #ifndef STATISTICSWINDOW_H
 #define STATISTICSWINDOW_H
 
-#include "../../util/window/widgetwindow.h"
+#include <util/window/widgetwindow.h>
 
 class ConfManager;
 class IniUser;

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 <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>
 
 TrayController::TrayController(QObject *parent) : QObject(parent)
 {

src/ui/form/tray/trayicon.cpp

@@ -4,17 +4,18 @@
 #include <QMenu>
 #include <QTimer>
 
-#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 <conf/addressgroup.h>
+#include <conf/appgroup.h>
+#include <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <form/controls/mainwindow.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 "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);
 }

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 <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>
 
 ZonesController::ZonesController(QObject *parent) : QObject(parent)
 {

src/ui/form/zone/zoneswindow.cpp

@@ -11,22 +11,23 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#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 <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <form/controls/controlutil.h>
+#include <form/controls/tableview.h>
+#include <form/dialog/dialogutil.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 "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);

src/ui/form/zone/zoneswindow.h

@@ -1,7 +1,7 @@
 #ifndef ZONESWINDOW_H
 #define ZONESWINDOW_H
 
-#include "../../util/window/widgetwindow.h"
+#include <util/window/widgetwindow.h>
 
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
 QT_FORWARD_DECLARE_CLASS(QComboBox)

src/ui/fortmanager.cpp

@@ -8,35 +8,35 @@
 
 #include <fort_version.h>
 
-#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 <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>
 
 FortManager::FortManager(QObject *parent) : QObject(parent), m_initialized(false) { }
 

src/ui/fortmanager.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include "util/classhelpers.h"
+#include <util/classhelpers.h>
 
 class FirewallConf;
 

src/ui/fortsettings.cpp

@@ -5,13 +5,13 @@
 
 #include <fort_version.h>
 
-#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 <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>
 
 namespace {
 

src/ui/fortsettings.h

@@ -1,7 +1,7 @@
 #ifndef FORTSETTINGS_H
 #define FORTSETTINGS_H
 
-#include "util/ini/settings.h"
+#include <util/ini/settings.h>
 
 class EnvManager;
 class FirewallConf;

src/ui/hostinfo/hostinfocache.h

@@ -4,8 +4,9 @@
 #include <QCache>
 #include <QObject>
 
-#include "../util/ioc/iocservice.h"
-#include "../util/triggertimer.h"
+#include <util/ioc/iocservice.h>
+#include <util/triggertimer.h>
+
 #include "hostinfo.h"
 
 class HostInfoManager;

src/ui/hostinfo/hostinfojob.cpp

@@ -1,6 +1,6 @@
 #include "hostinfojob.h"
 
-#include "../util/net/netutil.h"
+#include <util/net/netutil.h>
 
 HostInfoJob::HostInfoJob(const QString &address) : WorkerJob(address) { }
 

src/ui/hostinfo/hostinfojob.h

@@ -1,7 +1,7 @@
 #ifndef HOSTINFOJOB_H
 #define HOSTINFOJOB_H
 
-#include "../util/worker/workerjob.h"
+#include <util/worker/workerjob.h>
 
 class HostInfoJob : public WorkerJob
 {

src/ui/hostinfo/hostinfomanager.h

@@ -1,7 +1,7 @@
 #ifndef HOSTINFOMANAGER_H
 #define HOSTINFOMANAGER_H
 
-#include "../util/worker/workermanager.h"
+#include <util/worker/workermanager.h>
 
 class HostInfoManager : public WorkerManager
 {

src/ui/log/logbuffer.cpp

@@ -1,6 +1,7 @@
 #include "logbuffer.h"
 
-#include "../driver/drivercommon.h"
+#include <driver/drivercommon.h>
+
 #include "logentryblocked.h"
 #include "logentryblockedip.h"
 #include "logentryprocnew.h"

src/ui/log/logentry.cpp

@@ -1,7 +1,7 @@
 #include "logentry.h"
 
-#include "../util/fileutil.h"
-#include "../util/osutil.h"
+#include <util/fileutil.h>
+#include <util/osutil.h>
 
 QString LogEntry::getAppPath(const QString &kernelPath, quint32 pid)
 {

src/ui/log/logentry.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include "../util/classhelpers.h"
+#include <util/classhelpers.h>
 
 class LogEntry
 {

src/ui/log/logmanager.cpp

@@ -2,14 +2,15 @@
 
 #include <QDebug>
 
-#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 <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 "logbuffer.h"
 #include "logentryblocked.h"
 #include "logentryblockedip.h"

src/ui/log/logmanager.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include "../util/ioc/iocservice.h"
+#include <util/ioc/iocservice.h>
 
 class LogBuffer;
 class LogEntry;

src/ui/manager/envmanager.cpp

@@ -3,7 +3,7 @@
 #include <QRegularExpression>
 #include <QSettings>
 
-#include "../util/fileutil.h"
+#include <util/fileutil.h>
 
 EnvManager::EnvManager(QObject *parent) : QObject(parent)
 {

src/ui/manager/hotkeymanager.cpp

@@ -3,8 +3,9 @@
 #include <QAction>
 #include <QKeySequence>
 
-#include "../util/ioc/ioccontainer.h"
-#include "../util/osutil.h"
+#include <util/ioc/ioccontainer.h>
+#include <util/osutil.h>
+
 #include "nativeeventfilter.h"
 
 HotKeyManager::HotKeyManager(QObject *parent) : QObject(parent) { }

src/ui/manager/hotkeymanager.h

@@ -4,7 +4,7 @@
 #include <QAction>
 #include <QList>
 
-#include "../util/ioc/iocservice.h"
+#include <util/ioc/iocservice.h>
 
 class NativeEventFilter;
 

src/ui/manager/logger.cpp

@@ -2,9 +2,9 @@
 
 #include <fort_version.h>
 
-#include "../util/dateutil.h"
-#include "../util/fileutil.h"
-#include "../util/osutil.h"
+#include <util/dateutil.h>
+#include <util/fileutil.h>
+#include <util/osutil.h>
 
 namespace {
 

src/ui/manager/nativeeventfilter.h

@@ -5,8 +5,8 @@
 #include <QHash>
 #include <QObject>
 
-#include "../util/classhelpers.h"
-#include "../util/ioc/iocservice.h"
+#include <util/classhelpers.h>
+#include <util/ioc/iocservice.h>
 
 class NativeEventFilter : public QObject, public QAbstractNativeEventFilter, public IocService
 {

src/ui/manager/translationmanager.cpp

@@ -4,8 +4,8 @@
 #include <QDir>
 #include <QTranslator>
 
-#include "util/fileutil.h"
-#include "util/stringutil.h"
+#include <util/fileutil.h>
+#include <util/stringutil.h>
 
 #define TRANSLATION_FILE_PREFIX "i18n_"
 #define TRANSLATION_FILE_SUFFIX ".qm"

src/ui/manager/translationmanager.h

@@ -6,8 +6,8 @@
 #include <QStringList>
 #include <QVector>
 
-#include "../util/classhelpers.h"
-#include "../util/ioc/iocservice.h"
+#include <util/classhelpers.h>
+#include <util/ioc/iocservice.h>
 
 QT_FORWARD_DECLARE_CLASS(QTranslator)
 

src/ui/manager/windowmanager.cpp

@@ -7,20 +7,21 @@
 #include <QStyle>
 #include <QStyleFactory>
 
-#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 <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 <util/ioc/ioccontainer.h>
+
 #include "nativeeventfilter.h"
-#include "util/ioc/ioccontainer.h"
 
 namespace {
 

src/ui/manager/windowmanager.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include "../util/ioc/iocservice.h"
+#include <util/ioc/iocservice.h>
 
 class GraphWindow;
 class MainWindow;

src/ui/model/applistmodel.cpp

@@ -6,16 +6,16 @@
 #include <sqlite/sqlitedb.h>
 #include <sqlite/sqlitestmt.h>
 
-#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 <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>
 
 namespace {
 

src/ui/model/applistmodel.h

@@ -3,7 +3,7 @@
 
 #include <QDateTime>
 
-#include "../util/model/tablesqlmodel.h"
+#include <util/model/tablesqlmodel.h>
 
 class AppGroup;
 class AppInfoCache;

src/ui/model/appstatmodel.cpp

@@ -2,13 +2,14 @@
 
 #include <QIcon>
 
-#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 <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 "traflistmodel.h"
 
 AppStatModel::AppStatModel(QObject *parent) : StringListModel(parent) { }

src/ui/model/appstatmodel.h

@@ -1,7 +1,7 @@
 #ifndef APPSTATMODEL_H
 #define APPSTATMODEL_H
 
-#include "../util/model/stringlistmodel.h"
+#include <util/model/stringlistmodel.h>
 
 class AppInfoCache;
 class StatManager;

src/ui/model/connlistmodel.cpp

@@ -6,14 +6,14 @@
 #include <sqlite/sqlitedb.h>
 #include <sqlite/sqlitestmt.h>
 
-#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 <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>
 
 ConnListModel::ConnListModel(QObject *parent) :
     TableSqlModel(parent), m_connMode(ConnNone), m_resolveAddress(false)

src/ui/model/connlistmodel.h

@@ -3,7 +3,7 @@
 
 #include <QDateTime>
 
-#include "../util/model/tablesqlmodel.h"
+#include <util/model/tablesqlmodel.h>
 
 class AppInfoCache;
 class FortManager;

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 <conf/appgroup.h>
+#include <conf/confmanager.h>
+#include <conf/firewallconf.h>
+#include <serviceinfo/serviceinfomanager.h>
+#include <util/ioc/ioccontainer.h>
 
 ServiceListModel::ServiceListModel(QObject *parent) : TableItemModel(parent) { }
 

src/ui/model/servicelistmodel.h

@@ -3,7 +3,7 @@
 
 #include <QVector>
 
-#include "../util/model/tableitemmodel.h"
+#include <util/model/tableitemmodel.h>
 
 class ConfManager;
 class FirewallConf;

src/ui/model/traflistmodel.cpp

@@ -2,11 +2,11 @@
 
 #include <QLocale>
 
-#include "../stat/statmanager.h"
-#include "../stat/statsql.h"
-#include "../util/dateutil.h"
-#include "../util/ioc/ioccontainer.h"
-#include "../util/net/netutil.h"
+#include <stat/statmanager.h>
+#include <stat/statsql.h>
+#include <util/dateutil.h>
+#include <util/ioc/ioccontainer.h>
+#include <util/net/netutil.h>
 
 namespace {
 

src/ui/model/traflistmodel.h

@@ -1,7 +1,7 @@
 #ifndef TRAFLISTMODEL_H
 #define TRAFLISTMODEL_H
 
-#include "../util/model/tableitemmodel.h"
+#include <util/model/tableitemmodel.h>
 
 class StatManager;
 

src/ui/model/zonelistmodel.cpp

@@ -6,11 +6,12 @@
 #include <sqlite/sqlitedb.h>
 #include <sqlite/sqlitestmt.h>
 
-#include "../conf/confmanager.h"
-#include "../util/conf/confutil.h"
-#include "../util/fileutil.h"
-#include "../util/ioc/ioccontainer.h"
-#include "../util/json/jsonutil.h"
+#include <conf/confmanager.h>
+#include <util/conf/confutil.h>
+#include <util/fileutil.h>
+#include <util/ioc/ioccontainer.h>
+#include <util/json/jsonutil.h>
+
 #include "zonesourcewrapper.h"
 #include "zonetypewrapper.h"
 

src/ui/model/zonelistmodel.h

@@ -3,8 +3,8 @@
 
 #include <QDateTime>
 
-#include "../util/ioc/iocservice.h"
-#include "../util/model/tablesqlmodel.h"
+#include <util/ioc/iocservice.h>
+#include <util/model/tablesqlmodel.h>
 
 class ConfManager;
 class SqliteDb;

src/ui/model/zonesourcewrapper.h

@@ -1,7 +1,7 @@
 #ifndef ZONESOURCEWRAPPER_H
 #define ZONESOURCEWRAPPER_H
 
-#include "../util/json/mapwrapper.h"
+#include <util/json/mapwrapper.h>
 
 class ZoneSourceWrapper : public MapWrapper
 {

src/ui/model/zonetypewrapper.h

@@ -1,7 +1,7 @@
 #ifndef ZONEWRAPPER_H
 #define ZONEWRAPPER_H
 
-#include "../util/json/mapwrapper.h"
+#include <util/json/mapwrapper.h>
 
 class ZoneTypeWrapper : public MapWrapper
 {

src/ui/rpc/appinfomanagerrpc.cpp

@@ -2,8 +2,8 @@
 
 #include <sqlite/sqlitedb.h>
 
-#include "../rpc/rpcmanager.h"
-#include "../util/ioc/ioccontainer.h"
+#include <rpc/rpcmanager.h>
+#include <util/ioc/ioccontainer.h>
 
 AppInfoManagerRpc::AppInfoManagerRpc(const QString &filePath, QObject *parent) :
     AppInfoManager(filePath, parent, SqliteDb::OpenDefaultReadOnly)

src/ui/rpc/appinfomanagerrpc.h

@@ -1,7 +1,7 @@
 #ifndef APPINFOMANAGERRPC_H
 #define APPINFOMANAGERRPC_H
 
-#include "../appinfo/appinfomanager.h"
+#include <appinfo/appinfomanager.h>
 
 class AppInfoManagerRpc : public AppInfoManager
 {

src/ui/rpc/confmanagerrpc.cpp

@@ -2,12 +2,12 @@
 
 #include <sqlite/sqlitedb.h>
 
-#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 <conf/firewallconf.h>
+#include <fortsettings.h>
+#include <manager/windowmanager.h>
+#include <rpc/rpcmanager.h>
+#include <task/taskmanager.h>
+#include <util/ioc/ioccontainer.h>
 
 ConfManagerRpc::ConfManagerRpc(const QString &filePath, QObject *parent) :
     ConfManager(filePath, parent, SqliteDb::OpenDefaultReadOnly)

src/ui/rpc/confmanagerrpc.h

@@ -1,7 +1,7 @@
 #ifndef CONFMANAGERRPC_H
 #define CONFMANAGERRPC_H
 
-#include "../conf/confmanager.h"
+#include <conf/confmanager.h>
 
 class RpcManager;
 class TaskManager;

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 <control/controlworker.h>
+#include <rpc/rpcmanager.h>
+#include <util/ioc/ioccontainer.h>
 
 DriverManagerRpc::DriverManagerRpc(QObject *parent) :
     DriverManager(parent, false), m_isDeviceOpened(false)

src/ui/rpc/drivermanagerrpc.h

@@ -1,7 +1,7 @@
 #ifndef DRIVERMANAGERRPC_H
 #define DRIVERMANAGERRPC_H
 
-#include "../driver/drivermanager.h"
+#include <driver/drivermanager.h>
 
 class DriverManagerRpc : public DriverManager
 {

src/ui/rpc/logmanagerrpc.h

@@ -1,7 +1,7 @@
 #ifndef LOGMANAGERRPC_H
 #define LOGMANAGERRPC_H
 
-#include "../log/logmanager.h"
+#include <log/logmanager.h>
 
 class LogManagerRpc : public LogManager
 {