projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use '= default' instead of empty ctor/dtor bodies
[quassel.git]
/
src
/
core
/
abstractsqlstorage.h
diff --git
a/src/core/abstractsqlstorage.h
b/src/core/abstractsqlstorage.h
index
5d77cf3
..
efd1ce3
100644
(file)
--- a/
src/core/abstractsqlstorage.h
+++ b/
src/core/abstractsqlstorage.h
@@
-36,22
+36,22
@@
class AbstractSqlStorage : public Storage
Q_OBJECT
public:
Q_OBJECT
public:
- AbstractSqlStorage(QObject *parent =
0
);
-
virtual ~AbstractSqlStorage()
;
+ AbstractSqlStorage(QObject *parent =
nullptr
);
+
~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;
@@
-141,8
+141,8
@@
class AbstractSqlStorage::Connection : public QObject
Q_OBJECT
public:
Q_OBJECT
public:
- Connection(const QString &name, QObject *parent =
0
);
- ~Connection();
+ Connection(const QString &name, QObject *parent =
nullptr
);
+ ~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 {
@@
-205,37
+204,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 {
@@
-309,8
+306,7
@@
public:
CoreState
};
CoreState
};
- AbstractSqlMigrator();
- virtual ~AbstractSqlMigrator() {}
+ virtual ~AbstractSqlMigrator() = default;
static QString migrationObject(MigrationObject moType);
static QString migrationObject(MigrationObject moType);
@@
-334,7
+330,7
@@
protected:
virtual bool commit() = 0;
private:
virtual bool commit() = 0;
private:
- QSqlQuery *_query;
+ QSqlQuery *_query
{nullptr}
;
};
};
@@
-362,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}
;
};
};