[Pkg-owncloud-commits] [owncloud-client] 67/103: Add EXPORT macro to owncloudsync library

Sandro Knauß hefee-guest at moszumanska.debian.org
Wed Apr 30 18:09:00 UTC 2014


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5c92c190f0edd15af5c18433cefa65023c7ac131
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Apr 24 23:45:20 2014 +0200

    Add EXPORT macro to owncloudsync library
    
    Not all the class are exported currently, only the one that seems to be used
    by the command line tools
---
 src/creds/abstractcredentials.h | 4 +++-
 src/creds/httpcredentials.h     | 2 +-
 src/creds/tokencredentials.h    | 2 +-
 src/mirall/account.h            | 5 +++--
 src/mirall/clientproxy.h        | 3 ++-
 src/mirall/logger.h             | 4 +++-
 src/mirall/syncengine.h         | 2 +-
 src/mirall/syncjournaldb.h      | 4 +++-
 src/mirall/utility.h            | 6 ++++++
 9 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/creds/abstractcredentials.h b/src/creds/abstractcredentials.h
index 3fb8461..79df5d6 100644
--- a/src/creds/abstractcredentials.h
+++ b/src/creds/abstractcredentials.h
@@ -17,6 +17,8 @@
 #include <QObject>
 
 #include <csync.h>
+#include "utility.h"
+
 
 class QNetworkAccessManager;
 class QNetworkReply;
@@ -24,7 +26,7 @@ namespace Mirall
 {
 class Account;
 
-class AbstractCredentials : public QObject
+class OWNCLOUDSYNC_EXPORT AbstractCredentials : public QObject
 {
     Q_OBJECT
 
diff --git a/src/creds/httpcredentials.h b/src/creds/httpcredentials.h
index 5231283..38402fc 100644
--- a/src/creds/httpcredentials.h
+++ b/src/creds/httpcredentials.h
@@ -30,7 +30,7 @@ class Job;
 namespace Mirall
 {
 
-class HttpCredentials : public AbstractCredentials
+class OWNCLOUDSYNC_EXPORT HttpCredentials : public AbstractCredentials
 {
     Q_OBJECT
 
diff --git a/src/creds/tokencredentials.h b/src/creds/tokencredentials.h
index 8b83711..7b593d5 100644
--- a/src/creds/tokencredentials.h
+++ b/src/creds/tokencredentials.h
@@ -31,7 +31,7 @@ namespace Mirall
 {
 
 class TokenCredentialsAccessManager;
-class TokenCredentials : public AbstractCredentials
+class OWNCLOUDSYNC_EXPORT TokenCredentials : public AbstractCredentials
 {
     Q_OBJECT
 
diff --git a/src/mirall/account.h b/src/mirall/account.h
index e358ba9..32f19e6 100644
--- a/src/mirall/account.h
+++ b/src/mirall/account.h
@@ -22,6 +22,7 @@
 #include <QSslCertificate>
 #include <QSslConfiguration>
 #include <QSslError>
+#include "utility.h"
 
 class QSettings;
 class QNetworkReply;
@@ -34,7 +35,7 @@ class AbstractCredentials;
 class Account;
 class QuotaInfo;
 
-class AccountManager : public QObject {
+class OWNCLOUDSYNC_EXPORT AccountManager : public QObject {
     Q_OBJECT
 public:
     static AccountManager *instance();
@@ -63,7 +64,7 @@ public:
 /**
  * @brief This class represents an account on an ownCloud Server
  */
-class Account : public QObject {
+class OWNCLOUDSYNC_EXPORT Account : public QObject {
     Q_OBJECT
 public:
     enum State { Disconnected = 0, /// no network connection
diff --git a/src/mirall/clientproxy.h b/src/mirall/clientproxy.h
index 258cdf9..4fe3729 100644
--- a/src/mirall/clientproxy.h
+++ b/src/mirall/clientproxy.h
@@ -18,12 +18,13 @@
 #include <QNetworkProxy>
 
 #include <csync.h>
+#include "utility.h"
 
 namespace Mirall {
 
 class MirallConfigFile;
 
-class ClientProxy : public QObject
+class OWNCLOUDSYNC_EXPORT ClientProxy : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/mirall/logger.h b/src/mirall/logger.h
index 8790b65..035ed62 100644
--- a/src/mirall/logger.h
+++ b/src/mirall/logger.h
@@ -22,6 +22,8 @@
 #include <QTextStream>
 #include <qmutex.h>
 
+#include "utility.h"
+
 namespace Mirall {
 
 struct Log{
@@ -35,7 +37,7 @@ struct Log{
   QString message;
 };
 
-class Logger : public QObject
+class OWNCLOUDSYNC_EXPORT Logger : public QObject
 {
   Q_OBJECT
 public:
diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h
index f9ffe5f..1406a27 100644
--- a/src/mirall/syncengine.h
+++ b/src/mirall/syncengine.h
@@ -44,7 +44,7 @@ void csyncLogCatcher(int /*verbosity*/,
                      const char *buffer,
                      void */*userdata*/);
 
-class SyncEngine : public QObject
+class OWNCLOUDSYNC_EXPORT SyncEngine : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/mirall/syncjournaldb.h b/src/mirall/syncjournaldb.h
index b900423..4764f77 100644
--- a/src/mirall/syncjournaldb.h
+++ b/src/mirall/syncjournaldb.h
@@ -21,6 +21,8 @@
 #include <QHash>
 #include <QSqlQuery>
 
+#include "utility.h"
+
 namespace Mirall {
 class SyncJournalFileRecord;
 class SyncJournalBlacklistRecord;
@@ -30,7 +32,7 @@ class SyncJournalBlacklistRecord;
  *
  * This class is thread safe. All public function are locking the mutex.
  */
-class SyncJournalDb : public QObject
+class OWNCLOUDSYNC_EXPORT SyncJournalDb : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/mirall/utility.h b/src/mirall/utility.h
index 3fb7051..004db4b 100644
--- a/src/mirall/utility.h
+++ b/src/mirall/utility.h
@@ -21,6 +21,12 @@
 #include <QElapsedTimer>
 #include <QHash>
 
+#ifdef owncloudsync_EXPORTS
+#define OWNCLOUDSYNC_EXPORT Q_DECL_EXPORT
+#else
+#define OWNCLOUDSYNC_EXPORT Q_DECL_IMPORT
+#endif
+
 class QWidget;
 
 namespace Mirall {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list