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

List:       kde-commits
Subject:    kdesupport/decibel
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2008-07-19 11:02:58
Message-ID: 1216465378.946212.28202.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 834630 by gberg:

Fix export macros and installed headers of libdecibel_pluginhelper.

Merge branch 'bugfixing'


 A             include/Decibel/AccountDataSerialization  
 M  +5 -2      include/Decibel/CMakeLists.txt  
 A             include/Decibel/decibel_pluginhelper_export.h   [License: LGPL (v2.1)]
 M  +5 -3      src/pluginhelper/accountconnectorbase.h  
 M  +6 -4      src/pluginhelper/accountdataserialization.h  
 M  +5 -3      src/pluginhelper/contactconnectorbase.h  


--- trunk/kdesupport/decibel/include/Decibel/CMakeLists.txt #834629:834630
@@ -12,9 +12,12 @@
     ProtocolManager
     ContactManager
     ChannelHandler
+    decibel_common_export.h
+    # libdecibel_pluginhelper public headers
+    AccountConnectorBase
+    AccountDataSerialization
     ContactConnectorBase
-    AccountConnectorBase
-    decibel_common_export.h
+    decibel_pluginhelper_export.h
 )
 
 INSTALL(FILES ${decibel_public_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR})
--- trunk/kdesupport/decibel/src/pluginhelper/accountconnectorbase.h #834629:834630
@@ -18,11 +18,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef DECIBEL_DAEMON_ACCOUNTCONNECTORBASE_H
-#define DECIBEL_DAEMON_ACCOUNTCONNECTORBASE_H
+#ifndef DECIBEL_PLUGINHELPER_ACCOUNTCONNECTORBASE_H
+#define DECIBEL_PLUGINHELPER_ACCOUNTCONNECTORBASE_H
 
 #include <Decibel/AccountData>
 
+#include <Decibel/decibel_pluginhelper_export.h>
+
 #include <QtCore/QVariantMap>
 
 /**
@@ -35,7 +37,7 @@
  *
  * @author Tobias Hunger <info@basyskom.de>
  */
-class Q_DECL_EXPORT AccountConnectorBase : public QObject
+class DECIBEL_PLUGINHELPER_EXPORT AccountConnectorBase : public QObject
 {
     Q_OBJECT
 public:
--- trunk/kdesupport/decibel/src/pluginhelper/accountdataserialization.h #834629:834630
@@ -18,9 +18,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef DECIBEL_DAEMON_ACCOUNTDATASERIALIZATION_H
-#define DECIBEL_DAEMON_ACCOUNTDATASERIALIZATION_H
+#ifndef DECIBEL_PLUGINHELPER_ACCOUNTDATASERIALIZATION_H
+#define DECIBEL_PLUGINHELPER_ACCOUNTDATASERIALIZATION_H
 
+#include <Decibel/decibel_pluginhelper_export.h>
+
 #include <QtCore/QByteArray>
 #include <QtCore/QVariant>
 
@@ -30,7 +32,7 @@
  * @param value The QVariant containing the item off account data to serialize.
  * @return The XML representation of the account data item.
  */
-Q_DECL_EXPORT QByteArray serializeAccountDataVariant(const QVariant & value);
+DECIBEL_PLUGINHELPER_EXPORT QByteArray serializeAccountDataVariant(const QVariant & value);
 
 /**
  * @brief Takes the XML representation of an account data object and
@@ -39,7 +41,7 @@
  *        data item.
  * @return The resultant QVariant from deserializing the XML received.
  */
-Q_DECL_EXPORT QVariant deserializeAccountDataVariant(const QByteArray & data);
+DECIBEL_PLUGINHELPER_EXPORT QVariant deserializeAccountDataVariant(const QByteArray & data);
 
 #endif // header guard
 
--- trunk/kdesupport/decibel/src/pluginhelper/contactconnectorbase.h #834629:834630
@@ -19,9 +19,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef DECIBEL_DAEMON_CONTACTCONNECTORBASE_H
-#define DECIBEL_DAEMON_CONTACTCONNECTORBASE_H
+#ifndef DECIBEL_PLUGINHELPER_CONTACTCONNECTORBASE_H
+#define DECIBEL_PLUGINHELPER_CONTACTCONNECTORBASE_H
 
+#include <Decibel/decibel_pluginhelper_export.h>
+
 #include <QtCore/QVariantMap>
 
 #include <QtTapioca/ContactBase>
@@ -38,7 +40,7 @@
  *
  * @author Tobias Hunger <info@basyskom.de>
  */
-class Q_DECL_EXPORT ContactConnectorBase : public QObject
+class DECIBEL_PLUGINHELPER_EXPORT ContactConnectorBase : public QObject
 {
     Q_OBJECT
 public:
[prev in list] [next in list] [prev in thread] [next in thread]