fixed renaming issue for queries

[quassel.git] / src / core / core.cpp

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 98a4a83..b7714e3 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -65,7 +65,7 @@ void Core::init() {
   CoreSettings cs;
 
   if(!(configured = initStorage(cs.storageSettings().toMap()))) {
-    qWarning("Core is currently not configured!");
+    qWarning("Core is currently not configured! Please connect with a Quassel Client for basic setup.");
 
     // try to migrate old settings
     QVariantMap old = cs.oldDbSettings().toMap();
@@ -105,7 +105,7 @@ void Core::saveState() {
 
 void Core::restoreState() {
   if(!instance()->configured) {
-    qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
+    // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
     return;
   }
   if(instance()->sessions.count()) {
@@ -305,14 +305,14 @@ BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, cons
   return instance()->storage->renameBuffer(user, networkId, newName, oldName);
 }
 
-void Core::setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate) {
+void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->setBufferLastSeen(user, bufferId, seenDate);
+  return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId);
 }
 
-QHash<BufferId, QDateTime> Core::bufferLastSeenDates(UserId user) {
+QHash<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->bufferLastSeenDates(user);
+  return instance()->storage->bufferLastSeenMsgIds(user);
 }
 
 /*** Network Management ***/
@@ -377,7 +377,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     int updays = uptime / 86400; uptime %= 86400;
     int uphours = uptime / 3600; uptime %= 3600;
     int upmins = uptime / 60;
-    reply["CoreInfo"] = tr("<b>Quassel Core Version %1 (Build >= %2)</b><br>"
+    reply["CoreInfo"] = tr("<b>Quassel Core Version %1 (Build &ge; %2)</b><br>"
                             "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuild)
                             .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));