Verified Commit 41071331 authored by Jonah Brüchert's avatar Jonah Brüchert 🌳
Browse files

Use override in code from newly applied patches


Reviewed-by: Alexander Akulich's avatarAlexander Akulich <akulichalexander@gmail.com>
parent 1db2eb5c
......@@ -64,7 +64,7 @@ public:
const QList<Tp::ChannelPtr> &channels,
const Tp::ChannelDispatchOperationPtr &dispatchOperation,
const QList<Tp::ChannelRequestPtr> &requestsSatisfied,
const Tp::AbstractClientObserver::ObserverInfo &observerInfo);
const Tp::AbstractClientObserver::ObserverInfo &observerInfo) override;
private:
MainLogModel *m_model;
......@@ -93,11 +93,11 @@ public:
Q_ENUMS(Role)
MainLogModel(QObject *parent = 0);
~MainLogModel();
~MainLogModel() override;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
virtual QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QHash<int, QByteArray> roleNames() const override;
Q_INVOKABLE bool canChat(const QString &accountId) const;
Q_INVOKABLE void startChat(const QString &accountId, const QString &contactId);
......@@ -111,9 +111,9 @@ public:
const QList<Tp::ChannelPtr> &channels,
const QList<Tp::ChannelRequestPtr> &channelRequests,
const QDateTime &userActionTime,
const HandlerInfo &handlerInfo);
const HandlerInfo &handlerInfo) override;
bool bypassApproval() const;
bool bypassApproval() const override;
Q_SIGNALS:
void newRequestedChannel(const QModelIndex &index);
......
......@@ -34,7 +34,7 @@ class PendingTpLoggerDates : public KTp::PendingLoggerDates
explicit PendingTpLoggerDates(const Tp::AccountPtr &account,
const KTp::LogEntity &entity,
QObject *parent = 0);
virtual ~PendingTpLoggerDates();
~PendingTpLoggerDates() override;
private Q_SLOTS:
void datesRetrieved(Tpl::PendingOperation *op);
......
......@@ -33,7 +33,7 @@ class PendingTpLoggerEntities : public KTp::PendingLoggerEntities
public:
explicit PendingTpLoggerEntities(const Tp::AccountPtr &account,
QObject *parent = 0);
~PendingTpLoggerEntities();
~PendingTpLoggerEntities() override;
private Q_SLOTS:
void entitiesRetrieved(Tpl::PendingOperation *op);
......
......@@ -35,7 +35,7 @@ class PendingTpLoggerLogs : public KTp::PendingLoggerLogs
const KTp::LogEntity &entity,
const QDate &date,
QObject *parent = 0);
virtual ~PendingTpLoggerLogs();
~PendingTpLoggerLogs() override;
private Q_SLOTS:
void logsRetrieved(Tpl::PendingOperation *op);
......
......@@ -32,7 +32,7 @@ class PendingTpLoggerSearch : public KTp::PendingLoggerSearch
public:
explicit PendingTpLoggerSearch(const QString& term, QObject* parent = 0);
virtual ~PendingTpLoggerSearch();
~PendingTpLoggerSearch() override;
private Q_SLOTS:
void searchFinished(Tpl::PendingOperation *op);
......
......@@ -32,21 +32,21 @@ class TpLoggerPlugin : public KTp::AbstractLoggerPlugin
public:
explicit TpLoggerPlugin(QObject *parent, const QVariantList &);
virtual ~TpLoggerPlugin();
~TpLoggerPlugin() override;
KTp::PendingLoggerDates* queryDates(const Tp::AccountPtr &account,
const KTp::LogEntity &entity);
const KTp::LogEntity &entity) override;
KTp::PendingLoggerLogs* queryLogs(const Tp::AccountPtr &account,
const KTp::LogEntity &entity,
const QDate &date);
KTp::PendingLoggerEntities* queryEntities(const Tp::AccountPtr &account);
void clearAccountLogs(const Tp::AccountPtr &account);
const QDate &date) override;
KTp::PendingLoggerEntities* queryEntities(const Tp::AccountPtr &account) override;
void clearAccountLogs(const Tp::AccountPtr &account) override;
void clearContactLogs(const Tp::AccountPtr &account,
const KTp::LogEntity &entity);
KTp::PendingLoggerSearch* search(const QString &term);
bool logsExist(const Tp::AccountPtr &account, const KTp::LogEntity &contact);
const KTp::LogEntity &entity) override;
KTp::PendingLoggerSearch* search(const QString &term) override;
bool logsExist(const Tp::AccountPtr &account, const KTp::LogEntity &contact) override;
void setAccountManager(const Tp::AccountManagerPtr &accountManager);
void setAccountManager(const Tp::AccountManagerPtr &accountManager) override;
private Q_SLOTS:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment