projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix expanding networks in Chat Monitor settings
[quassel.git]
/
src
/
core
/
abstractsqlstorage.h
diff --git
a/src/core/abstractsqlstorage.h
b/src/core/abstractsqlstorage.h
index
104c056
..
fc1f67e
100644
(file)
--- a/
src/core/abstractsqlstorage.h
+++ b/
src/core/abstractsqlstorage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-80,13
+80,14
@@
protected:
* When reimplementing this method, don't use logDB() inside this function as
* this would cause as we're just about to initialize that DB connection.
*/
* When reimplementing this method, don't use logDB() inside this function as
* this would cause as we're just about to initialize that DB connection.
*/
- inline virtual
void initDbSession(QSqlDatabase & /* db */) {
}
+ inline virtual
bool initDbSession(QSqlDatabase & /* db */) { return true;
}
private slots:
void connectionDestroyed();
private:
void addConnectionToPool();
private slots:
void connectionDestroyed();
private:
void addConnectionToPool();
+ void dbConnect(QSqlDatabase &db);
int _schemaVersion;
bool _debug;
int _schemaVersion;
bool _debug;
@@
-130,6
+131,7
@@
public:
UserId id;
QString username;
QString password;
UserId id;
QString username;
QString password;
+ int hashversion;
};
struct SenderMO {
};
struct SenderMO {
@@
-186,6
+188,12
@@
public:
int autoreconnectretries;
bool unlimitedconnectretries;
bool rejoinchannels;
int autoreconnectretries;
bool unlimitedconnectretries;
bool rejoinchannels;
+ // Custom rate limiting
+ bool usecustommessagerate;
+ int messagerateburstsize;
+ int messageratedelay;
+ bool unlimitedmessagerate;
+ // ...
bool connected;
QString usermode;
QString awaymessage;
bool connected;
QString usermode;
QString awaymessage;
@@
-204,6
+212,7
@@
public:
QString buffername;
QString buffercname;
int buffertype;
QString buffername;
QString buffercname;
int buffertype;
+ int lastmsgid;
int lastseenmsgid;
int markerlinemsgid;
QString key;
int lastseenmsgid;
int markerlinemsgid;
QString key;
@@
-228,6
+237,7
@@
public:
int port;
QString password;
bool ssl;
int port;
QString password;
bool ssl;
+ bool sslverify; /// If true, validate SSL certificates
int sslversion;
bool useproxy;
int proxytype;
int sslversion;
bool useproxy;
int proxytype;