From 2d753d5d08707cc668c7d029adec09c16a6f5298 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 26 Mar 2014 22:03:21 +0100
Subject: [PATCH] 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.
---
 src/common/peer.h      | 4 ++++
 src/common/transfer.h  | 2 +-
 src/common/types.h     | 6 ------
 src/core/sslserver.cpp | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/common/peer.h b/src/common/peer.h
index de9a4b64..2bdcc563 100644
--- 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 31421cdf..cacfeaac 100644
--- 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 290d53f6..a63e2967 100644
--- 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 997578a3..203c377e 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -24,6 +24,7 @@
 #  include <QSslSocket>
 #endif
 
+#include <QDateTime>
 #include <QFile>
 
 #include "logger.h"
-- 
2.20.1