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

List:       kde-commits
Subject:    [tikzkit] /: simplify *_export.h makros
From:       Dominik Haumann <dhaumann () kde ! org>
Date:       2013-08-13 12:27:16
Message-ID: E1V9Dgy-0001Fn-L0 () scm ! kde ! org
[Download RAW message or body]

Git commit b3a9df76e69d3d539b3c342c5cc9d107664fb555 by Dominik Haumann.
Committed on 13/08/2013 at 12:27.
Pushed by dhaumann into branch 'master'.

simplify *_export.h makros

M  +4    -19   qtikzcore/tikz_export.h
M  +4    -19   qtikzgui/tikzgui_export.h

http://commits.kde.org/tikzkit/b3a9df76e69d3d539b3c342c5cc9d107664fb555

diff --git a/qtikzcore/tikz_export.h b/qtikzcore/tikz_export.h
index 698a96d..8ca4dc4 100644
--- a/qtikzcore/tikz_export.h
+++ b/qtikzcore/tikz_export.h
@@ -20,27 +20,12 @@
 #ifndef TIKZ_EXPORT_H
 #define TIKZ_EXPORT_H
 =

-// visibility
-#define HAVE_VISIBILITY
+#include <QtCore/QtGlobal>
 =

-#ifdef HAVE_VISIBILITY
-# define PROPERTY_NO_EXPORT __attribute__ ((visibility("hidden")))
-# define PROPERTY_EXPORT __attribute__ ((visibility("default")))
-# define PROPERTY_IMPORT __attribute__ ((visibility("default")))
+#if defined(MAKE_TIKZCORE)
+#  define TIKZCORE_EXPORT Q_DECL_EXPORT
 #else
-# define PROPERTY_NO_EXPORT
-# define PROPERTY_EXPORT
-# define PROPERTY_IMPORT
-#endif
-
-#ifndef TIKZCORE_EXPORT
-# if defined(MAKE_TIKZCORE)
-/* We are building this library */
-#  define TIKZCORE_EXPORT PROPERTY_EXPORT
-# else
-/* We are using this library */
-#  define TIKZCORE_EXPORT PROPERTY_IMPORT
-# endif
+#  define TIKZCORE_EXPORT Q_DECL_IMPORT
 #endif
 =

 #endif // TIKZ_EXPORT_H
diff --git a/qtikzgui/tikzgui_export.h b/qtikzgui/tikzgui_export.h
index f48aba5..d89261a 100644
--- a/qtikzgui/tikzgui_export.h
+++ b/qtikzgui/tikzgui_export.h
@@ -20,27 +20,12 @@
 #ifndef TIKZ_GUI_EXPORT_H
 #define TIKZ_GUI_EXPORT_H
 =

-// visibility
-#define HAVE_VISIBILITY
+#include <QtCore/QtGlobal>
 =

-#ifdef HAVE_VISIBILITY
-# define PROPERTY_NO_EXPORT __attribute__ ((visibility("hidden")))
-# define PROPERTY_EXPORT __attribute__ ((visibility("default")))
-# define PROPERTY_IMPORT __attribute__ ((visibility("default")))
+#if defined(MAKE_TIKZGUI)
+#  define TIKZGUI_EXPORT Q_DECL_EXPORT
 #else
-# define PROPERTY_NO_EXPORT
-# define PROPERTY_EXPORT
-# define PROPERTY_IMPORT
-#endif
-
-#ifndef TIKZGUI_EXPORT
-# if defined(MAKE_TIKZGUI)
-/* We are building this library */
-#  define TIKZGUI_EXPORT PROPERTY_EXPORT
-# else
-/* We are using this library */
-#  define TIKZGUI_EXPORT PROPERTY_IMPORT
-# endif
+#  define TIKZGUI_EXPORT Q_DECL_IMPORT
 #endif
 =

 #endif // TIKZ_GUI_EXPORT_H
[prev in list] [next in list] [prev in thread] [next in thread]