projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor bugfix: ssl/no-ssl icons will only be displayed when connected
[quassel.git]
/
src
/
core
/
core.h
diff --git
a/src/core/core.h
b/src/core/core.h
index
277c43c
..
5a125a4
100644
(file)
--- a/
src/core/core.h
+++ b/
src/core/core.h
@@
-26,14
+26,19
@@
#include <QString>
#include <QVariant>
#include <QTimer>
#include <QString>
#include <QVariant>
#include <QTimer>
-#include <QTcpSocket>
+
+#ifndef QT_NO_OPENSSL
#include <QSslSocket>
#include <QSslSocket>
+#include "sslserver.h"
+#else
+#include <QTcpSocket>
+#include <QTcpServer>
+#endif
#include "bufferinfo.h"
#include "message.h"
#include "global.h"
#include "sessionthread.h"
#include "bufferinfo.h"
#include "message.h"
#include "global.h"
#include "sessionthread.h"
-#include "sslserver.h"
#include "types.h"
class CoreSession;
#include "types.h"
class CoreSession;
@@
-202,17
+207,14
@@
class Core : public QObject {
*/
static QList<Message> requestMsgRange(UserId user, BufferId 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.
/** 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
* \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
*/
* \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);
//! Remove permanently a buffer and it's content from the storage backend
/** This call cannot be reverted!
//! Remove permanently a buffer and it's content from the storage backend
/** This call cannot be reverted!
@@
-271,7
+273,9
@@
class Core : public QObject {
bool initStorage(QVariantMap dbSettings, bool setup = false);
bool initStorage(QVariantMap dbSettings, bool setup = false);
+#ifndef QT_NO_OPENSSL
void sslErrors(const QList<QSslError> &errors);
void sslErrors(const QList<QSslError> &errors);
+#endif
void socketError(QAbstractSocket::SocketError);
private:
void socketError(QAbstractSocket::SocketError);
private: