X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuimessageprocessor.cpp;h=3aa3acd267b1bd7b189b19c14911cf7f8abadd72;hp=9bc1c8c36f74d391d98835d2bcec69e08bebf9d7;hb=5bd4e3fcf31a7a337f91b3bba86bd237aa5e7ed6;hpb=5910ce5b98f8752002a6a26199eac9a3c10cb9e7

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 9bc1c8c3..3aa3acd2 100644
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -31,9 +31,7 @@ const int progressUpdateDelay = 100;  // ms between progress signal updates
 QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent)
   : AbstractMessageProcessor(parent),
     _processing(false),
-    _processMode(TimerBased),
-    _msgsProcessed(0),
-    _msgCount(0)
+    _processMode(TimerBased)
 {
   NotificationSettings notificationSettings;
   _nicksCaseSensitive = notificationSettings.nicksCaseSensitive();
@@ -76,20 +74,17 @@ void QtUiMessageProcessor::process(QList<Message> &msgs) {
 
   if(msgs.isEmpty()) return;
   _processQueue.append(msgs);
-  _msgCount += msgs.count();
-  if(!isProcessing()) startProcessing();
-  else updateProgress();
+  if(!isProcessing())
+    startProcessing();
 }
 
 void QtUiMessageProcessor::startProcessing() {
   if(processMode() == TimerBased) {
-    if(_currentBatch.isEmpty() && _processQueue.isEmpty()) return;
+    if(_currentBatch.isEmpty() && _processQueue.isEmpty())
+      return;
     _processing = true;
-    _msgsProcessed = 0;
-    _msgCount = _currentBatch.count();
-    foreach(QList<Message> msglist, _processQueue) _msgCount += msglist.count();
-    updateProgress();
-    if(!_processTimer.isActive()) _processTimer.start();
+    if(!_processTimer.isActive())
+      _processTimer.start();
   }
 }
 
@@ -98,28 +93,12 @@ void QtUiMessageProcessor::processNextMessage() {
     if(_processQueue.isEmpty()) {
       _processTimer.stop();
       _processing = false;
-      _msgsProcessed = _msgCount = 0;
-      updateProgress();
       return;
     }
     _currentBatch = _processQueue.takeFirst();
   }
   Message msg = _currentBatch.takeFirst();
   process(msg);
-  _msgsProcessed++;
-  updateProgress();
-}
-
-void QtUiMessageProcessor::updateProgress(bool start) {
-  if(start) {
-    _progressTimer.start();
-    emit progressUpdated(_msgsProcessed, _msgCount);
-  } else {
-    if(_msgCount == 0 || _progressTimer.elapsed() >= progressUpdateDelay) {
-      _progressTimer.restart();
-      emit progressUpdated(_msgsProcessed, _msgCount);
-    }
-  }
 }
 
 void QtUiMessageProcessor::checkForHighlight(Message &msg) {