common: Simplify SyncableObject macros and usage

[quassel.git] / src / core / corebacklogmanager.h

diff --git a/src/core/corebacklogmanager.h b/src/core/corebacklogmanager.h
index cda1e63..801ca78 100644 (file)
--- a/src/core/corebacklogmanager.h
+++ b/src/core/corebacklogmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREBACKLOGMANAGER_H
-#define COREBACKLOGMANAGER_H
+#pragma once
 
 #include "backlogmanager.h"
 
@@ -27,8 +26,7 @@ class CoreSession;
 
 class CoreBacklogManager : public BacklogManager
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
     CoreBacklogManager(CoreSession *coreSession = 0);
@@ -36,12 +34,13 @@ public:
     CoreSession *coreSession() { return _coreSession; }
 
 public slots:
-    virtual QVariantList requestBacklog(BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0);
-    virtual QVariantList requestBacklogAll(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;
+    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;
 
 private:
     CoreSession *_coreSession;
 };
-
-
-#endif // COREBACKLOGMANAGER_H