projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly provide MOC_DEFINES, use HAVE_SSL instead of QT_NO_OPENSSL. Should fix...
[quassel.git]
/
src
/
core
/
core.h
diff --git
a/src/core/core.h
b/src/core/core.h
index
1288ae0
..
fdcc291
100644
(file)
--- a/
src/core/core.h
+++ b/
src/core/core.h
@@
-27,12
+27,12
@@
#include <QVariant>
#include <QTimer>
#include <QVariant>
#include <QTimer>
-#if
ndef QT_NO_OPEN
SSL
-#include <QSslSocket>
-#include "sslserver.h"
+#if
def HAVE_
SSL
+#
include <QSslSocket>
+#
include "sslserver.h"
#else
#else
-#include <QTcpSocket>
-#include <QTcpServer>
+#
include <QTcpSocket>
+#
include <QTcpServer>
#endif
#include "bufferinfo.h"
#endif
#include "bufferinfo.h"
@@
-282,6
+282,8
@@
class Core : public QObject {
*/
static QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
*/
static QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
+ const QDateTime &startTime() const { return _startTime; }
+
public slots:
//! Make storage data persistent
/** \note This method is threadsafe.
public slots:
//! Make storage data persistent
/** \note This method is threadsafe.
@@
-293,7
+295,7
@@
class Core : public QObject {
void bufferInfoUpdated(UserId user, const BufferInfo &info);
private slots:
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();
void stopListening();
void incomingConnection();
void clientHasData();
@@
-301,7
+303,7
@@
class Core : public QObject {
bool initStorage(QVariantMap dbSettings, bool setup = false);
bool initStorage(QVariantMap dbSettings, bool setup = false);
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
void sslErrors(const QList<QSslError> &errors);
#endif
void socketError(QAbstractSocket::SocketError);
void sslErrors(const QList<QSslError> &errors);
#endif
void socketError(QAbstractSocket::SocketError);
@@
-325,7
+327,7
@@
class Core : public QObject {
Storage *storage;
QTimer _storageSyncTimer;
Storage *storage;
QTimer _storageSyncTimer;
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
SslServer server;
#else
QTcpServer server;
SslServer server;
#else
QTcpServer server;
@@
-336,7
+338,7
@@
class Core : public QObject {
QHash<QString, Storage *> _storageBackends;
QHash<QString, Storage *> _storageBackends;
- QDateTime startTime;
+ QDateTime
_
startTime;
bool configured;
bool configured;