[Pkg-owncloud-commits] [qtkeychain] 38/115: Fix OS X build

[Sandro Knauß]

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

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

commit 0fe6a0772966bf9a14d0e478e0dacbba68475cf1
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Wed May 9 19:18:10 2012 +0200

    Fix OS X build
---
 keychain_p.h | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/keychain_p.h b/keychain_p.h
index be6bdf2..0268aaf 100644
--- a/keychain_p.h
+++ b/keychain_p.h
@@ -14,11 +14,15 @@
 #include <QPointer>
 #include <QSettings>
 
-#if defined (Q_OS_UNIX) && (!defined(Q_WS_DARWIN))
+#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
 
 #include <QDBusPendingCallWatcher>
 
 #include "kwallet_interface.h"
+#else
+
+class QDBusPendingCallWatcher;
+
 #endif
 
 #include "keychain.h"
@@ -55,13 +59,18 @@ public:
     };
     DataType dataType;
 
-#if defined (Q_OS_UNIX) && (!defined(Q_WS_DARWIN))
+#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
     org::kde::KWallet* iface;
 
 private Q_SLOTS:
     void kwalletOpenFinished( QDBusPendingCallWatcher* watcher );
     void kwalletEntryTypeFinished( QDBusPendingCallWatcher* watcher );
     void kwalletReadFinished( QDBusPendingCallWatcher* watcher );
+#else //moc's too dumb to respect above macros, so just define empty slot implementations
+private Q_SLOTS:
+    void kwalletOpenFinished( QDBusPendingCallWatcher* ) {}
+    void kwalletEntryTypeFinished( QDBusPendingCallWatcher* ) {}
+    void kwalletReadFinished( QDBusPendingCallWatcher* ) {}
 #endif
 
 };
@@ -82,12 +91,16 @@ public:
     QByteArray binaryData;
     QString textData;
 
-#if defined (Q_OS_UNIX) && (!defined(Q_WS_DARWIN))
+#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
     org::kde::KWallet* iface;
 
 private Q_SLOTS:
     void kwalletOpenFinished( QDBusPendingCallWatcher* watcher );
     void kwalletWriteFinished( QDBusPendingCallWatcher* watcher );
+#else
+private Q_SLOTS:
+    void kwalletOpenFinished( QDBusPendingCallWatcher* ) {}
+    void kwalletWriteFinished( QDBusPendingCallWatcher* ) {}
 #endif
 };
 

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