projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ok this is the major rework of quassel we've all been waiting for. For the actual...
[quassel.git]
/
src
/
core
/
storage.cpp
diff --git
a/src/core/storage.cpp
b/src/core/storage.cpp
index
3c16dd3
..
e7dcea5
100644
(file)
--- a/
src/core/storage.cpp
+++ b/
src/core/storage.cpp
@@
-31,7
+31,7
@@
void Storage::importOldBacklog() {
logDb.exec(QString("DELETE FROM 'Backlog$%1$' WHERE SenderId != '$VERSION$'").arg(user));
logDb.exec(QString("DELETE FROM 'Senders$%1$'").arg(user));
logDb.exec(QString("DELETE FROM 'Buffers$%1$'").arg(user));
logDb.exec(QString("DELETE FROM 'Backlog$%1$' WHERE SenderId != '$VERSION$'").arg(user));
logDb.exec(QString("DELETE FROM 'Senders$%1$'").arg(user));
logDb.exec(QString("DELETE FROM 'Buffers$%1$'").arg(user));
- nextMsgId = 1; nextBufferI
d
= 1; nextSenderId = 1;
+ nextMsgId = 1; nextBufferI
nfo
= 1; nextSenderId = 1;
qDebug() << "Importing old backlog files...";
initBackLogOld();
if(!backLogEnabledOld) return;
qDebug() << "Importing old backlog files...";
initBackLogOld();
if(!backLogEnabledOld) return;
@@
-98,11
+98,11
@@
void Storage::initBackLogOld(UserId uid) {
QString target = QString::fromUtf8(targ);
QString sender = QString::fromUtf8(s);
QString text = QString::fromUtf8(m);
QString target = QString::fromUtf8(targ);
QString sender = QString::fromUtf8(s);
QString text = QString::fromUtf8(m);
- BufferI
d
id;
+ BufferI
nfo
id;
if((f & Message::PrivMsg) && !(f & Message::Self)) {
if((f & Message::PrivMsg) && !(f & Message::Self)) {
- id = getBufferI
d
(uid, net, sender);
+ id = getBufferI
nfo
(uid, net, sender);
} else {
} else {
- id = getBufferI
d
(uid, net, target);
+ id = getBufferI
nfo
(uid, net, target);
}
Message msg(QDateTime::fromTime_t(ts), id, (Message::Type)t, text, sender, f);
//backLog[net].append(m);
}
Message msg(QDateTime::fromTime_t(ts), id, (Message::Type)t, text, sender, f);
//backLog[net].append(m);