[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.
main
Adriaan de Groot 5 years ago
parent aaa6f6bd55
commit b044549013

@ -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

@ -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

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

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

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

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

@ -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

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

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

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

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

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

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

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

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

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

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

@ -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"

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

@ -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"

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save