diff options
26 files changed, 33 insertions, 37 deletions
diff --git a/src/application-lib/application.h b/src/application-lib/application.h index bed89b12..08c8dd31 100644 --- a/src/application-lib/application.h +++ b/src/application-lib/application.h @@ -50,7 +50,6 @@ #include <QObject> #include <QtAppManCommon/global.h> -#include <QtAppManCommon/exception.h> #include <QtAppManApplication/installationreport.h> QT_BEGIN_NAMESPACE_AM diff --git a/src/application-lib/applicationscanner.h b/src/application-lib/applicationscanner.h index a7d7f80c..f1f6b817 100644 --- a/src/application-lib/applicationscanner.h +++ b/src/application-lib/applicationscanner.h @@ -41,10 +41,9 @@ #pragma once +#include <QtAppManCommon/global.h> #include <QStringList> -#include <QtAppManCommon/exception.h> - QT_BEGIN_NAMESPACE_AM class Application; diff --git a/src/common-lib/global.h b/src/common-lib/global.h index 18d35061..a1fcb806 100644 --- a/src/common-lib/global.h +++ b/src/common-lib/global.h @@ -47,7 +47,8 @@ #define QT_USE_NAMESPACE_AM using namespace QtAM; #define QT_PREPEND_NAMESPACE_AM(name) QtAM::name -QT_BEGIN_NAMESPACE_AM // make sure the namespace exists +QT_BEGIN_NAMESPACE_AM +// make sure the namespace exists QT_END_NAMESPACE_AM // make the source a lot less ugly and more readable (until we can finally use user defined literals) diff --git a/src/common-lib/logging.h b/src/common-lib/logging.h index 0b8a61cb..8ad16598 100644 --- a/src/common-lib/logging.h +++ b/src/common-lib/logging.h @@ -41,7 +41,7 @@ #pragma once -#include "global.h" +#include <QtAppManCommon/global.h> #include <QLoggingCategory> QT_BEGIN_NAMESPACE_AM diff --git a/src/crypto-lib/signature.cpp b/src/crypto-lib/signature.cpp index 540f5bc7..7f71b240 100644 --- a/src/crypto-lib/signature.cpp +++ b/src/crypto-lib/signature.cpp @@ -42,6 +42,7 @@ #include "signature.h" #include "signature_p.h" #include "cryptography.h" +#include "exception.h" QT_BEGIN_NAMESPACE_AM diff --git a/src/crypto-lib/signature_p.h b/src/crypto-lib/signature_p.h index 9a7d109a..ae55eaa6 100644 --- a/src/crypto-lib/signature_p.h +++ b/src/crypto-lib/signature_p.h @@ -41,8 +41,7 @@ #pragma once -#include "signature.h" -#include <QtAppManCommon/exception.h> +#include <QtAppManCrypto/signature.h> QT_BEGIN_NAMESPACE_AM diff --git a/src/installer-lib/applicationinstaller_p.h b/src/installer-lib/applicationinstaller_p.h index 07363aed..2a608bb6 100644 --- a/src/installer-lib/applicationinstaller_p.h +++ b/src/installer-lib/applicationinstaller_p.h @@ -46,10 +46,9 @@ #include <QSet> #include <QThread> -#include "applicationinstaller.h" -#include "sudo.h" -#include <QtAppManCommon/exception.h> -#include "dbus-policy.h" +#include <QtAppManInstaller/applicationinstaller.h> +#include <QtAppManInstaller/sudo.h> +#include <QtAppManCommon/dbus-policy.h> #include <QtAppManCommon/global.h> QT_BEGIN_NAMESPACE_AM diff --git a/src/installer-lib/installationlocation.h b/src/installer-lib/installationlocation.h index 8603bd2f..dfb33782 100644 --- a/src/installer-lib/installationlocation.h +++ b/src/installer-lib/installationlocation.h @@ -41,11 +41,10 @@ #pragma once +#include <QtAppManCommon/global.h> #include <QString> #include <QVariantMap> -#include <QtAppManCommon/exception.h> - QT_BEGIN_NAMESPACE_AM class InstallationLocation diff --git a/src/installer-lib/installationtask.h b/src/installer-lib/installationtask.h index 408cf6f5..f9a30dde 100644 --- a/src/installer-lib/installationtask.h +++ b/src/installer-lib/installationtask.h @@ -50,7 +50,6 @@ #include <QtAppManApplication/installationreport.h> #include <QtAppManInstaller/asynchronoustask.h> #include <QtAppManInstaller/scopeutilities.h> -#include <QtAppManCommon/exception.h> QT_BEGIN_NAMESPACE_AM diff --git a/src/launcher-lib/ipcwrapperobject_p.h b/src/launcher-lib/ipcwrapperobject_p.h index fd5ff0ce..210daabc 100644 --- a/src/launcher-lib/ipcwrapperobject_p.h +++ b/src/launcher-lib/ipcwrapperobject_p.h @@ -41,10 +41,9 @@ #pragma once +#include <QtAppManCommon/global.h> #include <QObject> -#include "global.h" - QT_BEGIN_NAMESPACE_AM class IpcWrapperObject; diff --git a/src/manager-lib/applicationdatabase.cpp b/src/manager-lib/applicationdatabase.cpp index bd07ca5e..a8d12e68 100644 --- a/src/manager-lib/applicationdatabase.cpp +++ b/src/manager-lib/applicationdatabase.cpp @@ -46,6 +46,7 @@ #include "application.h" #include "applicationdatabase.h" +#include "exception.h" QT_BEGIN_NAMESPACE_AM diff --git a/src/manager-lib/applicationdatabase.h b/src/manager-lib/applicationdatabase.h index 93cd0fb7..b726e752 100644 --- a/src/manager-lib/applicationdatabase.h +++ b/src/manager-lib/applicationdatabase.h @@ -41,11 +41,10 @@ #pragma once +#include <QtAppManCommon/global.h> #include <QList> #include <QString> -#include <QtAppManCommon/exception.h> - QT_BEGIN_NAMESPACE_AM class Application; diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h index f5bd606f..ff94b47c 100644 --- a/src/manager-lib/applicationmanager.h +++ b/src/manager-lib/applicationmanager.h @@ -47,7 +47,6 @@ #include <QProcess> #include <QJSValue> #include <QtAppManCommon/global.h> -#include <QtAppManCommon/exception.h> #include <QtAppManCommon/dbus-policy.h> #include <QtAppManCommon/dbus-utilities.h> diff --git a/src/manager-lib/nativeruntime_p.h b/src/manager-lib/nativeruntime_p.h index 6ebb139c..07941f50 100644 --- a/src/manager-lib/nativeruntime_p.h +++ b/src/manager-lib/nativeruntime_p.h @@ -41,7 +41,7 @@ #pragma once -#include "applicationinterface.h" +#include <QtAppManApplication/applicationinterface.h> QT_BEGIN_NAMESPACE_AM diff --git a/src/manager-lib/systemmonitor_p.h b/src/manager-lib/systemmonitor_p.h index a27bd11a..9a2a6314 100644 --- a/src/manager-lib/systemmonitor_p.h +++ b/src/manager-lib/systemmonitor_p.h @@ -49,7 +49,7 @@ #if defined(Q_OS_LINUX) # include <QScopedPointer> -# include "sysfsreader.h" +# include <QtAppManManager/sysfsreader.h> QT_FORWARD_DECLARE_CLASS(QSocketNotifier) #endif diff --git a/src/manager/main.h b/src/manager/main.h index ded0a3a1..f13d0c00 100644 --- a/src/manager/main.h +++ b/src/manager/main.h @@ -52,6 +52,7 @@ typedef QGuiApplication MainBase; #endif #include <QtAppManInstaller/installationlocation.h> +#include <QVector> #include "configuration.h" QT_FORWARD_DECLARE_CLASS(QQmlApplicationEngine) diff --git a/src/package-lib/package_p.h b/src/package-lib/package_p.h index cc6571c5..07a4df3a 100644 --- a/src/package-lib/package_p.h +++ b/src/package-lib/package_p.h @@ -41,9 +41,9 @@ #pragma once -#include <QVariantMap> - +#include <QtAppManCommon/global.h> #include <QtAppManCommon/exception.h> +#include <QVariantMap> struct archive; QT_FORWARD_DECLARE_CLASS(QFileInfo) diff --git a/src/package-lib/packagecreator_p.h b/src/package-lib/packagecreator_p.h index 8bdc48e5..311930e8 100644 --- a/src/package-lib/packagecreator_p.h +++ b/src/package-lib/packagecreator_p.h @@ -41,7 +41,7 @@ #pragma once -#include "packagecreator.h" +#include <QtAppManPackage/packagecreator.h> #include <archive.h> diff --git a/src/package-lib/packageextractor_p.h b/src/package-lib/packageextractor_p.h index 4ff5f70c..78fd6537 100644 --- a/src/package-lib/packageextractor_p.h +++ b/src/package-lib/packageextractor_p.h @@ -47,9 +47,8 @@ #include <archive.h> -#include "packageextractor.h" +#include <QtAppManPackage/packageextractor.h> #include <QtAppManApplication/installationreport.h> -#include <QtAppManCommon/exception.h> QT_FORWARD_DECLARE_CLASS(QCryptographicHash) diff --git a/src/tools/controller/main.cpp b/src/tools/controller/main.cpp index 7efd656b..e11753dd 100644 --- a/src/tools/controller/main.cpp +++ b/src/tools/controller/main.cpp @@ -42,14 +42,15 @@ # include <sys/poll.h> #endif -#include "global.h" -#include "error.h" -#include "exception.h" -#include "unixsignalhandler.h" +#include <QtAppManCommon/global.h> +#include <QtAppManCommon/error.h> +#include <QtAppManCommon/exception.h> +#include <QtAppManCommon/unixsignalhandler.h> +#include <QtAppManCommon/qtyaml.h> +#include <QtAppManCommon/dbus-utilities.h> + #include "applicationmanager_interface.h" #include "applicationinstaller_interface.h" -#include "qtyaml.h" -#include "dbus-utilities.h" QT_USE_NAMESPACE_AM diff --git a/src/tools/packager/main.cpp b/src/tools/packager/main.cpp index 7c83a45d..ce1b83d7 100644 --- a/src/tools/packager/main.cpp +++ b/src/tools/packager/main.cpp @@ -33,7 +33,7 @@ #include <stdio.h> -#include "utilities.h" +#include <QtAppManCommon/utilities.h> #include "packager.h" QT_USE_NAMESPACE_AM diff --git a/src/tools/packager/packager.h b/src/tools/packager/packager.h index 34c31b99..4adb212f 100644 --- a/src/tools/packager/packager.h +++ b/src/tools/packager/packager.h @@ -28,11 +28,10 @@ #pragma once +#include <QtAppManCommon/global.h> #include <QByteArray> #include <QString> -#include "exception.h" - class Packager { public: diff --git a/src/window-lib/waylandcompositor_p.h b/src/window-lib/waylandcompositor_p.h index a4e39ee8..6f645138 100644 --- a/src/window-lib/waylandcompositor_p.h +++ b/src/window-lib/waylandcompositor_p.h @@ -42,7 +42,7 @@ #pragma once -#include "global.h" +#include <QtAppManCommon/global.h> #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) # include <QWaylandQuickItem> diff --git a/src/window-lib/windowmanager_p.h b/src/window-lib/windowmanager_p.h index 3304e303..18bd4c21 100644 --- a/src/window-lib/windowmanager_p.h +++ b/src/window-lib/windowmanager_p.h @@ -45,7 +45,7 @@ #include <QMap> #include <QHash> -#include "dbus-policy.h" +#include <QtAppManCommon/dbus-policy.h> QT_FORWARD_DECLARE_CLASS(QQmlEngine) diff --git a/tests/application/tst_application.cpp b/tests/application/tst_application.cpp index 11f1bf8b..971c53ca 100644 --- a/tests/application/tst_application.cpp +++ b/tests/application/tst_application.cpp @@ -33,6 +33,7 @@ #include "application.h" #include "applicationdatabase.h" #include "yamlapplicationscanner.h" +#include "exception.h" QT_USE_NAMESPACE_AM diff --git a/tests/runtime/tst_runtime.cpp b/tests/runtime/tst_runtime.cpp index 9da4a3e5..e446d5c6 100644 --- a/tests/runtime/tst_runtime.cpp +++ b/tests/runtime/tst_runtime.cpp @@ -33,6 +33,7 @@ #include "yamlapplicationscanner.h" #include "abstractruntime.h" #include "runtimefactory.h" +#include "exception.h" QT_USE_NAMESPACE_AM |