projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Prepare Quassel::quit() to be used more widely
[quassel.git]
/
src
/
core
/
abstractsqlstorage.h
diff --git
a/src/core/abstractsqlstorage.h
b/src/core/abstractsqlstorage.h
index
5e4c360
..
ffdd89c
100644
(file)
--- a/
src/core/abstractsqlstorage.h
+++ b/
src/core/abstractsqlstorage.h
@@
-167,7
+167,7
@@
public:
};
struct SenderMO {
};
struct SenderMO {
-
int
senderId;
+
qint64
senderId;
QString sender;
QString realname;
QString avatarurl;
QString sender;
QString realname;
QString avatarurl;
@@
-189,7
+189,7
@@
public:
bool autoAwayReasonEnabled;
bool detachAwayEnabled;
QString detachAwayReason;
bool autoAwayReasonEnabled;
bool detachAwayEnabled;
QString detachAwayReason;
- bool detchAwayReasonEnabled;
+ bool det
a
chAwayReasonEnabled;
QString ident;
QString kickReason;
QString partReason;
QString ident;
QString kickReason;
QString partReason;
@@
-205,37
+205,35
@@
public:
};
struct NetworkMO {
};
struct NetworkMO {
- NetworkId networkid;
UserId userid;
QString networkname;
UserId userid;
QString networkname;
- IdentityId identityid;
- QString encodingcodec;
- QString decodingcodec;
- QString servercodec;
- bool userandomserver;
QString perform;
QString perform;
- bool useautoidentify;
QString autoidentifyservice;
QString autoidentifypassword;
QString autoidentifyservice;
QString autoidentifypassword;
- bool useautoreconnect;
+ QString saslaccount;
+ QString saslpassword;
+ QString servercodec;
+ QString encodingcodec;
+ QString decodingcodec;
+ QString usermode;
+ QString awaymessage;
+ QString attachperform;
+ QString detachperform;
+ NetworkId networkid;
+ IdentityId identityid;
+ int messagerateburstsize;
+ int messageratedelay;
int autoreconnectinterval;
int autoreconnectretries;
int autoreconnectinterval;
int autoreconnectretries;
- bool unlimitedconnectretries;
bool rejoinchannels;
bool rejoinchannels;
- // Custom rate limiting
+ bool userandomserver;
+ bool useautoidentify;
+ bool usesasl;
+ bool useautoreconnect;
+ bool unlimitedconnectretries;
bool usecustommessagerate;
bool usecustommessagerate;
- int messagerateburstsize;
- int messageratedelay;
bool unlimitedmessagerate;
bool unlimitedmessagerate;
- // ...
bool connected;
bool connected;
- QString usermode;
- QString awaymessage;
- QString attachperform;
- QString detachperform;
- bool usesasl;
- QString saslaccount;
- QString saslpassword;
};
struct BufferMO {
};
struct BufferMO {
@@
-246,9
+244,9
@@
public:
QString buffername;
QString buffercname;
int buffertype;
QString buffername;
QString buffercname;
int buffertype;
-
int
lastmsgid;
-
int
lastseenmsgid;
-
int
markerlinemsgid;
+
qint64
lastmsgid;
+
qint64
lastseenmsgid;
+
qint64
markerlinemsgid;
int bufferactivity;
int highlightcount;
QString key;
int bufferactivity;
int highlightcount;
QString key;
@@
-262,7
+260,7
@@
public:
BufferId bufferid;
int type;
int flags;
BufferId bufferid;
int type;
int flags;
-
int
senderid;
+
qint64
senderid;
QString senderprefixes;
QString message;
};
QString senderprefixes;
QString message;
};