Add accessor to check if a filter accepts a given BufferId

[quassel.git] / src / core / core.h

diff --git a/src/core/core.h b/src/core/core.h
index e6da7ab..eddaf7f 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -27,12 +27,12 @@
 #include <QVariant>
 #include <QTimer>
 
-#ifndef QT_NO_OPENSSL
-#include <QSslSocket>
-#include "sslserver.h"
+#ifdef HAVE_SSL
+#  include <QSslSocket>
+#  include "sslserver.h"
 #else
-#include <QTcpSocket>
-#include <QTcpServer>
+#  include <QTcpSocket>
+#  include <QTcpServer>
 #endif
 
 #include "bufferinfo.h"
@@ -295,7 +295,7 @@ class Core : public QObject {
     void bufferInfoUpdated(UserId user, const BufferInfo &info);
 
   private slots:
-    bool startListening(uint port = Global::defaultPort);
+    bool startListening(uint port = Global::parser.value("port").toUInt());
     void stopListening();
     void incomingConnection();
     void clientHasData();
@@ -303,7 +303,7 @@ class Core : public QObject {
 
     bool initStorage(QVariantMap dbSettings, bool setup = false);
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
     void sslErrors(const QList<QSslError> &errors);
 #endif
     void socketError(QAbstractSocket::SocketError);
@@ -327,10 +327,10 @@ class Core : public QObject {
     Storage *storage;
     QTimer _storageSyncTimer;
 
-#ifndef QT_NO_OPENSSL  
-    SslServer server;
+#ifdef HAVE_SSL  
+  SslServer _server, _v6server;
 #else
-    QTcpServer server;
+  QTcpServer _server, _v6server;
 #endif  
 
     QHash<QTcpSocket *, quint32> blocksizes;