X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fpostgresqlstorage.cpp;h=715442dc39688340d90744e6daffdd9d9f55539d;hb=3bf86a5278e26bec5e708a566e6926125f1941f0;hp=1adb749b470c9827b4cb8c5f5c0ee82e0a7024fc;hpb=e5d6f457a0f3eef578dcb9d7e4a3db61826dc232;p=quassel.git

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 1adb749b..715442dc 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1386,21 +1386,21 @@ QHash<BufferId, MsgId> PostgreSqlStorage::bufferMarkerLineMsgIds(UserId user)
 }
 
 
-void PostgreSqlStorage::setBufferActivity(UserId user, const BufferId &bufferId, const int &bufferActivity)
+void PostgreSqlStorage::setBufferActivity(UserId user, BufferId bufferId, Message::Types bufferActivity)
 {
     QSqlQuery query(logDb());
     query.prepare(queryString("update_buffer_bufferactivity"));
 
     query.bindValue(":userid", user.toInt());
     query.bindValue(":bufferid", bufferId.toInt());
-    query.bindValue(":bufferactivity", bufferActivity);
+    query.bindValue(":bufferactivity", (int) bufferActivity);
     safeExec(query);
     watchQuery(query);
 }
 
-QHash<BufferId, int> PostgreSqlStorage::bufferActivities(UserId user)
+QHash<BufferId, Message::Types> PostgreSqlStorage::bufferActivities(UserId user)
 {
-    QHash<BufferId, int> bufferActivityHash;
+    QHash<BufferId, Message::Types> bufferActivityHash;
 
     QSqlDatabase db = logDb();
     if (!beginReadOnlyTransaction(db)) {
@@ -1410,7 +1410,7 @@ QHash<BufferId, int> PostgreSqlStorage::bufferActivities(UserId user)
     }
 
     QSqlQuery query(db);
-    query.prepare(queryString("select_buffer_bufferactivity"));
+    query.prepare(queryString("select_buffer_bufferactivities"));
     query.bindValue(":userid", user.toInt());
     safeExec(query);
     if (!watchQuery(query)) {
@@ -1419,14 +1419,14 @@ QHash<BufferId, int> PostgreSqlStorage::bufferActivities(UserId user)
     }
 
     while (query.next()) {
-        bufferActivityHash[query.value(0).toInt()] = (Message::Type) query.value(1).toInt();
+        bufferActivityHash[query.value(0).toInt()] = Message::Types(query.value(1).toInt());
     }
 
     db.commit();
     return bufferActivityHash;
 }
 
-int PostgreSqlStorage::bufferActivity(BufferId &bufferId, MsgId &lastSeenMsgId)
+Message::Types PostgreSqlStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMsgId)
 {
     QSqlQuery query(logDb());
     query.prepare(queryString("select_buffer_bufferactivity"));
@@ -1434,9 +1434,9 @@ int PostgreSqlStorage::bufferActivity(BufferId &bufferId, MsgId &lastSeenMsgId)
     query.bindValue(":lastseenmsgid", lastSeenMsgId.toInt());
     safeExec(query);
     watchQuery(query);
-    int result = 0;
+    Message::Types result = Message::Types(0);
     if (query.first())
-        result = query.value(0).toInt();
+        result = Message::Types(query.value(0).toInt());
     return result;
 }
 
@@ -1685,7 +1685,7 @@ QList<Message> PostgreSqlStorage::requestAllMsgs(UserId user, MsgId first, MsgId
 
     QDateTime timestamp;
     for (int i = 0; i < limit && query.next(); i++) {
-        timestamp = query.value(1).toDateTime();
+        timestamp = query.value(2).toDateTime();
         timestamp.setTimeSpec(Qt::UTC);
         Message msg(timestamp,
             bufferInfoHash[query.value(1).toInt()],