From 6de2be92eff20e0c3d2e4a6350315b23061f675e Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 23 May 2018 23:08:54 +0200 Subject: [PATCH] common: Use override instead of virtual Avoids a warning for inconsistent overrides. This commit finishes up the giant rollup PR provided by @digitalcircuit to consolidate a number of conflicting and interdepending PRs. Thanks a lot for all the work! Closes GH-357. --- src/core/corebacklogmanager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/corebacklogmanager.h b/src/core/corebacklogmanager.h index f3148681..a86f4c0b 100644 --- a/src/core/corebacklogmanager.h +++ b/src/core/corebacklogmanager.h @@ -36,10 +36,10 @@ public: CoreSession *coreSession() { return _coreSession; } public slots: - virtual QVariantList requestBacklog(BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0); + QVariantList requestBacklog(BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0) override; QVariantList requestBacklogFiltered(BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0, int type = -1, int flags = -1) override; - virtual QVariantList requestBacklogAll(MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0); + QVariantList requestBacklogAll(MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0) override; QVariantList requestBacklogAllFiltered(MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0, int type = -1, int flags = -1) override; -- 2.20.1