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
/
abstractsqlstorage.h
diff --git
a/src/core/abstractsqlstorage.h
b/src/core/abstractsqlstorage.h
index
d3fb792
..
431c7ef
100644
(file)
--- a/
src/core/abstractsqlstorage.h
+++ b/
src/core/abstractsqlstorage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
19
by the Quassel Project *
+ * Copyright (C) 2005-20
22
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 *
@@
-21,14
+21,18
@@
#pragma once
#include <memory>
#pragma once
#include <memory>
+#include <vector>
-#include <QList>
+#include <QHash>
+#include <QMutex>
#include <QSqlDatabase>
#include <QSqlError>
#include <QSqlQuery>
#include "storage.h"
#include <QSqlDatabase>
#include <QSqlError>
#include <QSqlQuery>
#include "storage.h"
+class QThread;
+
class AbstractSqlMigrationReader;
class AbstractSqlMigrationWriter;
class AbstractSqlMigrationReader;
class AbstractSqlMigrationWriter;
@@
-92,7
+96,7
@@
protected:
*
* @return List of SQL query strings and filenames
*/
*
* @return List of SQL query strings and filenames
*/
-
QList
<SqlQueryResource> setupQueries();
+
std::vector
<SqlQueryResource> setupQueries();
/**
* Gets the collection of SQL upgrade queries and filenames for a given schema version
/**
* Gets the collection of SQL upgrade queries and filenames for a given schema version
@@
-100,7
+104,7
@@
protected:
* @param ver SQL schema version
* @return List of SQL query strings and filenames
*/
* @param ver SQL schema version
* @return List of SQL query strings and filenames
*/
-
QList
<SqlQueryResource> upgradeQueries(int ver);
+
std::vector
<SqlQueryResource> upgradeQueries(int ver);
bool upgradeDb();
bool watchQuery(QSqlQuery& query);
bool upgradeDb();
bool watchQuery(QSqlQuery& query);
@@
-269,6
+273,7
@@
public:
QString awaymessage;
QString attachperform;
QString detachperform;
QString awaymessage;
QString attachperform;
QString detachperform;
+ QString skipcaps;
NetworkId networkid;
IdentityId identityid;
int messagerateburstsize;
NetworkId networkid;
IdentityId identityid;
int messagerateburstsize;