From 975e86c895c73920c60b402facb58a4801f63e6d Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 25 Jan 2021 19:48:11 +0100 Subject: [PATCH] Allow backend libraries to be used from other projects So far the backend libraries' include paths were relative within this repository. This means the header files could not be used at their installed location. This change replaces them with "<>" includes to fix that problem and adds a new include directory so building everything at once still works. With this change it should be easier to actually split some parts into another repository if this one would become too big. --- CMakeLists.txt | 3 +++ cli/application.cpp | 4 ++-- cli/application.h | 4 ++-- fileitemactionplugin/syncthingdiractions.cpp | 6 ++--- fileitemactionplugin/syncthingdiractions.h | 2 +- .../syncthingfileitemaction.cpp | 2 +- .../syncthingfileitemactionstaticdata.cpp | 8 +++---- .../syncthingfileitemactionstaticdata.h | 2 +- fileitemactionplugin/syncthingmenuaction.cpp | 4 ++-- fileitemactionplugin/syncthingmenuaction.h | 2 +- include/syncthingconnector | 1 + include/syncthingmodel | 1 + include/syncthingwidgets | 1 + model/syncthingdevicemodel.cpp | 4 ++-- model/syncthingdirectorymodel.cpp | 4 ++-- model/syncthingdownloadmodel.cpp | 4 ++-- model/syncthingmodel.cpp | 2 +- model/syncthingrecentchangesmodel.cpp | 4 ++-- model/syncthingrecentchangesmodel.h | 4 ++-- model/syncthingstatuscomputionmodel.cpp | 2 +- model/syncthingstatusselectionmodel.cpp | 2 +- plasmoid/lib/settingsdialog.cpp | 2 +- plasmoid/lib/settingsdialog.h | 4 ++-- plasmoid/lib/syncthingapplet.cpp | 22 ++++++++--------- plasmoid/lib/syncthingapplet.h | 24 +++++++++---------- testhelper/syncthingtestinstance.h | 2 +- tray/application/main.cpp | 8 +++---- tray/gui/devbuttonsitemdelegate.cpp | 4 ++-- tray/gui/devview.cpp | 6 ++--- tray/gui/dirbuttonsitemdelegate.cpp | 2 +- tray/gui/dirview.cpp | 8 +++---- tray/gui/downloaditemdelegate.cpp | 2 +- tray/gui/downloadview.cpp | 4 ++-- tray/gui/trayicon.cpp | 16 ++++++------- tray/gui/trayicon.h | 2 +- tray/gui/traymenu.cpp | 2 +- tray/gui/traywidget.cpp | 18 +++++++------- tray/gui/traywidget.h | 20 ++++++++-------- widgets/misc/dbusstatusnotifier.cpp | 2 +- widgets/misc/direrrorsdialog.cpp | 6 ++--- widgets/misc/internalerror.cpp | 4 ++-- widgets/misc/otherdialogs.cpp | 4 ++-- widgets/misc/statusinfo.cpp | 8 +++---- widgets/misc/syncthingkiller.cpp | 2 +- widgets/misc/syncthinglauncher.h | 2 +- widgets/misc/textviewdialog.cpp | 4 ++-- widgets/settings/settings.cpp | 12 +++++----- widgets/settings/settings.h | 4 ++-- widgets/settings/settingsdialog.cpp | 16 ++++++------- widgets/settings/settingsdialog.h | 2 +- widgets/webview/webpage.cpp | 2 +- widgets/webview/webviewinterceptor.cpp | 2 +- 52 files changed, 144 insertions(+), 138 deletions(-) create mode 120000 include/syncthingconnector create mode 120000 include/syncthingmodel create mode 120000 include/syncthingwidgets diff --git a/CMakeLists.txt b/CMakeLists.txt index 08ac914..0e6f054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,9 @@ else() set(PLASMOID_DISABLED_BY_DEFAULT OFF) endif() +# set the include directory used when building so the headers of the different backend libraries can be found at build time +set(TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") + # add options for partial build option(NO_LIBSYNCTHING "whether building Syncthing itself as a library should be skipped" ON) option(NO_CLI "whether building CLI should be skipped" OFF) diff --git a/cli/application.cpp b/cli/application.cpp index f751f28..e3f21ea 100644 --- a/cli/application.cpp +++ b/cli/application.cpp @@ -4,8 +4,8 @@ #include "./jsdefs.h" #include "./jsincludes.h" -#include "../connector/syncthingconfig.h" -#include "../connector/utils.h" +#include +#include // use header-only functions waitForSignals() and signalInfo() from test utilities; disable assertions via macro #define SYNCTHINGTESTHELPER_FOR_CLI diff --git a/cli/application.h b/cli/application.h index ea96dbf..bcaed6f 100644 --- a/cli/application.h +++ b/cli/application.h @@ -3,8 +3,8 @@ #include "./args.h" -#include "../connector/syncthingconnection.h" -#include "../connector/syncthingconnectionsettings.h" +#include +#include #include diff --git a/fileitemactionplugin/syncthingdiractions.cpp b/fileitemactionplugin/syncthingdiractions.cpp index 47d1d9c..8e44a14 100644 --- a/fileitemactionplugin/syncthingdiractions.cpp +++ b/fileitemactionplugin/syncthingdiractions.cpp @@ -1,10 +1,10 @@ #include "./syncthingdiractions.h" #include "./syncthingfileitemactionstaticdata.h" -#include "../model/syncthingicons.h" +#include -#include "../connector/syncthingdir.h" -#include "../connector/utils.h" +#include +#include using namespace Data; diff --git a/fileitemactionplugin/syncthingdiractions.h b/fileitemactionplugin/syncthingdiractions.h index f976073..6232325 100644 --- a/fileitemactionplugin/syncthingdiractions.h +++ b/fileitemactionplugin/syncthingdiractions.h @@ -1,7 +1,7 @@ #ifndef SYNCTHINGDIRACTIONS_H #define SYNCTHINGDIRACTIONS_H -#include "../connector/syncthingdir.h" +#include #include "./syncthinginfoaction.h" diff --git a/fileitemactionplugin/syncthingfileitemaction.cpp b/fileitemactionplugin/syncthingfileitemaction.cpp index f6d9200..258486a 100644 --- a/fileitemactionplugin/syncthingfileitemaction.cpp +++ b/fileitemactionplugin/syncthingfileitemaction.cpp @@ -3,7 +3,7 @@ #include "./syncthinginfoaction.h" #include "./syncthingmenuaction.h" -#include "../model/syncthingicons.h" +#include #include #include diff --git a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp index 66f68b0..277cf0f 100644 --- a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp +++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp @@ -1,10 +1,10 @@ #include "./syncthingfileitemactionstaticdata.h" -#include "../model/syncthingicons.h" +#include -#include "../connector/syncthingconfig.h" -#include "../connector/syncthingconnection.h" -#include "../connector/syncthingconnectionsettings.h" +#include +#include +#include #include #include diff --git a/fileitemactionplugin/syncthingfileitemactionstaticdata.h b/fileitemactionplugin/syncthingfileitemactionstaticdata.h index b466a3f..f240450 100644 --- a/fileitemactionplugin/syncthingfileitemactionstaticdata.h +++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.h @@ -1,7 +1,7 @@ #ifndef SYNCTHINGFILEITEMACTIONSTATICDATA_H #define SYNCTHINGFILEITEMACTIONSTATICDATA_H -#include "../connector/syncthingconnection.h" +#include /*! * \brief The SyncthingFileItemActionStaticData class holds objects required during the whole application's live time. diff --git a/fileitemactionplugin/syncthingmenuaction.cpp b/fileitemactionplugin/syncthingmenuaction.cpp index de545d1..fcf4a02 100644 --- a/fileitemactionplugin/syncthingmenuaction.cpp +++ b/fileitemactionplugin/syncthingmenuaction.cpp @@ -1,9 +1,9 @@ #include "./syncthingmenuaction.h" #include "./syncthingfileitemaction.h" -#include "../model/syncthingicons.h" +#include -#include "../connector/syncthingconnection.h" +#include #ifdef CPP_UTILITIES_DEBUG_BUILD #include diff --git a/fileitemactionplugin/syncthingmenuaction.h b/fileitemactionplugin/syncthingmenuaction.h index d474561..4c8a88f 100644 --- a/fileitemactionplugin/syncthingmenuaction.h +++ b/fileitemactionplugin/syncthingmenuaction.h @@ -1,7 +1,7 @@ #ifndef SYNCTHINGMENUACTION_H #define SYNCTHINGMENUACTION_H -#include "../connector/syncthingnotifier.h" +#include #include diff --git a/include/syncthingconnector b/include/syncthingconnector new file mode 120000 index 0000000..005369a --- /dev/null +++ b/include/syncthingconnector @@ -0,0 +1 @@ +../connector \ No newline at end of file diff --git a/include/syncthingmodel b/include/syncthingmodel new file mode 120000 index 0000000..fe0e728 --- /dev/null +++ b/include/syncthingmodel @@ -0,0 +1 @@ +../model \ No newline at end of file diff --git a/include/syncthingwidgets b/include/syncthingwidgets new file mode 120000 index 0000000..7722edc --- /dev/null +++ b/include/syncthingwidgets @@ -0,0 +1 @@ +../widgets \ No newline at end of file diff --git a/model/syncthingdevicemodel.cpp b/model/syncthingdevicemodel.cpp index 2933894..f8c8733 100644 --- a/model/syncthingdevicemodel.cpp +++ b/model/syncthingdevicemodel.cpp @@ -2,8 +2,8 @@ #include "./colors.h" #include "./syncthingicons.h" -#include "../connector/syncthingconnection.h" -#include "../connector/utils.h" +#include +#include #include diff --git a/model/syncthingdirectorymodel.cpp b/model/syncthingdirectorymodel.cpp index 8c6ea5e..4610206 100644 --- a/model/syncthingdirectorymodel.cpp +++ b/model/syncthingdirectorymodel.cpp @@ -2,8 +2,8 @@ #include "./colors.h" #include "./syncthingicons.h" -#include "../connector/syncthingconnection.h" -#include "../connector/utils.h" +#include +#include #include diff --git a/model/syncthingdownloadmodel.cpp b/model/syncthingdownloadmodel.cpp index 202cb99..199b6c3 100644 --- a/model/syncthingdownloadmodel.cpp +++ b/model/syncthingdownloadmodel.cpp @@ -1,7 +1,7 @@ #include "./syncthingdownloadmodel.h" -#include "../connector/syncthingconnection.h" -#include "../connector/utils.h" +#include +#include #include diff --git a/model/syncthingmodel.cpp b/model/syncthingmodel.cpp index d7df68d..aa1f701 100644 --- a/model/syncthingmodel.cpp +++ b/model/syncthingmodel.cpp @@ -1,7 +1,7 @@ #include "./syncthingmodel.h" #include "./syncthingicons.h" -#include "../connector/syncthingconnection.h" +#include namespace Data { diff --git a/model/syncthingrecentchangesmodel.cpp b/model/syncthingrecentchangesmodel.cpp index f056657..9692739 100644 --- a/model/syncthingrecentchangesmodel.cpp +++ b/model/syncthingrecentchangesmodel.cpp @@ -2,8 +2,8 @@ #include "./colors.h" #include "./syncthingicons.h" -#include "../connector/syncthingconnection.h" -#include "../connector/utils.h" +#include +#include #include diff --git a/model/syncthingrecentchangesmodel.h b/model/syncthingrecentchangesmodel.h index 4b0bda8..2eb0355 100644 --- a/model/syncthingrecentchangesmodel.h +++ b/model/syncthingrecentchangesmodel.h @@ -3,8 +3,8 @@ #include "./syncthingmodel.h" -#include "../connector/syncthingconnectionstatus.h" -#include "../connector/syncthingdir.h" +#include +#include #include diff --git a/model/syncthingstatuscomputionmodel.cpp b/model/syncthingstatuscomputionmodel.cpp index 4dfb4a7..10f3713 100644 --- a/model/syncthingstatuscomputionmodel.cpp +++ b/model/syncthingstatuscomputionmodel.cpp @@ -1,6 +1,6 @@ #include "./syncthingstatuscomputionmodel.h" -#include "../connector/syncthingconnectionsettings.h" +#include #include diff --git a/model/syncthingstatusselectionmodel.cpp b/model/syncthingstatusselectionmodel.cpp index b252efd..82e2c60 100644 --- a/model/syncthingstatusselectionmodel.cpp +++ b/model/syncthingstatusselectionmodel.cpp @@ -1,6 +1,6 @@ #include "./syncthingstatusselectionmodel.h" -#include "../connector/syncthingconnection.h" +#include using namespace QtUtilities; diff --git a/plasmoid/lib/settingsdialog.cpp b/plasmoid/lib/settingsdialog.cpp index 191dfcb..637b247 100644 --- a/plasmoid/lib/settingsdialog.cpp +++ b/plasmoid/lib/settingsdialog.cpp @@ -3,7 +3,7 @@ #include "ui_appearanceoptionpage.h" -#include "../../widgets/settings/settingsdialog.h" +#include #include #include diff --git a/plasmoid/lib/settingsdialog.h b/plasmoid/lib/settingsdialog.h index 4811c8c..c3c8e26 100644 --- a/plasmoid/lib/settingsdialog.h +++ b/plasmoid/lib/settingsdialog.h @@ -1,9 +1,9 @@ #ifndef SETTINGSDIALOG_H #define SETTINGSDIALOG_H -#include "../../model/syncthingstatusselectionmodel.h" +#include -#include "../../widgets/settings/settingsdialog.h" +#include #include diff --git a/plasmoid/lib/syncthingapplet.cpp b/plasmoid/lib/syncthingapplet.cpp index 80917a9..aa94751 100644 --- a/plasmoid/lib/syncthingapplet.cpp +++ b/plasmoid/lib/syncthingapplet.cpp @@ -1,20 +1,20 @@ #include "./syncthingapplet.h" #include "./settingsdialog.h" -#include "../../connector/syncthingservice.h" -#include "../../connector/utils.h" +#include +#include -#include "../../widgets/misc/direrrorsdialog.h" -#include "../../widgets/misc/internalerrorsdialog.h" -#include "../../widgets/misc/otherdialogs.h" -#include "../../widgets/misc/textviewdialog.h" -#include "../../widgets/settings/settings.h" -#include "../../widgets/settings/settingsdialog.h" -#include "../../widgets/webview/webviewdialog.h" +#include +#include +#include +#include +#include +#include +#include -#include "../../model/syncthingicons.h" +#include -#include "../../connector/utils.h" +#include #include "resources/config.h" #include "resources/qtconfig.h" diff --git a/plasmoid/lib/syncthingapplet.h b/plasmoid/lib/syncthingapplet.h index 34ab20e..5e1b8f8 100644 --- a/plasmoid/lib/syncthingapplet.h +++ b/plasmoid/lib/syncthingapplet.h @@ -1,20 +1,20 @@ #ifndef SYNCTHINGAPPLET_H #define SYNCTHINGAPPLET_H -#include "../../widgets/misc/dbusstatusnotifier.h" -#include "../../widgets/misc/statusinfo.h" -#include "../../widgets/webview/webviewdefs.h" +#include +#include +#include -#include "../../model/syncthingdevicemodel.h" -#include "../../model/syncthingdirectorymodel.h" -#include "../../model/syncthingdownloadmodel.h" -#include "../../model/syncthingrecentchangesmodel.h" -#include "../../model/syncthingsortfiltermodel.h" -#include "../../model/syncthingstatusselectionmodel.h" +#include +#include +#include +#include +#include +#include -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingnotifier.h" -#include "../../connector/syncthingservice.h" +#include +#include +#include #include #include diff --git a/testhelper/syncthingtestinstance.h b/testhelper/syncthingtestinstance.h index ddfae6c..66c47ea 100644 --- a/testhelper/syncthingtestinstance.h +++ b/testhelper/syncthingtestinstance.h @@ -4,7 +4,7 @@ #include "./global.h" #include "./helper.h" -#include "../connector/syncthingprocess.h" +#include #include #include diff --git a/tray/application/main.cpp b/tray/application/main.cpp index 1c39430..7c256a4 100644 --- a/tray/application/main.cpp +++ b/tray/application/main.cpp @@ -3,12 +3,12 @@ #include "../gui/trayicon.h" #include "../gui/traywidget.h" -#include "../../widgets/misc/syncthinglauncher.h" -#include "../../widgets/settings/settings.h" +#include +#include -#include "../../connector/syncthingprocess.h" +#include #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD -#include "../../connector/syncthingservice.h" +#include #endif #include "resources/config.h" diff --git a/tray/gui/devbuttonsitemdelegate.cpp b/tray/gui/devbuttonsitemdelegate.cpp index 9bd8da2..471692c 100644 --- a/tray/gui/devbuttonsitemdelegate.cpp +++ b/tray/gui/devbuttonsitemdelegate.cpp @@ -1,7 +1,7 @@ #include "./devbuttonsitemdelegate.h" -#include "../../connector/syncthingconnection.h" -#include "../../model/syncthingdevicemodel.h" +#include +#include #include #include diff --git a/tray/gui/devview.cpp b/tray/gui/devview.cpp index d908078..d4daaa1 100644 --- a/tray/gui/devview.cpp +++ b/tray/gui/devview.cpp @@ -2,9 +2,9 @@ #include "./devbuttonsitemdelegate.h" #include "./helper.h" -#include "../../connector/syncthingdev.h" -#include "../../model/syncthingdevicemodel.h" -#include "../../model/syncthingsortfiltermodel.h" +#include +#include +#include #include #include diff --git a/tray/gui/dirbuttonsitemdelegate.cpp b/tray/gui/dirbuttonsitemdelegate.cpp index 66d2583..3e264fd 100644 --- a/tray/gui/dirbuttonsitemdelegate.cpp +++ b/tray/gui/dirbuttonsitemdelegate.cpp @@ -1,6 +1,6 @@ #include "./dirbuttonsitemdelegate.h" -#include "../model/syncthingdirectorymodel.h" +#include #include #include diff --git a/tray/gui/dirview.cpp b/tray/gui/dirview.cpp index de82108..3ff71b3 100644 --- a/tray/gui/dirview.cpp +++ b/tray/gui/dirview.cpp @@ -2,10 +2,10 @@ #include "./dirbuttonsitemdelegate.h" #include "./helper.h" -#include "../../connector/syncthingconnection.h" -#include "../../model/syncthingdirectorymodel.h" -#include "../../model/syncthingsortfiltermodel.h" -#include "../../widgets/misc/direrrorsdialog.h" +#include +#include +#include +#include #include #include diff --git a/tray/gui/downloaditemdelegate.cpp b/tray/gui/downloaditemdelegate.cpp index 778ba3b..5471b1e 100644 --- a/tray/gui/downloaditemdelegate.cpp +++ b/tray/gui/downloaditemdelegate.cpp @@ -1,6 +1,6 @@ #include "./downloaditemdelegate.h" -#include "../../model/syncthingdownloadmodel.h" +#include #include #include diff --git a/tray/gui/downloadview.cpp b/tray/gui/downloadview.cpp index 01d884a..a705515 100644 --- a/tray/gui/downloadview.cpp +++ b/tray/gui/downloadview.cpp @@ -2,8 +2,8 @@ #include "./downloaditemdelegate.h" #include "./helper.h" -#include "../../connector/syncthingdir.h" -#include "../../model/syncthingdownloadmodel.h" +#include +#include #include #include diff --git a/tray/gui/trayicon.cpp b/tray/gui/trayicon.cpp index eb349ce..9b66c09 100644 --- a/tray/gui/trayicon.cpp +++ b/tray/gui/trayicon.cpp @@ -1,18 +1,18 @@ #include "./trayicon.h" #include "./traywidget.h" -#include "../../widgets/misc/internalerrorsdialog.h" -#include "../../widgets/misc/statusinfo.h" -#include "../../widgets/misc/textviewdialog.h" -#include "../../widgets/settings/settings.h" +#include +#include +#include +#include -#include "../../model/syncthingicons.h" +#include -#include "../../connector/syncthingconnection.h" +#include #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD -#include "../../connector/syncthingservice.h" +#include #endif -#include "../../connector/utils.h" +#include #include diff --git a/tray/gui/trayicon.h b/tray/gui/trayicon.h index 10ded30..94375d6 100644 --- a/tray/gui/trayicon.h +++ b/tray/gui/trayicon.h @@ -3,7 +3,7 @@ #include "./traymenu.h" -#include "../../widgets/misc/dbusstatusnotifier.h" +#include #include diff --git a/tray/gui/traymenu.cpp b/tray/gui/traymenu.cpp index efd7aad..99604cc 100644 --- a/tray/gui/traymenu.cpp +++ b/tray/gui/traymenu.cpp @@ -2,7 +2,7 @@ #include "./trayicon.h" #include "./traywidget.h" -#include "../../widgets/settings/settings.h" +#include #include diff --git a/tray/gui/traywidget.cpp b/tray/gui/traywidget.cpp index 867ea8c..9b3fa16 100644 --- a/tray/gui/traywidget.cpp +++ b/tray/gui/traywidget.cpp @@ -3,22 +3,22 @@ #include "./trayicon.h" #include "./traymenu.h" -#include "../../widgets/misc/otherdialogs.h" -#include "../../widgets/misc/syncthinglauncher.h" -#include "../../widgets/misc/textviewdialog.h" -#include "../../widgets/settings/settingsdialog.h" -#include "../../widgets/webview/webviewdialog.h" +#include +#include +#include +#include +#include #ifdef SYNCTHINGTRAY_UNIFY_TRAY_MENUS -#include "../../widgets/misc/internalerrorsdialog.h" +#include #endif -#include "../../model/syncthingicons.h" +#include #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD -#include "../../connector/syncthingservice.h" +#include #endif -#include "../../connector/utils.h" +#include // use meta-data of syncthingtray application here #include "resources/../../tray/resources/config.h" diff --git a/tray/gui/traywidget.h b/tray/gui/traywidget.h index 836e83b..b2a67e7 100644 --- a/tray/gui/traywidget.h +++ b/tray/gui/traywidget.h @@ -1,18 +1,18 @@ #ifndef TRAY_WIDGET_H #define TRAY_WIDGET_H -#include "../../widgets/settings/settings.h" -#include "../../widgets/webview/webviewdefs.h" +#include +#include -#include "../../model/syncthingdevicemodel.h" -#include "../../model/syncthingdirectorymodel.h" -#include "../../model/syncthingdownloadmodel.h" -#include "../../model/syncthingrecentchangesmodel.h" -#include "../../model/syncthingsortfiltermodel.h" +#include +#include +#include +#include +#include -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingnotifier.h" -#include "../../connector/syncthingprocess.h" +#include +#include +#include #include diff --git a/widgets/misc/dbusstatusnotifier.cpp b/widgets/misc/dbusstatusnotifier.cpp index 053ccc6..eae0803 100644 --- a/widgets/misc/dbusstatusnotifier.cpp +++ b/widgets/misc/dbusstatusnotifier.cpp @@ -1,7 +1,7 @@ #ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS #include "./dbusstatusnotifier.h" -#include "../../model/syncthingicons.h" +#include // use meta-data of syncthingtray application here #include "resources/../../tray/resources/config.h" diff --git a/widgets/misc/direrrorsdialog.cpp b/widgets/misc/direrrorsdialog.cpp index 3b0dcdc..d058af3 100644 --- a/widgets/misc/direrrorsdialog.cpp +++ b/widgets/misc/direrrorsdialog.cpp @@ -1,8 +1,8 @@ #include "./direrrorsdialog.h" -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingdir.h" -#include "../../connector/utils.h" +#include +#include +#include #include #include diff --git a/widgets/misc/internalerror.cpp b/widgets/misc/internalerror.cpp index a261a8b..c098ca0 100644 --- a/widgets/misc/internalerror.cpp +++ b/widgets/misc/internalerror.cpp @@ -3,8 +3,8 @@ #include "../settings/settings.h" -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingservice.h" +#include +#include #include diff --git a/widgets/misc/otherdialogs.cpp b/widgets/misc/otherdialogs.cpp index 9148411..1adcba1 100644 --- a/widgets/misc/otherdialogs.cpp +++ b/widgets/misc/otherdialogs.cpp @@ -1,7 +1,7 @@ #include "./otherdialogs.h" -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingdir.h" +#include +#include // use meta-data of syncthingtray application here #include "resources/../../tray/resources/config.h" diff --git a/widgets/misc/statusinfo.cpp b/widgets/misc/statusinfo.cpp index cb118a1..0c34599 100644 --- a/widgets/misc/statusinfo.cpp +++ b/widgets/misc/statusinfo.cpp @@ -1,9 +1,9 @@ #include "./statusinfo.h" -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingdev.h" -#include "../../connector/utils.h" -#include "../../model/syncthingicons.h" +#include +#include +#include +#include #include #include diff --git a/widgets/misc/syncthingkiller.cpp b/widgets/misc/syncthingkiller.cpp index b4a0b75..5fb39e5 100644 --- a/widgets/misc/syncthingkiller.cpp +++ b/widgets/misc/syncthingkiller.cpp @@ -1,6 +1,6 @@ #include "./syncthingkiller.h" -#include "../../connector/syncthingprocess.h" +#include #define SYNCTHINGTESTHELPER_FOR_CLI #include "../../testhelper/helper.h" diff --git a/widgets/misc/syncthinglauncher.h b/widgets/misc/syncthinglauncher.h index 1715bbf..2e2a5a3 100644 --- a/widgets/misc/syncthinglauncher.h +++ b/widgets/misc/syncthinglauncher.h @@ -3,7 +3,7 @@ #include "../global.h" -#include "../../connector/syncthingprocess.h" +#include #include "../../libsyncthing/interface.h" #include diff --git a/widgets/misc/textviewdialog.cpp b/widgets/misc/textviewdialog.cpp index b6c5601..df91d02 100644 --- a/widgets/misc/textviewdialog.cpp +++ b/widgets/misc/textviewdialog.cpp @@ -1,7 +1,7 @@ #include "./textviewdialog.h" -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingdir.h" +#include +#include // use meta-data of syncthingtray application here #include "resources/../../tray/resources/config.h" diff --git a/widgets/settings/settings.cpp b/widgets/settings/settings.cpp index f69bf66..2ccf28a 100644 --- a/widgets/settings/settings.cpp +++ b/widgets/settings/settings.cpp @@ -3,13 +3,13 @@ #include "../misc/syncthingkiller.h" #include "../misc/syncthinglauncher.h" -#include "../../connector/qstringhash.h" -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingconnectionsettings.h" -#include "../../connector/syncthingnotifier.h" -#include "../../connector/syncthingprocess.h" +#include +#include +#include +#include +#include #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD -#include "../../connector/syncthingservice.h" +#include #endif // use meta-data of syncthingtray application here diff --git a/widgets/settings/settings.h b/widgets/settings/settings.h index bfb234e..335529d 100644 --- a/widgets/settings/settings.h +++ b/widgets/settings/settings.h @@ -1,9 +1,9 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include "../../connector/syncthingconnectionsettings.h" +#include #include "../../libsyncthing/interface.h" -#include "../../model/syncthingicons.h" +#include #include "../global.h" #include diff --git a/widgets/settings/settingsdialog.cpp b/widgets/settings/settingsdialog.cpp index af81bd5..961b6e6 100644 --- a/widgets/settings/settingsdialog.cpp +++ b/widgets/settings/settingsdialog.cpp @@ -2,15 +2,15 @@ #include "../misc/syncthinglauncher.h" -#include "../../connector/syncthingconfig.h" -#include "../../connector/syncthingconnection.h" -#include "../../connector/syncthingprocess.h" -#include "../../connector/utils.h" -#include "../../model/syncthingstatuscomputionmodel.h" +#include +#include +#include +#include +#include #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD -#include "../../connector/syncthingservice.h" -#include "../../model/colors.h" -#include "../../model/syncthingicons.h" +#include +#include +#include #endif #include "ui_appearanceoptionpage.h" diff --git a/widgets/settings/settingsdialog.h b/widgets/settings/settingsdialog.h index 520c3ab..6a2a1af 100644 --- a/widgets/settings/settingsdialog.h +++ b/widgets/settings/settingsdialog.h @@ -5,7 +5,7 @@ #include "../webview/webviewdefs.h" -#include "../../model/syncthingicons.h" +#include #include #include diff --git a/widgets/webview/webpage.cpp b/widgets/webview/webpage.cpp index 62fb69a..e8985ad 100644 --- a/widgets/webview/webpage.cpp +++ b/widgets/webview/webpage.cpp @@ -4,7 +4,7 @@ #include "../settings/settings.h" -#include "../../connector/syncthingconnection.h" +#include #include "resources/config.h" diff --git a/widgets/webview/webviewinterceptor.cpp b/widgets/webview/webviewinterceptor.cpp index 775aa00..378ba71 100644 --- a/widgets/webview/webviewinterceptor.cpp +++ b/widgets/webview/webviewinterceptor.cpp @@ -1,7 +1,7 @@ #ifdef SYNCTHINGWIDGETS_USE_WEBENGINE #include "./webviewinterceptor.h" -#include "../../connector/syncthingconnectionsettings.h" +#include #include #include