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.
This commit is contained in:
parent
b350aaf879
commit
975e86c895
|
@ -26,6 +26,9 @@ else()
|
||||||
set(PLASMOID_DISABLED_BY_DEFAULT OFF)
|
set(PLASMOID_DISABLED_BY_DEFAULT OFF)
|
||||||
endif()
|
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
|
# add options for partial build
|
||||||
option(NO_LIBSYNCTHING "whether building Syncthing itself as a library should be skipped" ON)
|
option(NO_LIBSYNCTHING "whether building Syncthing itself as a library should be skipped" ON)
|
||||||
option(NO_CLI "whether building CLI should be skipped" OFF)
|
option(NO_CLI "whether building CLI should be skipped" OFF)
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
#include "./jsdefs.h"
|
#include "./jsdefs.h"
|
||||||
#include "./jsincludes.h"
|
#include "./jsincludes.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconfig.h"
|
#include <syncthingconnector/syncthingconfig.h>
|
||||||
#include "../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
// use header-only functions waitForSignals() and signalInfo() from test utilities; disable assertions via macro
|
// use header-only functions waitForSignals() and signalInfo() from test utilities; disable assertions via macro
|
||||||
#define SYNCTHINGTESTHELPER_FOR_CLI
|
#define SYNCTHINGTESTHELPER_FOR_CLI
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
#include "./args.h"
|
#include "./args.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../connector/syncthingconnectionsettings.h"
|
#include <syncthingconnector/syncthingconnectionsettings.h>
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#include "./syncthingdiractions.h"
|
#include "./syncthingdiractions.h"
|
||||||
#include "./syncthingfileitemactionstaticdata.h"
|
#include "./syncthingfileitemactionstaticdata.h"
|
||||||
|
|
||||||
#include "../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include "../connector/syncthingdir.h"
|
#include <syncthingconnector/syncthingdir.h>
|
||||||
#include "../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
using namespace Data;
|
using namespace Data;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef SYNCTHINGDIRACTIONS_H
|
#ifndef SYNCTHINGDIRACTIONS_H
|
||||||
#define SYNCTHINGDIRACTIONS_H
|
#define SYNCTHINGDIRACTIONS_H
|
||||||
|
|
||||||
#include "../connector/syncthingdir.h"
|
#include <syncthingconnector/syncthingdir.h>
|
||||||
|
|
||||||
#include "./syncthinginfoaction.h"
|
#include "./syncthinginfoaction.h"
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "./syncthinginfoaction.h"
|
#include "./syncthinginfoaction.h"
|
||||||
#include "./syncthingmenuaction.h"
|
#include "./syncthingmenuaction.h"
|
||||||
|
|
||||||
#include "../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include <KFileItem>
|
#include <KFileItem>
|
||||||
#include <KPluginFactory>
|
#include <KPluginFactory>
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#include "./syncthingfileitemactionstaticdata.h"
|
#include "./syncthingfileitemactionstaticdata.h"
|
||||||
|
|
||||||
#include "../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include "../connector/syncthingconfig.h"
|
#include <syncthingconnector/syncthingconfig.h>
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../connector/syncthingconnectionsettings.h"
|
#include <syncthingconnector/syncthingconnectionsettings.h>
|
||||||
|
|
||||||
#include <c++utilities/application/argumentparser.h>
|
#include <c++utilities/application/argumentparser.h>
|
||||||
#include <c++utilities/io/ansiescapecodes.h>
|
#include <c++utilities/io/ansiescapecodes.h>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef SYNCTHINGFILEITEMACTIONSTATICDATA_H
|
#ifndef SYNCTHINGFILEITEMACTIONSTATICDATA_H
|
||||||
#define SYNCTHINGFILEITEMACTIONSTATICDATA_H
|
#define SYNCTHINGFILEITEMACTIONSTATICDATA_H
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief The SyncthingFileItemActionStaticData class holds objects required during the whole application's live time.
|
* \brief The SyncthingFileItemActionStaticData class holds objects required during the whole application's live time.
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#include "./syncthingmenuaction.h"
|
#include "./syncthingmenuaction.h"
|
||||||
#include "./syncthingfileitemaction.h"
|
#include "./syncthingfileitemaction.h"
|
||||||
|
|
||||||
#include "../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
|
|
||||||
#ifdef CPP_UTILITIES_DEBUG_BUILD
|
#ifdef CPP_UTILITIES_DEBUG_BUILD
|
||||||
#include <c++utilities/io/ansiescapecodes.h>
|
#include <c++utilities/io/ansiescapecodes.h>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef SYNCTHINGMENUACTION_H
|
#ifndef SYNCTHINGMENUACTION_H
|
||||||
#define SYNCTHINGMENUACTION_H
|
#define SYNCTHINGMENUACTION_H
|
||||||
|
|
||||||
#include "../connector/syncthingnotifier.h"
|
#include <syncthingconnector/syncthingnotifier.h>
|
||||||
|
|
||||||
#include <KFileItemListProperties>
|
#include <KFileItemListProperties>
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
../connector
|
|
@ -0,0 +1 @@
|
||||||
|
../model
|
|
@ -0,0 +1 @@
|
||||||
|
../widgets
|
|
@ -2,8 +2,8 @@
|
||||||
#include "./colors.h"
|
#include "./colors.h"
|
||||||
#include "./syncthingicons.h"
|
#include "./syncthingicons.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include <c++utilities/conversion/stringconversion.h>
|
#include <c++utilities/conversion/stringconversion.h>
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
#include "./colors.h"
|
#include "./colors.h"
|
||||||
#include "./syncthingicons.h"
|
#include "./syncthingicons.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include <c++utilities/conversion/stringconversion.h>
|
#include <c++utilities/conversion/stringconversion.h>
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "./syncthingdownloadmodel.h"
|
#include "./syncthingdownloadmodel.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "./syncthingmodel.h"
|
#include "./syncthingmodel.h"
|
||||||
#include "./syncthingicons.h"
|
#include "./syncthingicons.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
|
|
||||||
namespace Data {
|
namespace Data {
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
#include "./colors.h"
|
#include "./colors.h"
|
||||||
#include "./syncthingicons.h"
|
#include "./syncthingicons.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include <c++utilities/conversion/stringconversion.h>
|
#include <c++utilities/conversion/stringconversion.h>
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
#include "./syncthingmodel.h"
|
#include "./syncthingmodel.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnectionstatus.h"
|
#include <syncthingconnector/syncthingconnectionstatus.h>
|
||||||
#include "../connector/syncthingdir.h"
|
#include <syncthingconnector/syncthingdir.h>
|
||||||
|
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "./syncthingstatuscomputionmodel.h"
|
#include "./syncthingstatuscomputionmodel.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnectionsettings.h"
|
#include <syncthingconnector/syncthingconnectionsettings.h>
|
||||||
|
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "./syncthingstatusselectionmodel.h"
|
#include "./syncthingstatusselectionmodel.h"
|
||||||
|
|
||||||
#include "../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
|
|
||||||
using namespace QtUtilities;
|
using namespace QtUtilities;
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include "ui_appearanceoptionpage.h"
|
#include "ui_appearanceoptionpage.h"
|
||||||
|
|
||||||
#include "../../widgets/settings/settingsdialog.h"
|
#include <syncthingwidgets/settings/settingsdialog.h>
|
||||||
|
|
||||||
#include <qtutilities/settingsdialog/optioncategory.h>
|
#include <qtutilities/settingsdialog/optioncategory.h>
|
||||||
#include <qtutilities/settingsdialog/optioncategorymodel.h>
|
#include <qtutilities/settingsdialog/optioncategorymodel.h>
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#ifndef SETTINGSDIALOG_H
|
#ifndef SETTINGSDIALOG_H
|
||||||
#define SETTINGSDIALOG_H
|
#define SETTINGSDIALOG_H
|
||||||
|
|
||||||
#include "../../model/syncthingstatusselectionmodel.h"
|
#include <syncthingmodel/syncthingstatusselectionmodel.h>
|
||||||
|
|
||||||
#include "../../widgets/settings/settingsdialog.h"
|
#include <syncthingwidgets/settings/settingsdialog.h>
|
||||||
|
|
||||||
#include <qtutilities/settingsdialog/optionpage.h>
|
#include <qtutilities/settingsdialog/optionpage.h>
|
||||||
|
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
#include "./syncthingapplet.h"
|
#include "./syncthingapplet.h"
|
||||||
#include "./settingsdialog.h"
|
#include "./settingsdialog.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
#include "../../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include "../../widgets/misc/direrrorsdialog.h"
|
#include <syncthingwidgets/misc/direrrorsdialog.h>
|
||||||
#include "../../widgets/misc/internalerrorsdialog.h"
|
#include <syncthingwidgets/misc/internalerrorsdialog.h>
|
||||||
#include "../../widgets/misc/otherdialogs.h"
|
#include <syncthingwidgets/misc/otherdialogs.h>
|
||||||
#include "../../widgets/misc/textviewdialog.h"
|
#include <syncthingwidgets/misc/textviewdialog.h>
|
||||||
#include "../../widgets/settings/settings.h"
|
#include <syncthingwidgets/settings/settings.h>
|
||||||
#include "../../widgets/settings/settingsdialog.h"
|
#include <syncthingwidgets/settings/settingsdialog.h>
|
||||||
#include "../../widgets/webview/webviewdialog.h"
|
#include <syncthingwidgets/webview/webviewdialog.h>
|
||||||
|
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include "../../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include "resources/config.h"
|
#include "resources/config.h"
|
||||||
#include "resources/qtconfig.h"
|
#include "resources/qtconfig.h"
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
#ifndef SYNCTHINGAPPLET_H
|
#ifndef SYNCTHINGAPPLET_H
|
||||||
#define SYNCTHINGAPPLET_H
|
#define SYNCTHINGAPPLET_H
|
||||||
|
|
||||||
#include "../../widgets/misc/dbusstatusnotifier.h"
|
#include <syncthingwidgets/misc/dbusstatusnotifier.h>
|
||||||
#include "../../widgets/misc/statusinfo.h"
|
#include <syncthingwidgets/misc/statusinfo.h>
|
||||||
#include "../../widgets/webview/webviewdefs.h"
|
#include <syncthingwidgets/webview/webviewdefs.h>
|
||||||
|
|
||||||
#include "../../model/syncthingdevicemodel.h"
|
#include <syncthingmodel/syncthingdevicemodel.h>
|
||||||
#include "../../model/syncthingdirectorymodel.h"
|
#include <syncthingmodel/syncthingdirectorymodel.h>
|
||||||
#include "../../model/syncthingdownloadmodel.h"
|
#include <syncthingmodel/syncthingdownloadmodel.h>
|
||||||
#include "../../model/syncthingrecentchangesmodel.h"
|
#include <syncthingmodel/syncthingrecentchangesmodel.h>
|
||||||
#include "../../model/syncthingsortfiltermodel.h"
|
#include <syncthingmodel/syncthingsortfiltermodel.h>
|
||||||
#include "../../model/syncthingstatusselectionmodel.h"
|
#include <syncthingmodel/syncthingstatusselectionmodel.h>
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingnotifier.h"
|
#include <syncthingconnector/syncthingnotifier.h>
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
|
|
||||||
#include <qtutilities/aboutdialog/aboutdialog.h>
|
#include <qtutilities/aboutdialog/aboutdialog.h>
|
||||||
#include <qtutilities/models/checklistmodel.h>
|
#include <qtutilities/models/checklistmodel.h>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "./global.h"
|
#include "./global.h"
|
||||||
#include "./helper.h"
|
#include "./helper.h"
|
||||||
|
|
||||||
#include "../connector/syncthingprocess.h"
|
#include <syncthingconnector/syncthingprocess.h>
|
||||||
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
#include "../gui/trayicon.h"
|
#include "../gui/trayicon.h"
|
||||||
#include "../gui/traywidget.h"
|
#include "../gui/traywidget.h"
|
||||||
|
|
||||||
#include "../../widgets/misc/syncthinglauncher.h"
|
#include <syncthingwidgets/misc/syncthinglauncher.h>
|
||||||
#include "../../widgets/settings/settings.h"
|
#include <syncthingwidgets/settings/settings.h>
|
||||||
|
|
||||||
#include "../../connector/syncthingprocess.h"
|
#include <syncthingconnector/syncthingprocess.h>
|
||||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "resources/config.h"
|
#include "resources/config.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "./devbuttonsitemdelegate.h"
|
#include "./devbuttonsitemdelegate.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../model/syncthingdevicemodel.h"
|
#include <syncthingmodel/syncthingdevicemodel.h>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QBrush>
|
#include <QBrush>
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
#include "./devbuttonsitemdelegate.h"
|
#include "./devbuttonsitemdelegate.h"
|
||||||
#include "./helper.h"
|
#include "./helper.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingdev.h"
|
#include <syncthingconnector/syncthingdev.h>
|
||||||
#include "../../model/syncthingdevicemodel.h"
|
#include <syncthingmodel/syncthingdevicemodel.h>
|
||||||
#include "../../model/syncthingsortfiltermodel.h"
|
#include <syncthingmodel/syncthingsortfiltermodel.h>
|
||||||
|
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "./dirbuttonsitemdelegate.h"
|
#include "./dirbuttonsitemdelegate.h"
|
||||||
|
|
||||||
#include "../model/syncthingdirectorymodel.h"
|
#include <syncthingmodel/syncthingdirectorymodel.h>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QBrush>
|
#include <QBrush>
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
#include "./dirbuttonsitemdelegate.h"
|
#include "./dirbuttonsitemdelegate.h"
|
||||||
#include "./helper.h"
|
#include "./helper.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../model/syncthingdirectorymodel.h"
|
#include <syncthingmodel/syncthingdirectorymodel.h>
|
||||||
#include "../../model/syncthingsortfiltermodel.h"
|
#include <syncthingmodel/syncthingsortfiltermodel.h>
|
||||||
#include "../../widgets/misc/direrrorsdialog.h"
|
#include <syncthingwidgets/misc/direrrorsdialog.h>
|
||||||
|
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "./downloaditemdelegate.h"
|
#include "./downloaditemdelegate.h"
|
||||||
|
|
||||||
#include "../../model/syncthingdownloadmodel.h"
|
#include <syncthingmodel/syncthingdownloadmodel.h>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QBrush>
|
#include <QBrush>
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
#include "./downloaditemdelegate.h"
|
#include "./downloaditemdelegate.h"
|
||||||
#include "./helper.h"
|
#include "./helper.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingdir.h"
|
#include <syncthingconnector/syncthingdir.h>
|
||||||
#include "../../model/syncthingdownloadmodel.h"
|
#include <syncthingmodel/syncthingdownloadmodel.h>
|
||||||
|
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
#include "./trayicon.h"
|
#include "./trayicon.h"
|
||||||
#include "./traywidget.h"
|
#include "./traywidget.h"
|
||||||
|
|
||||||
#include "../../widgets/misc/internalerrorsdialog.h"
|
#include <syncthingwidgets/misc/internalerrorsdialog.h>
|
||||||
#include "../../widgets/misc/statusinfo.h"
|
#include <syncthingwidgets/misc/statusinfo.h>
|
||||||
#include "../../widgets/misc/textviewdialog.h"
|
#include <syncthingwidgets/misc/textviewdialog.h>
|
||||||
#include "../../widgets/settings/settings.h"
|
#include <syncthingwidgets/settings/settings.h>
|
||||||
|
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
#endif
|
#endif
|
||||||
#include "../../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include <qtutilities/misc/dialogutils.h>
|
#include <qtutilities/misc/dialogutils.h>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include "./traymenu.h"
|
#include "./traymenu.h"
|
||||||
|
|
||||||
#include "../../widgets/misc/dbusstatusnotifier.h"
|
#include <syncthingwidgets/misc/dbusstatusnotifier.h>
|
||||||
|
|
||||||
#include <c++utilities/chrono/datetime.h>
|
#include <c++utilities/chrono/datetime.h>
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "./trayicon.h"
|
#include "./trayicon.h"
|
||||||
#include "./traywidget.h"
|
#include "./traywidget.h"
|
||||||
|
|
||||||
#include "../../widgets/settings/settings.h"
|
#include <syncthingwidgets/settings/settings.h>
|
||||||
|
|
||||||
#include <qtutilities/misc/dialogutils.h>
|
#include <qtutilities/misc/dialogutils.h>
|
||||||
|
|
||||||
|
|
|
@ -3,22 +3,22 @@
|
||||||
#include "./trayicon.h"
|
#include "./trayicon.h"
|
||||||
#include "./traymenu.h"
|
#include "./traymenu.h"
|
||||||
|
|
||||||
#include "../../widgets/misc/otherdialogs.h"
|
#include <syncthingwidgets/misc/otherdialogs.h>
|
||||||
#include "../../widgets/misc/syncthinglauncher.h"
|
#include <syncthingwidgets/misc/syncthinglauncher.h>
|
||||||
#include "../../widgets/misc/textviewdialog.h"
|
#include <syncthingwidgets/misc/textviewdialog.h>
|
||||||
#include "../../widgets/settings/settingsdialog.h"
|
#include <syncthingwidgets/settings/settingsdialog.h>
|
||||||
#include "../../widgets/webview/webviewdialog.h"
|
#include <syncthingwidgets/webview/webviewdialog.h>
|
||||||
|
|
||||||
#ifdef SYNCTHINGTRAY_UNIFY_TRAY_MENUS
|
#ifdef SYNCTHINGTRAY_UNIFY_TRAY_MENUS
|
||||||
#include "../../widgets/misc/internalerrorsdialog.h"
|
#include <syncthingwidgets/misc/internalerrorsdialog.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
#endif
|
#endif
|
||||||
#include "../../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
// use meta-data of syncthingtray application here
|
// use meta-data of syncthingtray application here
|
||||||
#include "resources/../../tray/resources/config.h"
|
#include "resources/../../tray/resources/config.h"
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
#ifndef TRAY_WIDGET_H
|
#ifndef TRAY_WIDGET_H
|
||||||
#define TRAY_WIDGET_H
|
#define TRAY_WIDGET_H
|
||||||
|
|
||||||
#include "../../widgets/settings/settings.h"
|
#include <syncthingwidgets/settings/settings.h>
|
||||||
#include "../../widgets/webview/webviewdefs.h"
|
#include <syncthingwidgets/webview/webviewdefs.h>
|
||||||
|
|
||||||
#include "../../model/syncthingdevicemodel.h"
|
#include <syncthingmodel/syncthingdevicemodel.h>
|
||||||
#include "../../model/syncthingdirectorymodel.h"
|
#include <syncthingmodel/syncthingdirectorymodel.h>
|
||||||
#include "../../model/syncthingdownloadmodel.h"
|
#include <syncthingmodel/syncthingdownloadmodel.h>
|
||||||
#include "../../model/syncthingrecentchangesmodel.h"
|
#include <syncthingmodel/syncthingrecentchangesmodel.h>
|
||||||
#include "../../model/syncthingsortfiltermodel.h"
|
#include <syncthingmodel/syncthingsortfiltermodel.h>
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingnotifier.h"
|
#include <syncthingconnector/syncthingnotifier.h>
|
||||||
#include "../../connector/syncthingprocess.h"
|
#include <syncthingconnector/syncthingprocess.h>
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
|
#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
|
||||||
#include "./dbusstatusnotifier.h"
|
#include "./dbusstatusnotifier.h"
|
||||||
|
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
// use meta-data of syncthingtray application here
|
// use meta-data of syncthingtray application here
|
||||||
#include "resources/../../tray/resources/config.h"
|
#include "resources/../../tray/resources/config.h"
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#include "./direrrorsdialog.h"
|
#include "./direrrorsdialog.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingdir.h"
|
#include <syncthingconnector/syncthingdir.h>
|
||||||
#include "../../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
#include "../settings/settings.h"
|
#include "../settings/settings.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
|
|
||||||
#include <QNetworkReply>
|
#include <QNetworkReply>
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "./otherdialogs.h"
|
#include "./otherdialogs.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingdir.h"
|
#include <syncthingconnector/syncthingdir.h>
|
||||||
|
|
||||||
// use meta-data of syncthingtray application here
|
// use meta-data of syncthingtray application here
|
||||||
#include "resources/../../tray/resources/config.h"
|
#include "resources/../../tray/resources/config.h"
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#include "./statusinfo.h"
|
#include "./statusinfo.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingdev.h"
|
#include <syncthingconnector/syncthingdev.h>
|
||||||
#include "../../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "./syncthingkiller.h"
|
#include "./syncthingkiller.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingprocess.h"
|
#include <syncthingconnector/syncthingprocess.h>
|
||||||
#define SYNCTHINGTESTHELPER_FOR_CLI
|
#define SYNCTHINGTESTHELPER_FOR_CLI
|
||||||
#include "../../testhelper/helper.h"
|
#include "../../testhelper/helper.h"
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include "../global.h"
|
#include "../global.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingprocess.h"
|
#include <syncthingconnector/syncthingprocess.h>
|
||||||
#include "../../libsyncthing/interface.h"
|
#include "../../libsyncthing/interface.h"
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "./textviewdialog.h"
|
#include "./textviewdialog.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingdir.h"
|
#include <syncthingconnector/syncthingdir.h>
|
||||||
|
|
||||||
// use meta-data of syncthingtray application here
|
// use meta-data of syncthingtray application here
|
||||||
#include "resources/../../tray/resources/config.h"
|
#include "resources/../../tray/resources/config.h"
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
#include "../misc/syncthingkiller.h"
|
#include "../misc/syncthingkiller.h"
|
||||||
#include "../misc/syncthinglauncher.h"
|
#include "../misc/syncthinglauncher.h"
|
||||||
|
|
||||||
#include "../../connector/qstringhash.h"
|
#include <syncthingconnector/qstringhash.h>
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingconnectionsettings.h"
|
#include <syncthingconnector/syncthingconnectionsettings.h>
|
||||||
#include "../../connector/syncthingnotifier.h"
|
#include <syncthingconnector/syncthingnotifier.h>
|
||||||
#include "../../connector/syncthingprocess.h"
|
#include <syncthingconnector/syncthingprocess.h>
|
||||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// use meta-data of syncthingtray application here
|
// use meta-data of syncthingtray application here
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#ifndef SETTINGS_H
|
#ifndef SETTINGS_H
|
||||||
#define SETTINGS_H
|
#define SETTINGS_H
|
||||||
|
|
||||||
#include "../../connector/syncthingconnectionsettings.h"
|
#include <syncthingconnector/syncthingconnectionsettings.h>
|
||||||
#include "../../libsyncthing/interface.h"
|
#include "../../libsyncthing/interface.h"
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
#include "../global.h"
|
#include "../global.h"
|
||||||
|
|
||||||
#include <qtutilities/settingsdialog/qtsettings.h>
|
#include <qtutilities/settingsdialog/qtsettings.h>
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
#include "../misc/syncthinglauncher.h"
|
#include "../misc/syncthinglauncher.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconfig.h"
|
#include <syncthingconnector/syncthingconfig.h>
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
#include "../../connector/syncthingprocess.h"
|
#include <syncthingconnector/syncthingprocess.h>
|
||||||
#include "../../connector/utils.h"
|
#include <syncthingconnector/utils.h>
|
||||||
#include "../../model/syncthingstatuscomputionmodel.h"
|
#include <syncthingmodel/syncthingstatuscomputionmodel.h>
|
||||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||||
#include "../../connector/syncthingservice.h"
|
#include <syncthingconnector/syncthingservice.h>
|
||||||
#include "../../model/colors.h"
|
#include <syncthingmodel/colors.h>
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "ui_appearanceoptionpage.h"
|
#include "ui_appearanceoptionpage.h"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#include "../webview/webviewdefs.h"
|
#include "../webview/webviewdefs.h"
|
||||||
|
|
||||||
#include "../../model/syncthingicons.h"
|
#include <syncthingmodel/syncthingicons.h>
|
||||||
|
|
||||||
#include <qtutilities/settingsdialog/optionpage.h>
|
#include <qtutilities/settingsdialog/optionpage.h>
|
||||||
#include <qtutilities/settingsdialog/qtsettings.h>
|
#include <qtutilities/settingsdialog/qtsettings.h>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "../settings/settings.h"
|
#include "../settings/settings.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnection.h"
|
#include <syncthingconnector/syncthingconnection.h>
|
||||||
|
|
||||||
#include "resources/config.h"
|
#include "resources/config.h"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifdef SYNCTHINGWIDGETS_USE_WEBENGINE
|
#ifdef SYNCTHINGWIDGETS_USE_WEBENGINE
|
||||||
#include "./webviewinterceptor.h"
|
#include "./webviewinterceptor.h"
|
||||||
|
|
||||||
#include "../../connector/syncthingconnectionsettings.h"
|
#include <syncthingconnector/syncthingconnectionsettings.h>
|
||||||
|
|
||||||
#include <QWebEngineProfile>
|
#include <QWebEngineProfile>
|
||||||
#include <QWebEngineUrlRequestInterceptor>
|
#include <QWebEngineUrlRequestInterceptor>
|
||||||
|
|
Loading…
Reference in New Issue