From feaa219d88fc4778ca787676e95ac99778df492b Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 19 Dec 2017 21:28:46 +0100 Subject: [PATCH] core: Fix inconsistent override/virtual usage Avoid compiler warnings due to this. Closes GH-301. --- src/core/postgresqlstorage.h | 164 +++++++++++++++++------------------ src/core/sqlitestorage.h | 146 +++++++++++++++---------------- 2 files changed, 151 insertions(+), 159 deletions(-) diff --git a/src/core/postgresqlstorage.h b/src/core/postgresqlstorage.h index 02aca2fb..e8f09ae1 100644 --- a/src/core/postgresqlstorage.h +++ b/src/core/postgresqlstorage.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef POSTGRESQLSTORAGE_H -#define POSTGRESQLSTORAGE_H +#pragma once #include "abstractsqlstorage.h" @@ -32,92 +31,92 @@ class PostgreSqlStorage : public AbstractSqlStorage public: PostgreSqlStorage(QObject *parent = 0); - virtual ~PostgreSqlStorage(); + ~PostgreSqlStorage() override; - virtual std::unique_ptr createMigrationWriter(); + std::unique_ptr createMigrationWriter() override; public slots: /* General */ - virtual bool isAvailable() const; - virtual QString backendId() const; - virtual QString displayName() const; - virtual QString description() const; - virtual QVariantList setupData() const; + bool isAvailable() const override; + QString backendId() const override; + QString displayName() const override; + QString description() const override; + QVariantList setupData() const override; // TODO: Add functions for configuring the backlog handling, i.e. defining auto-cleanup settings etc /* User handling */ - virtual UserId addUser(const QString &user, const QString &password, const QString &authenticator = "Database"); - virtual bool updateUser(UserId user, const QString &password); - virtual void renameUser(UserId user, const QString &newName); - virtual UserId validateUser(const QString &user, const QString &password); - virtual UserId getUserId(const QString &username); - virtual QString getUserAuthenticator(const UserId userid); - virtual UserId internalUser(); - virtual void delUser(UserId user); - virtual void setUserSetting(UserId userId, const QString &settingName, const QVariant &data); - virtual QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData = QVariant()); + UserId addUser(const QString &user, const QString &password, const QString &authenticator = "Database") override; + bool updateUser(UserId user, const QString &password) override; + void renameUser(UserId user, const QString &newName) override; + UserId validateUser(const QString &user, const QString &password) override; + UserId getUserId(const QString &username) override; + QString getUserAuthenticator(const UserId userid) override; + UserId internalUser() override; + void delUser(UserId user) override; + void setUserSetting(UserId userId, const QString &settingName, const QVariant &data) override; + QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData = QVariant()) override; /* Identity handling */ - virtual IdentityId createIdentity(UserId user, CoreIdentity &identity); - virtual bool updateIdentity(UserId user, const CoreIdentity &identity); - virtual void removeIdentity(UserId user, IdentityId identityId); - virtual QList identities(UserId user); + IdentityId createIdentity(UserId user, CoreIdentity &identity) override; + bool updateIdentity(UserId user, const CoreIdentity &identity) override; + void removeIdentity(UserId user, IdentityId identityId) override; + QList identities(UserId user) override; /* Network handling */ - virtual NetworkId createNetwork(UserId user, const NetworkInfo &info); - virtual bool updateNetwork(UserId user, const NetworkInfo &info); - virtual bool removeNetwork(UserId user, const NetworkId &networkId); - virtual QList networks(UserId user); - virtual QList connectedNetworks(UserId user); - virtual void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected); + NetworkId createNetwork(UserId user, const NetworkInfo &info) override; + bool updateNetwork(UserId user, const NetworkInfo &info) override; + bool removeNetwork(UserId user, const NetworkId &networkId) override; + QList networks(UserId user) override; + QList connectedNetworks(UserId user) override; + void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) override; /* persistent channels */ - virtual QHash persistentChannels(UserId user, const NetworkId &networkId); - virtual void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined); - virtual void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key); + QHash persistentChannels(UserId user, const NetworkId &networkId) override; + void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) override; + void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) override; /* persistent user states */ - virtual QString awayMessage(UserId user, NetworkId networkId); - virtual void setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg); - virtual QString userModes(UserId user, NetworkId networkId); - virtual void setUserModes(UserId user, NetworkId networkId, const QString &userModes); + QString awayMessage(UserId user, NetworkId networkId) override; + void setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg) override; + QString userModes(UserId user, NetworkId networkId) override; + void setUserModes(UserId user, NetworkId networkId, const QString &userModes) override; /* Buffer handling */ - virtual BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true); - virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId); - virtual QList requestBuffers(UserId user); - virtual QList requestBufferIdsForNetwork(UserId user, NetworkId networkId); - virtual bool removeBuffer(const UserId &user, const BufferId &bufferId); - virtual bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName); - virtual bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2); - virtual void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); - virtual QHash bufferLastSeenMsgIds(UserId user); - virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); - virtual QHash bufferMarkerLineMsgIds(UserId user); - virtual void setBufferActivity(UserId id, BufferId bufferId, Message::Types type); + BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true) override; + BufferInfo getBufferInfo(UserId user, const BufferId &bufferId) override; + QList requestBuffers(UserId user) override; + QList requestBufferIdsForNetwork(UserId user, NetworkId networkId) override; + bool removeBuffer(const UserId &user, const BufferId &bufferId) override; + bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) override; + bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) override; + void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) override; + QHash bufferLastSeenMsgIds(UserId user) override; + void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) override; + QHash bufferMarkerLineMsgIds(UserId user) override; + void setBufferActivity(UserId id, BufferId bufferId, Message::Types type) override; QHash bufferActivities(UserId id) override; Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) override; /* Message handling */ - virtual bool logMessage(Message &msg); - virtual bool logMessages(MessageList &msgs); - virtual QList requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1); - virtual QList requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1); + bool logMessage(Message &msg) override; + bool logMessages(MessageList &msgs) override; + QList requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1) override; + QList requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1) override; protected: - virtual bool initDbSession(QSqlDatabase &db); - virtual void setConnectionProperties(const QVariantMap &properties); - inline virtual QString driverName() { return "QPSQL"; } - inline virtual QString hostName() { return _hostName; } - inline virtual int port() { return _port; } - inline virtual QString databaseName() { return _databaseName; } - inline virtual QString userName() { return _userName; } - inline virtual QString password() { return _password; } - virtual int installedSchemaVersion(); - virtual bool updateSchemaVersion(int newVersion); - virtual bool setupSchemaVersion(int version); + bool initDbSession(QSqlDatabase &db) override; + void setConnectionProperties(const QVariantMap &properties) override; + QString driverName() override { return "QPSQL"; } + QString hostName() override { return _hostName; } + int port() override { return _port; } + QString databaseName() override { return _databaseName; } + QString userName() override { return _userName; } + QString password() override { return _password; } + int installedSchemaVersion() override; + bool updateSchemaVersion(int newVersion) override; + bool setupSchemaVersion(int version) override; void safeExec(QSqlQuery &query); bool beginTransaction(QSqlDatabase &db); @@ -127,15 +126,15 @@ protected: QSqlQuery executePreparedQuery(const QString &queryname, const QVariant ¶m, QSqlDatabase &db); void deallocateQuery(const QString &queryname, const QSqlDatabase &db); - inline void savePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("SAVEPOINT %1").arg(handle)); } - inline void rollbackSavePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("ROLLBACK TO SAVEPOINT %1").arg(handle)); } - inline void releaseSavePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("RELEASE SAVEPOINT %1").arg(handle)); } + void savePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("SAVEPOINT %1").arg(handle)); } + void rollbackSavePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("ROLLBACK TO SAVEPOINT %1").arg(handle)); } + void releaseSavePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("RELEASE SAVEPOINT %1").arg(handle)); } private: void bindNetworkInfo(QSqlQuery &query, const NetworkInfo &info); void bindServerInfo(QSqlQuery &query, const Network::Server &server); QSqlQuery prepareAndExecuteQuery(const QString &queryname, const QString ¶mstring, QSqlDatabase &db); - inline QSqlQuery prepareAndExecuteQuery(const QString &queryname, QSqlDatabase &db) { return prepareAndExecuteQuery(queryname, QString(), db); } + QSqlQuery prepareAndExecuteQuery(const QString &queryname, QSqlDatabase &db) { return prepareAndExecuteQuery(queryname, QString(), db); } QString _hostName; int _port; @@ -155,24 +154,24 @@ class PostgreSqlMigrationWriter : public PostgreSqlStorage, public AbstractSqlMi public: PostgreSqlMigrationWriter(); - virtual bool writeMo(const QuasselUserMO &user); - virtual bool writeMo(const SenderMO &sender); - virtual bool writeMo(const IdentityMO &identity); - virtual bool writeMo(const IdentityNickMO &identityNick); - virtual bool writeMo(const NetworkMO &network); - virtual bool writeMo(const BufferMO &buffer); - virtual bool writeMo(const BacklogMO &backlog); - virtual bool writeMo(const IrcServerMO &ircserver); - virtual bool writeMo(const UserSettingMO &userSetting); + bool writeMo(const QuasselUserMO &user) override; + bool writeMo(const SenderMO &sender) override; + bool writeMo(const IdentityMO &identity) override; + bool writeMo(const IdentityNickMO &identityNick) override; + bool writeMo(const NetworkMO &network) override; + bool writeMo(const BufferMO &buffer) override; + bool writeMo(const BacklogMO &backlog) override; + bool writeMo(const IrcServerMO &ircserver) override; + bool writeMo(const UserSettingMO &userSetting) override; - bool prepareQuery(MigrationObject mo); + bool prepareQuery(MigrationObject mo) override; - virtual bool postProcess(); + bool postProcess() override; protected: - virtual inline bool transaction() { return logDb().transaction(); } - virtual inline void rollback() { logDb().rollback(); } - virtual inline bool commit() { return logDb().commit(); } + inline bool transaction() override { return logDb().transaction(); } + inline void rollback() override { logDb().rollback(); } + inline bool commit() override { return logDb().commit(); } private: // helper struct @@ -184,6 +183,3 @@ private: QSet _validIdentities; }; - - -#endif diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h index 75e32f3a..3a1721dd 100644 --- a/src/core/sqlitestorage.h +++ b/src/core/sqlitestorage.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef SQLITESTORAGE_H -#define SQLITESTORAGE_H +#pragma once #include "abstractsqlstorage.h" @@ -33,87 +32,87 @@ class SqliteStorage : public AbstractSqlStorage public: SqliteStorage(QObject *parent = 0); - virtual ~SqliteStorage(); + ~SqliteStorage() override; - virtual std::unique_ptr createMigrationReader(); + std::unique_ptr createMigrationReader() override; public slots: /* General */ - bool isAvailable() const; - QString backendId() const; - QString displayName() const; - virtual inline QVariantList setupData() const { return {}; } - QString description() const; + bool isAvailable() const override; + QString backendId() const override; + QString displayName() const override; + QVariantList setupData() const override { return {}; } + QString description() const override; // TODO: Add functions for configuring the backlog handling, i.e. defining auto-cleanup settings etc /* User handling */ - virtual UserId addUser(const QString &user, const QString &password, const QString &authenticator = "Database"); - virtual bool updateUser(UserId user, const QString &password); - virtual void renameUser(UserId user, const QString &newName); - virtual UserId validateUser(const QString &user, const QString &password); - virtual UserId getUserId(const QString &username); - virtual QString getUserAuthenticator(const UserId userid); - virtual UserId internalUser(); - virtual void delUser(UserId user); - virtual void setUserSetting(UserId userId, const QString &settingName, const QVariant &data); - virtual QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData = QVariant()); + UserId addUser(const QString &user, const QString &password, const QString &authenticator = "Database") override; + bool updateUser(UserId user, const QString &password) override; + void renameUser(UserId user, const QString &newName) override; + UserId validateUser(const QString &user, const QString &password) override; + UserId getUserId(const QString &username) override; + QString getUserAuthenticator(const UserId userid) override; + UserId internalUser() override; + void delUser(UserId user) override; + void setUserSetting(UserId userId, const QString &settingName, const QVariant &data) override; + QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData = QVariant()) override; /* Identity handling */ - virtual IdentityId createIdentity(UserId user, CoreIdentity &identity); - virtual bool updateIdentity(UserId user, const CoreIdentity &identity); - virtual void removeIdentity(UserId user, IdentityId identityId); - virtual QList identities(UserId user); + IdentityId createIdentity(UserId user, CoreIdentity &identity) override; + bool updateIdentity(UserId user, const CoreIdentity &identity) override; + void removeIdentity(UserId user, IdentityId identityId) override; + QList identities(UserId user) override; /* Network handling */ - virtual NetworkId createNetwork(UserId user, const NetworkInfo &info); - virtual bool updateNetwork(UserId user, const NetworkInfo &info); - virtual bool removeNetwork(UserId user, const NetworkId &networkId); - virtual QList networks(UserId user); - virtual QList connectedNetworks(UserId user); - virtual void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected); + NetworkId createNetwork(UserId user, const NetworkInfo &info) override; + bool updateNetwork(UserId user, const NetworkInfo &info) override; + bool removeNetwork(UserId user, const NetworkId &networkId) override; + QList networks(UserId user) override; + QList connectedNetworks(UserId user) override; + void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) override; /* persistent channels */ - virtual QHash persistentChannels(UserId user, const NetworkId &networkId); - virtual void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined); - virtual void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key); + QHash persistentChannels(UserId user, const NetworkId &networkId) override; + void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) override; + void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) override; /* persistent user states */ - virtual QString awayMessage(UserId user, NetworkId networkId); - virtual void setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg); - virtual QString userModes(UserId user, NetworkId networkId); - virtual void setUserModes(UserId user, NetworkId networkId, const QString &userModes); + QString awayMessage(UserId user, NetworkId networkId) override; + void setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg) override; + QString userModes(UserId user, NetworkId networkId) override; + void setUserModes(UserId user, NetworkId networkId, const QString &userModes) override; /* Buffer handling */ - virtual BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true); - virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId); - virtual QList requestBuffers(UserId user); - virtual QList requestBufferIdsForNetwork(UserId user, NetworkId networkId); - virtual bool removeBuffer(const UserId &user, const BufferId &bufferId); - virtual bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName); - virtual bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2); - virtual void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); - virtual QHash bufferLastSeenMsgIds(UserId user); - virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); - virtual QHash bufferMarkerLineMsgIds(UserId user); - virtual void setBufferActivity(UserId id, BufferId bufferId, Message::Types type); + BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true) override; + BufferInfo getBufferInfo(UserId user, const BufferId &bufferId) override; + QList requestBuffers(UserId user) override; + QList requestBufferIdsForNetwork(UserId user, NetworkId networkId) override; + bool removeBuffer(const UserId &user, const BufferId &bufferId) override; + bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) override; + bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) override; + void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) override; + QHash bufferLastSeenMsgIds(UserId user) override; + void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) override; + QHash bufferMarkerLineMsgIds(UserId user) override; + void setBufferActivity(UserId id, BufferId bufferId, Message::Types type) override; QHash bufferActivities(UserId id) override; Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) override; /* Message handling */ - virtual bool logMessage(Message &msg); - virtual bool logMessages(MessageList &msgs); - virtual QList requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1); - virtual QList requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1); + bool logMessage(Message &msg) override; + bool logMessages(MessageList &msgs) override; + QList requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1) override; + QList requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1) override; protected: - inline virtual void setConnectionProperties(const QVariantMap & /* properties */) {} - inline virtual QString driverName() { return "QSQLITE"; } - inline virtual QString databaseName() { return backlogFile(); } - virtual int installedSchemaVersion(); - virtual bool updateSchemaVersion(int newVersion); - virtual bool setupSchemaVersion(int version); + void setConnectionProperties(const QVariantMap & /* properties */) override {} + QString driverName() override { return "QSQLITE"; } + QString databaseName() override { return backlogFile(); } + int installedSchemaVersion() override; + bool updateSchemaVersion(int newVersion) override; + bool setupSchemaVersion(int version) override; bool safeExec(QSqlQuery &query, int retryCount = 0); private: @@ -139,24 +138,24 @@ class SqliteMigrationReader : public SqliteStorage, public AbstractSqlMigrationR public: SqliteMigrationReader(); - virtual bool readMo(QuasselUserMO &user); - virtual bool readMo(SenderMO &sender); - virtual bool readMo(IdentityMO &identity); - virtual bool readMo(IdentityNickMO &identityNick); - virtual bool readMo(NetworkMO &network); - virtual bool readMo(BufferMO &buffer); - virtual bool readMo(BacklogMO &backlog); - virtual bool readMo(IrcServerMO &ircserver); - virtual bool readMo(UserSettingMO &userSetting); + bool readMo(QuasselUserMO &user) override; + bool readMo(SenderMO &sender) override; + bool readMo(IdentityMO &identity) override; + bool readMo(IdentityNickMO &identityNick) override; + bool readMo(NetworkMO &network) override; + bool readMo(BufferMO &buffer) override; + bool readMo(BacklogMO &backlog) override; + bool readMo(IrcServerMO &ircserver) override; + bool readMo(UserSettingMO &userSetting) override; - virtual bool prepareQuery(MigrationObject mo); + bool prepareQuery(MigrationObject mo) override; - inline int stepSize() { return 50000; } + int stepSize() { return 50000; } protected: - virtual inline bool transaction() { return logDb().transaction(); } - virtual inline void rollback() { logDb().rollback(); } - virtual inline bool commit() { return logDb().commit(); } + bool transaction() override { return logDb().transaction(); } + void rollback() override { logDb().rollback(); } + bool commit() override { return logDb().commit(); } private: void setMaxId(MigrationObject mo); @@ -168,6 +167,3 @@ inline std::unique_ptr SqliteStorage::createMigratio { return std::unique_ptr{new SqliteMigrationReader()}; } - - -#endif -- 2.20.1