X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=1288ae01df6920f54d81f4835e41377341e72ecd;hp=31d01be493c4cbdc36ed10b3cbb1b904d03da378;hb=52a7b4d0f289f075aa386445a47d876743bcb6d0;hpb=9f9d207ecf28dd5470ecef9d4076a3f447662a20

diff --git a/src/core/core.h b/src/core/core.h
index 31d01be4..1288ae01 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -26,8 +26,14 @@
 #include <QString>
 #include <QVariant>
 #include <QTimer>
-#include <QTcpServer>
+
+#ifndef QT_NO_OPENSSL
+#include <QSslSocket>
+#include "sslserver.h"
+#else
 #include <QTcpSocket>
+#include <QTcpServer>
+#endif
 
 #include "bufferinfo.h"
 #include "message.h"
@@ -53,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.
      *
@@ -179,7 +203,7 @@ class Core : public QObject {
      *  \param offset   Do not return (but DO count) messages with MsgId >= offset, if offset >= 0
      *  \return The requested list of messages
      */
-    static QList<Message> requestMsgs(BufferInfo buffer, int lastmsgs = -1, int offset = -1);
+    static QList<Message> requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1);
 
     //! Request messages stored in a given buffer since a certain point in time.
     /** \note This method is threadsafe.
@@ -189,7 +213,7 @@ class Core : public QObject {
      *  \param offset   Do not return messages with MsgId >= offset, if offset >= 0
      *  \return The requested list of messages
      */
-    static QList<Message> requestMsgs(BufferInfo buffer, QDateTime since, int offset = -1);
+    static QList<Message> requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset = -1);
 
     //! Request a range of messages stored in a given buffer.
     /** \note This method is threadsafe.
@@ -199,19 +223,26 @@ class Core : public QObject {
      *  \param last     Return messages with first <= MsgId <= last
      *  \return The requested list of messages
      */
-    static QList<Message> requestMsgRange(BufferInfo buffer, int first, int last);
+    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!
@@ -270,6 +301,11 @@ class Core : public QObject {
 
     bool initStorage(QVariantMap dbSettings, bool setup = false);
 
+#ifndef QT_NO_OPENSSL
+    void sslErrors(const QList<QSslError> &errors);
+#endif
+    void socketError(QAbstractSocket::SocketError);
+
   private:
     Core();
     ~Core();
@@ -289,7 +325,12 @@ class Core : public QObject {
     Storage *storage;
     QTimer _storageSyncTimer;
 
-    QTcpServer server; // TODO: implement SSL
+#ifndef QT_NO_OPENSSL  
+    SslServer server;
+#else
+    QTcpServer server;
+#endif  
+
     QHash<QTcpSocket *, quint32> blocksizes;
     QHash<QTcpSocket *, QVariantMap> clientInfo;