projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branch "sput" r56:61 back into trunk.
[quassel.git]
/
core
/
core.h
diff --git
a/core/core.h
b/core/core.h
index
b2a3125
..
6417825
100644
(file)
--- a/
core/core.h
+++ b/
core/core.h
@@
-24,6
+24,7
@@
#include <QMap>
#include <QString>
#include <QVariant>
#include <QMap>
#include <QString>
#include <QVariant>
+#include <QSqlDatabase>
#include "server.h"
#include "server.h"
@@
-66,9
+67,13
@@
class Core : public QObject {
QHash<QString, QDate> logFileDates;
QHash<QString, QDir> logFileDirs;
QHash<QString, QDate> logFileDates;
QHash<QString, QDir> logFileDirs;
+ QSqlDatabase logDb;
+
//uint getNetIdx(QString net);
void initBackLog();
//uint getNetIdx(QString net);
void initBackLog();
+ void initBackLogOld();
void logMessage(QString, Message);
void logMessage(QString, Message);
+ void logMessageOld(QString, Message);
};
};