X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.h;h=456f847255292e8615903d066bff1db46f0232c2;hb=145a52eb79fed146731f85c23b60f0609e40e785;hp=bcab1df7408d99d9273e410bb38541f94c9075b6;hpb=d030c159599a22c9023b8f0d34909d3277707f52;p=quassel.git

diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index bcab1df7..456f8472 100644
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,15 +22,10 @@
 
 #include <functional>
 
+#include <QSslError>
+#include <QSslSocket>
 #include <QTimer>
 
-#ifdef HAVE_SSL
-#    include <QSslError>
-#    include <QSslSocket>
-#else
-#    include <QTcpSocket>
-#endif
-
 #ifdef HAVE_QCA2
 #    include "cipher.h"
 #endif
@@ -141,7 +136,7 @@ public:
      *
      * @returns True if in progress, otherwise false
      */
-    inline bool capNegotiationInProgress() const { return (!_capsQueuedIndividual.empty() || !_capsQueuedBundled.empty()); }
+    inline bool capsPendingNegotiation() const { return (!_capsQueuedIndividual.empty() || !_capsQueuedBundled.empty()); }
 
     /**
      * Queues a capability to be requested.
@@ -476,9 +471,7 @@ private slots:
     void sendAutoWho();
     void startAutoWhoCycle();
 
-#ifdef HAVE_SSL
     void onSslErrors(const QList<QSslError>& errors);
-#endif
 
     /**
      * Check the message token bucket
@@ -513,14 +506,11 @@ private:
     bool _debugLogRawIrc;      ///< If true, include raw IRC socket messages in the debug log
     qint32 _debugLogRawNetId;  ///< Network ID for logging raw IRC socket messages, or -1 for all
 
-#ifdef HAVE_SSL
     QSslSocket socket;
-#else
-    QTcpSocket socket;
-#endif
     qint64 _socketId{0};
 
     CoreUserInputHandler* _userInputHandler;
+    MetricsServer* _metricsServer;
 
     QHash<QString, QString> _channelKeys;  // stores persistent channels and their passwords, if any