X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=d4e920ef51d1a5f1837f31c8a6327e7007d5753f;hb=92fc8c5b119111a35ab8423c3cbde5b2a022badf;hp=77ef3a46731050256f8f4a5a23d2ee2956b5ffdf;hpb=53861faa5551606eea31588b65ba501b24fb2e1a;p=quassel.git

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 77ef3a46..d4e920ef 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,15 +18,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SIGNALPROXY_H
-#define SIGNALPROXY_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QEvent>
 #include <QSet>
-#include <QThreadStorage>
 
 #include <functional>
-#include <memory>
+#include <initializer_list>
 
 #include "protocol.h"
 
@@ -36,7 +36,7 @@ class QIODevice;
 class Peer;
 class SyncableObject;
 
-class SignalProxy : public QObject
+class COMMON_EXPORT SignalProxy : public QObject
 {
     Q_OBJECT
 
@@ -82,9 +82,7 @@ public:
     void dumpProxyStats();
     void dumpSyncMap(SyncableObject *object);
 
-    static SignalProxy *current() {
-        return _current;
-    }
+    static SignalProxy *current();
 
     /**@{*/
     /**
@@ -100,12 +98,10 @@ public:
     }
 
     //A better version, but only implemented on Qt5 if Initializer Lists exist
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #ifdef Q_COMPILER_INITIALIZER_LISTS
     void restrictTargetPeers(std::initializer_list<Peer*> peers, std::function<void()> closure) {
         restrictTargetPeers(QSet<Peer*>(peers), std::move(closure));
     }
-#endif
 #endif
     /**}@*/
 
@@ -221,8 +217,6 @@ private:
     Peer *_sourcePeer = nullptr;
     Peer *_targetPeer = nullptr;
 
-    thread_local static SignalProxy *_current;
-
     friend class SignalRelay;
     friend class SyncableObject;
     friend class Peer;
@@ -286,5 +280,3 @@ private:
     QHash<QByteArray, int> _methodIds;
     QHash<int, int> _receiveMap; // if slot x is called then hand over the result to slot y
 };
-
-#endif