[libcalamares] Merge PluginDllMacro.h into DllMacro.h

- Let's just have one header definining export- and visibility-
   macros for Calamares. They are still selected based on the
   export flags (*_PRO), just defined in one header instead of two.

src/libcalamares/DllMacro.h

@@ -29,4 +29,12 @@
 #endif
 #endif
 
+#ifndef PLUGINDLLEXPORT
+#if defined( PLUGINDLLEXPORT_PRO )
+#define PLUGINDLLEXPORT Q_DECL_EXPORT
+#else
+#define PLUGINDLLEXPORT Q_DECL_IMPORT
+#endif
+#endif
+
 #endif

src/libcalamares/PluginDllMacro.h

@@ -1,32 +0,0 @@
-/* === This file is part of Calamares - <https://github.com/calamares> ===
- *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PLUGINDLLMACRO_H
-#define PLUGINDLLMACRO_H
-
-#include <QtCore/qglobal.h>
-
-#ifndef PLUGINDLLEXPORT
-#if defined( PLUGINDLLEXPORT_PRO )
-#define PLUGINDLLEXPORT Q_DECL_EXPORT
-#else
-#define PLUGINDLLEXPORT Q_DECL_IMPORT
-#endif
-#endif
-
-#endif

src/modules/contextualprocess/ContextualProcessJob.h

@@ -23,7 +23,7 @@
 #include <QVariantMap>
 
 #include "CppJob.h"
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 
 #include "utils/PluginFactory.h"
 

src/modules/dracutlukscfg/DracutLuksCfgJob.h

@@ -27,7 +27,7 @@
 
 #include <utils/PluginFactory.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob
 {

src/modules/dummycpp/DummyCppJob.h

@@ -27,7 +27,7 @@
 
 #include <utils/PluginFactory.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob
 {

src/modules/finished/FinishedViewStep.h

@@ -25,7 +25,7 @@
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
 
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 
 class FinishedPage;
 

src/modules/fsresizer/ResizeFSJob.h

@@ -27,7 +27,7 @@
 #include "partition/PartitionSize.h"
 #include "utils/PluginFactory.h"
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 class CoreBackend;  // From KPMCore
 class Device;  // From KPMCore

src/modules/hostinfo/HostInfoJob.h

@@ -20,7 +20,7 @@
 #define HOSTINFOJOB_H
 
 #include "CppJob.h"
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 #include "utils/PluginFactory.h"
 
 #include <QObject>

src/modules/initcpio/InitcpioJob.h

@@ -20,7 +20,7 @@
 #define INITCPIOJOB_H
 
 #include "CppJob.h"
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 #include "utils/PluginFactory.h"
 
 #include <QObject>

src/modules/initramfs/InitramfsJob.h

@@ -20,7 +20,7 @@
 #define INITRAMFSJOB_H
 
 #include "CppJob.h"
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 #include "utils/PluginFactory.h"
 
 #include <QObject>

src/modules/interactiveterminal/InteractiveTerminalViewStep.h

@@ -25,7 +25,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 class InteractiveTerminalPage;
 

src/modules/keyboard/KeyboardViewStep.h

@@ -25,7 +25,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 class KeyboardPage;
 

src/modules/license/LicenseViewStep.h

@@ -20,7 +20,7 @@
 #ifndef LICENSEPAGEPLUGIN_H
 #define LICENSEPAGEPLUGIN_H
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 

src/modules/locale/LocaleViewStep.h

@@ -25,7 +25,7 @@
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
 
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 
 #include <QFutureWatcher>
 #include <QObject>

src/modules/luksbootkeyfile/LuksBootKeyFileJob.h

@@ -20,7 +20,7 @@
 #define LUKSBOOTKEYFILEJOB_H
 
 #include "CppJob.h"
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 #include "utils/PluginFactory.h"
 
 #include <QObject>

src/modules/machineid/MachineIdJob.h

@@ -26,7 +26,7 @@
 
 #include <utils/PluginFactory.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob
 {

src/modules/netinstall/NetInstallViewStep.h

@@ -23,7 +23,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include <QVariant>
 

src/modules/notesqml/NotesQmlViewStep.h

@@ -20,7 +20,7 @@
 #ifndef NOTESQMLVIEWSTEP_H
 #define NOTESQMLVIEWSTEP_H
 
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 #include "locale/TranslatableConfiguration.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Variant.h"

src/modules/oemid/OEMViewStep.h

@@ -22,7 +22,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include <QVariantMap>
 

src/modules/packagechooser/PackageChooserViewStep.h

@@ -19,7 +19,7 @@
 #ifndef PACKAGECHOOSERVIEWSTEP_H
 #define PACKAGECHOOSERVIEWSTEP_H
 
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 #include "locale/TranslatableConfiguration.h"
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"

src/modules/partition/gui/PartitionViewStep.h

@@ -24,7 +24,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include "core/PartitionActions.h"
 

src/modules/plasmalnf/PlasmaLnfViewStep.h

@@ -21,7 +21,7 @@
 
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include <QObject>
 #include <QUrl>

src/modules/preservefiles/PreserveFiles.h

@@ -24,7 +24,7 @@
 #include <QVariantMap>
 
 #include "CppJob.h"
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 
 #include "utils/PluginFactory.h"
 

src/modules/shellprocess/ShellProcessJob.h

@@ -20,7 +20,7 @@
 #define SHELLPROCESSJOB_H
 
 #include "CppJob.h"
-#include "PluginDllMacro.h"
+#include "DllMacro.h"
 
 #include "utils/CommandList.h"
 #include "utils/PluginFactory.h"

src/modules/summary/SummaryViewStep.h

@@ -24,7 +24,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 class SummaryPage;
 

src/modules/tracking/TrackingViewStep.h

@@ -21,7 +21,7 @@
 
 #include "TrackingType.h"
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 

src/modules/users/UsersViewStep.h

@@ -25,7 +25,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include <QVariant>
 

src/modules/webview/WebViewStep.h

@@ -26,7 +26,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include <QVariantMap>
 

src/modules/welcome/WelcomeViewStep.h

@@ -25,7 +25,7 @@
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include <QVariantMap>
 

src/modules/welcomeq/WelcomeQmlViewStep.h

@@ -25,7 +25,7 @@
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
 
-#include <PluginDllMacro.h>
+#include <DllMacro.h>
 
 #include <QObject>
 #include <QVariantMap>