summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2014-10-08 08:33:37 +0200
committerMontel Laurent <[email protected]>2014-10-08 08:33:37 +0200
commiteda48fb41f13783af28c6f924851d945714fefa8 (patch)
tree9a81e4420567c4b0e5cfdb0ff291a73242e580cf
parenteda42774deb11d913b706e7d0499ff4c5acfd2d0 (diff)
Autogenerate export header
-rw-r--r--kerfuffle/CMakeLists.txt1
-rw-r--r--kerfuffle/kerfuffle_macro.h (renamed from kerfuffle/kerfuffle_export.h)20
-rw-r--r--plugins/cli7zplugin/cliplugin.cpp1
-rw-r--r--plugins/clilhaplugin/cliplugin.cpp1
-rw-r--r--plugins/clizipplugin/cliplugin.cpp1
-rw-r--r--plugins/karchiveplugin/karchiveplugin.cpp1
-rw-r--r--plugins/libsinglefileplugin/bz2plugin.cpp2
-rw-r--r--plugins/libsinglefileplugin/gzplugin.cpp4
-rw-r--r--plugins/libsinglefileplugin/xzplugin.cpp3
9 files changed, 12 insertions, 22 deletions
diff --git a/kerfuffle/CMakeLists.txt b/kerfuffle/CMakeLists.txt
index 7c8f31e..bb89107 100644
--- a/kerfuffle/CMakeLists.txt
+++ b/kerfuffle/CMakeLists.txt
@@ -19,6 +19,7 @@ kconfig_add_kcfg_files(kerfuffle_SRCS settings.kcfgc)
ki18n_wrap_ui(kerfuffle_SRCS extractiondialog.ui adddialog.ui )
add_library(kerfuffle SHARED ${kerfuffle_SRCS})
+generate_export_header(kerfuffle BASE_NAME kerfuffle)
target_link_libraries(kerfuffle KF5::Pty KF5::KDELibs4Support)
if (NOT WIN32)
diff --git a/kerfuffle/kerfuffle_export.h b/kerfuffle/kerfuffle_macro.h
index f25c757..ec014ec 100644
--- a/kerfuffle/kerfuffle_export.h
+++ b/kerfuffle/kerfuffle_macro.h
@@ -25,27 +25,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KERFUFFLE_EXPORT_H
-#define KERFUFFLE_EXPORT_H
+#ifndef KERFUFFLE_MACRO_H
+#define KERFUFFLE_MACRO_H
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
#include <kpluginfactory.h>
-#ifndef KERFUFFLE_EXPORT
-# if defined(MAKE_KERFUFFLE_LIB)
-/* We are building this library */
-# define KERFUFFLE_EXPORT KDE_EXPORT
-# else
-/* We are using this library */
-# define KERFUFFLE_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef KERFUFFLE_EXPORT_DEPRECATED
-# define KERFUFFLE_EXPORT_DEPRECATED KDE_DEPRECATED KERFUFFLE_EXPORT
-# endif
-
#define KERFUFFLE_EXPORT_PLUGIN(p) \
K_PLUGIN_FACTORY( ArkPluginFactory, registerPlugin< p >(); ) \
K_EXPORT_PLUGIN( ArkPluginFactory("p") )
diff --git a/plugins/cli7zplugin/cliplugin.cpp b/plugins/cli7zplugin/cliplugin.cpp
index 500f121..6452d95 100644
--- a/plugins/cli7zplugin/cliplugin.cpp
+++ b/plugins/cli7zplugin/cliplugin.cpp
@@ -23,6 +23,7 @@
#include "cliplugin.h"
#include "kerfuffle/cliinterface.h"
#include "kerfuffle/kerfuffle_export.h"
+#include "kerfuffle_macro.h"
#include <QDateTime>
#include <QDir>
diff --git a/plugins/clilhaplugin/cliplugin.cpp b/plugins/clilhaplugin/cliplugin.cpp
index 5c2aa6e..816132c 100644
--- a/plugins/clilhaplugin/cliplugin.cpp
+++ b/plugins/clilhaplugin/cliplugin.cpp
@@ -22,6 +22,7 @@
#include "cliplugin.h"
#include "kerfuffle/kerfuffle_export.h"
+#include "kerfuffle_macro.h"
#include <QDate>
#include <QTime>
#include <kdebug.h>
diff --git a/plugins/clizipplugin/cliplugin.cpp b/plugins/clizipplugin/cliplugin.cpp
index 30908d9..6eecc09 100644
--- a/plugins/clizipplugin/cliplugin.cpp
+++ b/plugins/clizipplugin/cliplugin.cpp
@@ -20,6 +20,7 @@
*/
#include "cliplugin.h"
+#include "kerfuffle_macro.h"
#include "kerfuffle/cliinterface.h"
#include "kerfuffle/kerfuffle_export.h"
diff --git a/plugins/karchiveplugin/karchiveplugin.cpp b/plugins/karchiveplugin/karchiveplugin.cpp
index aa0009d..cb47446 100644
--- a/plugins/karchiveplugin/karchiveplugin.cpp
+++ b/plugins/karchiveplugin/karchiveplugin.cpp
@@ -20,6 +20,7 @@
*/
#include "karchiveplugin.h"
#include "kerfuffle/queries.h"
+#include "kerfuffle_macro.h"
#include <KZip>
#include <KTar>
diff --git a/plugins/libsinglefileplugin/bz2plugin.cpp b/plugins/libsinglefileplugin/bz2plugin.cpp
index de9c9b4..25c9e1e 100644
--- a/plugins/libsinglefileplugin/bz2plugin.cpp
+++ b/plugins/libsinglefileplugin/bz2plugin.cpp
@@ -25,7 +25,7 @@
#include "bz2plugin.h"
#include "kerfuffle/kerfuffle_export.h"
-
+#include "kerfuffle_macro.h"
#include <QString>
LibBzip2Interface::LibBzip2Interface(QObject *parent, const QVariantList & args)
diff --git a/plugins/libsinglefileplugin/gzplugin.cpp b/plugins/libsinglefileplugin/gzplugin.cpp
index 469432a..1c343ae 100644
--- a/plugins/libsinglefileplugin/gzplugin.cpp
+++ b/plugins/libsinglefileplugin/gzplugin.cpp
@@ -24,8 +24,8 @@
*/
#include "gzplugin.h"
-#include "kerfuffle/kerfuffle_export.h"
-
+#include "kerfuffle_export.h"
+#include "kerfuffle_macro.h"
#include <QString>
LibGzipInterface::LibGzipInterface(QObject *parent, const QVariantList & args)
diff --git a/plugins/libsinglefileplugin/xzplugin.cpp b/plugins/libsinglefileplugin/xzplugin.cpp
index 5805dbb..fd9831f 100644
--- a/plugins/libsinglefileplugin/xzplugin.cpp
+++ b/plugins/libsinglefileplugin/xzplugin.cpp
@@ -24,7 +24,8 @@
*/
#include "xzplugin.h"
-#include "kerfuffle/kerfuffle_export.h"
+#include "kerfuffle_export.h"
+#include "kerfuffle_macro.h"
#include <QString>