X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=eddaf7f3d8b2561602bcee58a6795c91eb5787a9;hb=85b55cf023c96f4dbd61ec415a15214f99e281b3;hp=f32502e739fc5bb83275a65e7c797f88937a0ace;hpb=9a36f8e55bfa485467e093fba669841fdfacda2f;p=quassel.git

diff --git a/src/core/core.h b/src/core/core.h
index f32502e7..eddaf7f3 100644
--- 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"
@@ -59,6 +59,24 @@ class Core : public QObject {
     /*** Storage access ***/
     // These methods are threadsafe.
 
+    //! Store a user setting persistently
+    /**
+     * \param userId       The users Id
+     * \param settingName  The Name of the Setting
+     * \param data         The Value
+     */
+    static void setUserSetting(UserId userId, const QString &settingName, const QVariant &data);
+  
+    //! Retrieve a persistent user setting
+    /**
+     * \param userId       The users Id
+     * \param settingName  The Name of the Setting
+     * \param default      Value to return in case it's unset.
+     * \return the Value of the Setting or the default value if it is unset.
+     */
+    static QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &data = QVariant());
+
+  
     //! Create a Network in the Storage and store it's Id in the given NetworkInfo
     /** \note This method is thredsafe.
      *
@@ -207,17 +225,24 @@ class Core : public QObject {
      */
     static QList<Message> requestMsgRange(UserId user, BufferId buffer, int first, int last);
 
-    //! Request a list of all buffers known to a user since a certain point in time.
+    //! Request a list of all buffers known to a user.
     /** This method is used to get a list of all buffers we have stored a backlog from.
-     *  Optionally, a QDateTime can be given, so that only buffers are listed that were active
-     *  since that point in time.
      *  \note This method is threadsafe.
      *
      *  \param user  The user whose buffers we request
-     *  \param since If this is defined, older buffers will be ignored
      *  \return A list of the BufferInfos for all buffers as requested
      */
-    static QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
+    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!
@@ -257,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.
@@ -268,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();
@@ -276,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);
@@ -300,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;
@@ -311,7 +338,7 @@ class Core : public QObject {
 
     QHash<QString, Storage *> _storageBackends;
 
-    QDateTime startTime;
+    QDateTime _startTime;
 
     bool configured;