[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesvn] /: Use Q_DECL_EXPORT/IMPORT instead some internal kde4 cmake checks
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2015-11-30 18:41:58
Message-ID: E1a3TOg-0000f1-Mz () scm ! kde ! org
[Download RAW message or body]

Git commit 6e79178ebe3dc336bbe2ec0b43c6f9d138ccbc45 by Christian Ehrlicher.
Committed on 30/11/2015 at 18:40.
Pushed by chehrlic into branch 'master'.

Use Q_DECL_EXPORT/IMPORT instead some internal kde4 cmake checks
remove export macros where not needed and clean up some includes

REVIEW: 126147

M  +0    -7    CMakeLists.txt
M  +0    -3    kdesvn-config.h.in
M  +1    -0    src/commandline.cpp
M  +1    -0    src/kdesvn_part.cpp
M  +3    -7    src/kdesvn_part.h
M  +1    -1    src/kiosvn/kiosvn.cpp
M  +0    -10   src/svnqt/CMakeLists.txt
M  +8    -3    src/svnqt/svnqt_defines.h.in

http://commits.kde.org/kdesvn/6e79178ebe3dc336bbe2ec0b43c6f9d138ccbc45

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1a9919..a5682c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,13 +71,6 @@ include(FindSubversion)
 include(SetupCompiler)
 include(kdesvn-macros)
 
-if(__KDE_HAVE_GCC_VISIBILITY)
-    set(HAVE_GCC_VISIBILITY On)
-    set(_KDESVN_EXPORT "__attribute__ ((visibility(\"default\")))")
-    set(_KDESVN_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
-endif(__KDE_HAVE_GCC_VISIBILITY)
-
-
 # Enable exceptions
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
diff --git a/kdesvn-config.h.in b/kdesvn-config.h.in
index 23d93d5..61a88af 100644
--- a/kdesvn-config.h.in
+++ b/kdesvn-config.h.in
@@ -4,9 +4,6 @@
 /* The KDESvn version */
 #define KDESVN_VERSION "@KDESVN_VERSION_STRING@"
 
-#define KDESVN_EXPORT @_KDESVN_EXPORT@
-#define KDESVN_NOEXPORT @_KDESVN_NOEXPORT@
-
 #define WALLETNAME "@PROJECT_NAME@"
 
 #define BIN_INSTALL_DIR "@BIN_INSTALL_DIR@"
diff --git a/src/commandline.cpp b/src/commandline.cpp
index dcabafd..ed30672 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -24,6 +24,7 @@
 #include <klocale.h>
 #include <qstring.h>
 #include <ktoolinvocation.h>
+#include <klibloader.h>
 
 class CommandLineData
 {
diff --git a/src/kdesvn_part.cpp b/src/kdesvn_part.cpp
index a706e8e..e73d254 100644
--- a/src/kdesvn_part.cpp
+++ b/src/kdesvn_part.cpp
@@ -48,6 +48,7 @@
 #include <klocale.h>
 #include <klocalizedstring.h>
 #include <ktoolinvocation.h>
+#include <kpluginfactory.h>
 
 K_PLUGIN_FACTORY(KdesvnFactory, registerPlugin<kdesvnpart>(); \
registerPlugin<commandline_part>("commandline_part");)  \
                K_EXPORT_PLUGIN(KdesvnFactory("kdesvnpart", "kdesvn"))
diff --git a/src/kdesvn_part.h b/src/kdesvn_part.h
index c3fbd57..2baba1a 100644
--- a/src/kdesvn_part.h
+++ b/src/kdesvn_part.h
@@ -24,16 +24,12 @@
 #include "kdesvn-config.h"
 
 #include <kparts/part.h>
-#include <kparts/genericfactory.h>
-#include <kparts/factory.h>
 #include <kparts/statusbarextension.h>
 #include <kparts/browserextension.h>
 
-#include <KComponentData>
+#include <KAboutData>
 
 class kdesvnView;
-class QPainter;
-class KUrl;
 class KdesvnBrowserExtension;
 class KAboutApplicationDialog;
 
@@ -45,7 +41,7 @@ class KAboutApplicationDialog;
  * @author Rajko Albrecht <ral@alwins-world.de>
  * @version 0.1
  */
-class KDESVN_EXPORT kdesvnpart : public KParts::ReadOnlyPart
+class kdesvnpart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
 public:
@@ -110,7 +106,7 @@ protected slots:
 class commandline_part;
 class KCmdLineArgs;
 
-class KPARTS_EXPORT KdesvnBrowserExtension : public KParts::BrowserExtension
+class KdesvnBrowserExtension : public KParts::BrowserExtension
 {
     Q_OBJECT
 public:
diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 1e8c216..5789f10 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -170,7 +170,7 @@ kio_svnProtocol::~kio_svnProtocol()
 
 extern "C"
 {
-    KDESVN_EXPORT int kdemain(int argc, char **argv);
+    Q_DECL_EXPORT int kdemain(int argc, char **argv);
 }
 
 int kdemain(int argc, char **argv)
diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt
index 4e0e95d..c618040 100644
--- a/src/svnqt/CMakeLists.txt
+++ b/src/svnqt/CMakeLists.txt
@@ -77,16 +77,6 @@ if(NOT svnqt-name)
   set(svnqt-name svnqt_private)
 endif()
 
-# must set from caller before - here no checks of compiler will done!
-if(HAVE_GCC_VISIBILITY)
-    set(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))")
-    set(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
-endif()
-
-if(WIN32)
-    set(_SVNQT_EXPORT "__declspec(dllexport)")
-endif()
-
 if(QT_LUPDATE_EXECUTABLE)
     message(STATUS "Setting up language target")
 
diff --git a/src/svnqt/svnqt_defines.h.in b/src/svnqt/svnqt_defines.h.in
index 359a48b..c8644a5 100644
--- a/src/svnqt/svnqt_defines.h.in
+++ b/src/svnqt/svnqt_defines.h.in
@@ -21,9 +21,14 @@
 #ifndef _SVNQT_DEFINES_H
 #define _SVNQT_DEFINES_H
 
-/* defines if we setup against a compiler with working "-fvisibility=hidden" */
-#define SVNQT_EXPORT @_SVNQT_EXPORT@
-#define SVNQT_NOEXPORT @_SVNQT_NOEXPORT@
+#include <QtCore/qglobal.h>
+
+#ifdef svnqt_private_EXPORTS
+  #define SVNQT_EXPORT Q_DECL_EXPORT
+#else
+  #define SVNQT_EXPORT Q_DECL_IMPORT
+#endif
+#define SVNQT_NOEXPORT Q_DECL_HIDDEN
 
 #cmakedefine HAS_BACKTRACE_H 1
 #cmakedefine USE_BACKTRACE 1


[prev in list] [next in list] [prev in thread] [next in thread]