projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: avoid de-duplication of user's CXXFLAGS
[quassel.git]
/
src
/
core
/
sqlitestorage.cpp
diff --git
a/src/core/sqlitestorage.cpp
b/src/core/sqlitestorage.cpp
index
8ee8f88
..
3ca0344
100644
(file)
--- a/
src/core/sqlitestorage.cpp
+++ b/
src/core/sqlitestorage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-202
0
by the Quassel Project *
+ * Copyright (C) 2005-202
2
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 *
@@
-1401,7
+1401,7
@@
bool SqliteStorage::renameBuffer(const UserId& user, const BufferId& bufferId, c
safeExec(query);
error = query.lastError().isValid();
safeExec(query);
error = query.lastError().isValid();
- // unex
epcted error occu
red (19 == constraint violation)
+ // unex
pected error occur
red (19 == constraint violation)
if (error && query.lastError().nativeErrorCode() != QLatin1String{"19"}) {
watchQuery(query);
}
if (error && query.lastError().nativeErrorCode() != QLatin1String{"19"}) {
watchQuery(query);
}
@@
-1652,7
+1652,7
@@
Message::Types SqliteStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMs
QSqlDatabase db = logDb();
db.transaction();
QSqlDatabase db = logDb();
db.transaction();
- Message::Types result
= Message::Types(nullptr)
;
+ Message::Types result
{}
;
{
QSqlQuery query(db);
query.prepare(queryString("select_buffer_bufferactivity"));
{
QSqlQuery query(db);
query.prepare(queryString("select_buffer_bufferactivity"));