Move the PeerPtr declaration out of types.h

This belongs in peer.h instead, since types.h is included in lots
of places that should not drag the peer deps in. Also, this caused
problems (circular deps?) when building the OSX notification backend.

diff --git a/src/common/peer.h b/src/common/peer.h
index de9a4b6..2bdcc56 100644 (file)
--- a/src/common/peer.h
+++ b/src/common/peer.h
@@ -82,6 +82,10 @@ private:
     QPointer<AuthHandler> _authHandler;
 };
 
+// We need to special-case Peer* in attached signals/slots, so typedef it for the meta type system
+typedef Peer * PeerPtr;
+Q_DECLARE_METATYPE(PeerPtr)
+
 
 // Template method needed in the header
 template<typename T> inline

diff --git a/src/common/transfer.h b/src/common/transfer.h
index 31421cd..cacfeaa 100644 (file)
--- a/src/common/transfer.h
+++ b/src/common/transfer.h
@@ -24,8 +24,8 @@
 #include <QHostAddress>
 #include <QUuid>
 
+#include "peer.h"
 #include "syncableobject.h"
-#include "types.h"
 
 class Transfer : public SyncableObject
 {

diff --git a/src/common/types.h b/src/common/types.h
index 290d53f..a63e296 100644 (file)
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -29,12 +29,6 @@
 #include <QHostAddress>
 #include <QDataStream>
 
-#include "peer.h"
-
-// We need to special-case Peer* in attached signals/slots, so typedef it for the meta type system
-typedef Peer * PeerPtr;
-Q_DECLARE_METATYPE(PeerPtr)
-
 class SignedId
 {
 protected:

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 997578a..203c377 100644 (file)
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -24,6 +24,7 @@
 #  include <QSslSocket>
 #endif
 
+#include <QDateTime>
 #include <QFile>
 
 #include "logger.h"