PLASMA_EXPORT

svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=666752

CMakeLists.txt

@@ -3,20 +3,19 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 ########### next target ###############
 
 set(plasma_LIB_SRCS
-   plasma.cpp
-   applet.cpp
-   interface.cpp
    abstractrunner.cpp
-   svg.cpp
+   applet.cpp
-   theme.cpp
    dataengine.cpp
    datavisualization.cpp
-
+   plasma.cpp
-   widgets/widget.cpp
+   interface.cpp
+   svg.cpp
+   theme.cpp
+   widgets/checkbox.cpp
    widgets/lineedit.cpp
    widgets/pushbutton.cpp
-   widgets/checkbox.cpp
    widgets/radiobutton.cpp
+   widgets/widget.cpp
    )
 
 kde4_automoc(${plasma_LIB_SRCS})
@@ -32,14 +31,15 @@ install(TARGETS plasma  DESTINATION ${LIB_INSTALL_DIR} )
 ########### install files ###############
 
 install( FILES
-    applet.h
-    plasma.h
     abstractrunner.h
-    theme.h
+    applet.h
-    interface.h
     dataengine.h
-    svg.h
     datavisualization.h
+    interface.h
+    plasma.h
+    plasma_export.h
+    svg.h
+    theme.h
     widgets/widget.h
     widgets/lineedit.h
     widgets/pushbutton.h

abstractrunner.h

@@ -22,7 +22,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 
-#include <kdemacros.h>
+#include <plasma_export.h>
 
 class KActionCollection;
 class QAction;
@@ -33,7 +33,7 @@ namespace Plasma
 /**
  * A abstract super-class for Plasma Runners
  */
-class KDE_EXPORT AbstractRunner : public QObject
+class PLASMA_EXPORT AbstractRunner : public QObject
 {
     Q_OBJECT
 

applet.h

@@ -29,7 +29,7 @@
 namespace Plasma
 {
 
-class KDE_EXPORT Applet : public QWidget, public QGraphicsItemGroup
+class PLASMA_EXPORT Applet : public QWidget, public QGraphicsItemGroup
 {
     Q_OBJECT
 

appletLayout.h

@@ -1,7 +1,7 @@
 #ifndef APPLEYLAYOUT_H
 #define APPLEYLAYOUT_H
 
-#include "kdemacros.h"
+#include "plasma_export.h"
 
 #include <QLayout>
 #include <QSize>
@@ -17,7 +17,7 @@ namespace Plasma
  * of applets) by emitting corresponding signals which AppletCompositor
  * can intercept and respond with some nice animation/effect.
  */
-class KDE_EXPORT AppletLayout : public QLayout
+class PLASMA_EXPORT AppletLayout : public QLayout
 {
         Q_OBJECT
     public:

dataengine.h

@@ -24,7 +24,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-#include <kdemacros.h>
+#include <plasma_export.h>
 
 namespace Plasma
 {
@@ -32,7 +32,7 @@ namespace Plasma
 class DataSource;
 class DataVisualization;
 
-class KDE_EXPORT DataSource : public QObject
+class PLASMA_EXPORT DataSource : public QObject
 {
     Q_OBJECT
 
@@ -59,7 +59,7 @@ class KDE_EXPORT DataSource : public QObject
         Private* const d;
 };
 
-class KDE_EXPORT DataEngine : public QObject
+class PLASMA_EXPORT DataEngine : public QObject
 {
     Q_OBJECT
 

datavisualization.h

@@ -27,7 +27,7 @@ namespace Plasma
 {
 
 // this will end up being multiple-inherited?
-class KDE_EXPORT DataVisualization : public QObject
+class PLASMA_EXPORT DataVisualization : public QObject
 {
     Q_OBJECT
     public:

interface.h

@@ -21,14 +21,14 @@
 
 #include <QtCore/QString>
 
-#include <kdemacros.h>
+#include <plasma_export.h>
 
 namespace Plasma
 {
 
 class DataEngine;
 
-class KDE_EXPORT Interface
+class PLASMA_EXPORT Interface
 {
     public:
         static Interface* self();

plasma.h

@@ -19,7 +19,7 @@
 #ifndef PLASMA_DEFS_H
 #define PLASMA_DEFS_H
 
-#include <kdemacros.h>
+#include <plasma_export.h>
 
 namespace Plasma
 {
@@ -37,9 +37,9 @@ enum Direction { Down = 0,
 enum ScreenEdge { Floating = 0, Desktop,
                   TopEdge, BottomEdge, LeftEdge, RightEdge };
 
-KDE_EXPORT void setMinId(int minId);
+PLASMA_EXPORT void setMinId(int minId);
-KDE_EXPORT int uniqueId();
+PLASMA_EXPORT int uniqueId();
-KDE_EXPORT Direction edgeToPopupDirection(ScreenEdge edge);
+PLASMA_EXPORT Direction edgeToPopupDirection(ScreenEdge edge);
 
 } // Plasma namespace
 

plasma_export.h

@@ -0,0 +1,40 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2007 David Faure <faure@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef PLASMA_EXPORT_H
+#define PLASMA_EXPORT_H
+
+/* needed for KDE_EXPORT and KDE_IMPORT macros */
+#include <kdemacros.h>
+
+#ifndef PLASMA_EXPORT
+# if defined(MAKE_PLASMA_LIB)
+   /* We are building this library */ 
+#  define PLASMA_EXPORT KDE_EXPORT
+# else
+   /* We are using this library */ 
+#  define PLASMA_EXPORT KDE_IMPORT
+# endif
+#endif
+
+# ifndef PLASMA_EXPORT_DEPRECATED
+#  define PLASMA_EXPORT_DEPRECATED KDE_DEPRECATED PLASMA_EXPORT
+# endif
+
+#endif

svg.h

@@ -21,7 +21,7 @@
 
 #include <QtCore/QObject>
 
-#include <kdemacros.h>
+#include <plasma_export.h>
 
 class QPainter;
 class QPoint;
@@ -31,7 +31,7 @@ class QSize;
 namespace Plasma
 {
 
-class KDE_EXPORT Svg : public QObject
+class PLASMA_EXPORT Svg : public QObject
 {
     Q_OBJECT
 

theme.h

@@ -21,12 +21,12 @@
 
 #include <QtCore/QObject>
 
-#include <kdemacros.h>
+#include <plasma_export.h>
 
 namespace Plasma
 {
 
-class KDE_EXPORT Theme : public QObject
+class PLASMA_EXPORT Theme : public QObject
 {
     Q_OBJECT