projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clazy: Convert many old-style connects into function pointer based
[quassel.git]
/
src
/
core
/
abstractsqlstorage.h
diff --git
a/src/core/abstractsqlstorage.h
b/src/core/abstractsqlstorage.h
index
9c371ff
..
efd1ce3
100644
(file)
--- a/
src/core/abstractsqlstorage.h
+++ b/
src/core/abstractsqlstorage.h
@@
-37,21
+37,21
@@
class AbstractSqlStorage : public Storage
public:
AbstractSqlStorage(QObject *parent = nullptr);
public:
AbstractSqlStorage(QObject *parent = nullptr);
-
virtual ~AbstractSqlStorage()
;
+
~AbstractSqlStorage() override
;
virtual std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() { return {}; }
virtual std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() { return {}; }
public slots:
virtual std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() { return {}; }
virtual std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() { return {}; }
public slots:
-
virtual
State init(const QVariantMap &settings = QVariantMap(),
+ State init(const QVariantMap &settings = QVariantMap(),
const QProcessEnvironment &environment = {},
const QProcessEnvironment &environment = {},
- bool loadFromEnvironment = false);
-
virtual
bool setup(const QVariantMap &settings = QVariantMap(),
+ bool loadFromEnvironment = false)
override
;
+ bool setup(const QVariantMap &settings = QVariantMap(),
const QProcessEnvironment &environment = {},
const QProcessEnvironment &environment = {},
- bool loadFromEnvironment = false);
+ bool loadFromEnvironment = false)
override
;
protected:
protected:
- inline v
irtual void sync()
{};
+ inline v
oid sync() override
{};
QSqlDatabase logDb();
QSqlDatabase logDb();
@@
-112,7
+112,7
@@
private:
void addConnectionToPool();
void dbConnect(QSqlDatabase &db);
void addConnectionToPool();
void dbConnect(QSqlDatabase &db);
- int _schemaVersion;
+ int _schemaVersion
{0}
;
bool _debug;
static int _nextConnectionId;
bool _debug;
static int _nextConnectionId;
@@
-142,7
+142,7
@@
class AbstractSqlStorage::Connection : public QObject
public:
Connection(const QString &name, QObject *parent = nullptr);
public:
Connection(const QString &name, QObject *parent = nullptr);
- ~Connection();
+ ~Connection()
override
;
inline QLatin1String name() const { return QLatin1String(_name); }
inline QLatin1String name() const { return QLatin1String(_name); }
@@
-167,11
+167,10
@@
public:
};
struct SenderMO {
};
struct SenderMO {
- qint64 senderId;
+ qint64 senderId
{0}
;
QString sender;
QString realname;
QString avatarurl;
QString sender;
QString realname;
QString avatarurl;
- SenderMO() : senderId(0) {}
};
struct IdentityMO {
};
struct IdentityMO {
@@
-307,8
+306,7
@@
public:
CoreState
};
CoreState
};
- AbstractSqlMigrator();
- virtual ~AbstractSqlMigrator() {}
+ virtual ~AbstractSqlMigrator() = default;
static QString migrationObject(MigrationObject moType);
static QString migrationObject(MigrationObject moType);
@@
-332,7
+330,7
@@
protected:
virtual bool commit() = 0;
private:
virtual bool commit() = 0;
private:
- QSqlQuery *_query;
+ QSqlQuery *_query
{nullptr}
;
};
};
@@
-360,7
+358,7
@@
private:
template<typename T> bool transferMo(MigrationObject moType, T &mo);
template<typename T> bool transferMo(MigrationObject moType, T &mo);
- AbstractSqlMigrationWriter *_writer;
+ AbstractSqlMigrationWriter *_writer
{nullptr}
;
};
};