Readd files lost during rebasing, fix minor issues

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

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 089f3e7..04381e2 100644 (file)
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -97,9 +97,9 @@ public slots:
     virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
     virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
     virtual QHash<BufferId, MsgId> bufferMarkerLineMsgIds(UserId user);
-    virtual void setBufferActivity(UserId id, const BufferId &bufferId, const int &type);
-    virtual QHash<BufferId, int> bufferActivities(UserId id);
-    virtual int bufferActivity(BufferId &bufferId, MsgId &lastSeenMsgId);
+    virtual void setBufferActivity(UserId id, const BufferId &bufferId, const Message::Types &type);
+    virtual QHash<BufferId, Message::Types> bufferActivities(UserId id) override;
+    virtual Message::Types bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId);
 
     /* Message handling */
     virtual bool logMessage(Message &msg);