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 8047598..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"
@@ -234,6 +234,16 @@ class Core : public QObject {
      */
     static QList<BufferInfo> requestBuffers(UserId user);
 
+
+    //! Request a list of BufferIds for a given NetworkId
+    /** \note This method is threadsafe.
+    *
+    *  \param user  The user whose buffers we request
+    *  \param networkId  The NetworkId of the network in question
+    *  \return List of BufferIds belonging to the Network
+    */
+    static QList<BufferId> requestBufferIdsForNetwork(UserId user, NetworkId networkId);
+
     //! Remove permanently a buffer and it's content from the storage backend
     /** This call cannot be reverted!
      *  \note This method is threadsafe.
@@ -272,6 +282,8 @@ class Core : public QObject {
      */
     static QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
 
+  const QDateTime &startTime() const { return _startTime; }
+
   public slots:
     //! Make storage data persistent
     /** \note This method is threadsafe.
@@ -283,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();
@@ -291,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);
@@ -315,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;
@@ -326,7 +338,7 @@ class Core : public QObject {
 
     QHash<QString, Storage *> _storageBackends;
 
-    QDateTime startTime;
+    QDateTime _startTime;
 
     bool configured;