[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] utilities/queuemanager/main: factoring and simplification
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2012-12-10 12:25:39
Message-ID: 20121210122539.9485AA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 99f0f4528841e87b7fc12aa9323d65580011a694 by Gilles Caulier.
Committed on 10/12/2012 at 13:25.
Pushed by cgilles into branch 'master'.

factoring and simplification

M  +23   -46   utilities/queuemanager/main/queuemgrwindow.cpp
M  +0    -3    utilities/queuemanager/main/queuemgrwindow.h

http://commits.kde.org/digikam/99f0f4528841e87b7fc12aa9323d65580011a694

diff --git a/utilities/queuemanager/main/queuemgrwindow.cpp \
b/utilities/queuemanager/main/queuemgrwindow.cpp index 6fe7c1a..41df7e2 100644
--- a/utilities/queuemanager/main/queuemgrwindow.cpp
+++ b/utilities/queuemanager/main/queuemgrwindow.cpp
@@ -1063,11 +1063,20 @@ void QueueMgrWindow::slotHistoryEntryClicked(int queueId, \
qlonglong itemId)  
 void QueueMgrWindow::slotAction(const ActionData& ad)
 {
+    QueueListViewItem* const cItem = \
d->queuePool->currentQueue()->findItemByUrl(ad.fileUrl); +
     switch (ad.status)
     {
         case ActionData::BatchStarted:
         {
-            processing(ad.fileUrl);
+            if (cItem)
+            {
+                cItem->reset();
+                d->queuePool->currentQueue()->setCurrentItem(cItem);
+                d->queuePool->currentQueue()->scrollToItem(cItem);
+                d->queuePool->setItemBusy(cItem->info().id());
+                addHistoryMessage(cItem, i18n("Processing..."), \
DHistoryView::StartingEntry); +            }
             break;
         }
 
@@ -1079,18 +1088,22 @@ void QueueMgrWindow::slotAction(const ActionData& ad)
 
         case ActionData::BatchFailed:
         {
-            processingFailed(ad.fileUrl, ad.message);
+            if (cItem)
+            {
+                cItem->setCanceled();
+                addHistoryMessage(cItem, i18n("Failed to process item..."), \
DHistoryView::ErrorEntry); +                addHistoryMessage(cItem, ad.message, \
DHistoryView::ErrorEntry); +            }
             break;
         }
 
         case ActionData::BatchCanceled:
         {
-            processingCanceled(ad.fileUrl);
-            break;
-        }
-
-        case ActionData::TaskStarted:
-        {
+            if (cItem)
+            {
+                cItem->setCanceled();
+                addHistoryMessage(cItem, i18n("Process Cancelled..."), \
DHistoryView::CancelEntry); +            }
             break;
         }
 
@@ -1112,7 +1125,8 @@ void QueueMgrWindow::slotAction(const ActionData& ad)
             break;
         }
 
-        default:    // NONE
+        case ActionData::TaskStarted:
+        default:         // NONE
         {
             break;
         }
@@ -1194,43 +1208,6 @@ void QueueMgrWindow::processed(const KUrl& url, const KUrl& \
tmp)  }
 }
 
-void QueueMgrWindow::processing(const KUrl& url)
-{
-    QueueListViewItem* const cItem = \
                d->queuePool->currentQueue()->findItemByUrl(url);
-
-    if (cItem)
-    {
-        cItem->reset();
-        d->queuePool->currentQueue()->setCurrentItem(cItem);
-        d->queuePool->currentQueue()->scrollToItem(cItem);
-        d->queuePool->setItemBusy(cItem->info().id());
-        addHistoryMessage(cItem, i18n("Processing..."), \
                DHistoryView::StartingEntry);
-    }
-}
-
-void QueueMgrWindow::processingFailed(const KUrl& url, const QString& errMsg)
-{
-    QueueListViewItem* const cItem = \
                d->queuePool->currentQueue()->findItemByUrl(url);
-
-    if (cItem)
-    {
-        cItem->setCanceled();
-        addHistoryMessage(cItem, i18n("Failed to process item..."), \
                DHistoryView::ErrorEntry);
-        addHistoryMessage(cItem, errMsg, DHistoryView::ErrorEntry);
-    }
-}
-
-void QueueMgrWindow::processingCanceled(const KUrl& url)
-{
-    QueueListViewItem* const cItem = \
                d->queuePool->currentQueue()->findItemByUrl(url);
-
-    if (cItem)
-    {
-        cItem->setCanceled();
-        addHistoryMessage(cItem, i18n("Process Cancelled..."), \
                DHistoryView::CancelEntry);
-    }
-}
-
 void QueueMgrWindow::addHistoryMessage(QueueListViewItem* const cItem, const \
QString& msg, DHistoryView::EntryType type)  {
     if (cItem)
diff --git a/utilities/queuemanager/main/queuemgrwindow.h \
b/utilities/queuemanager/main/queuemgrwindow.h index 1ff7c9b..221f533 100644
--- a/utilities/queuemanager/main/queuemgrwindow.h
+++ b/utilities/queuemanager/main/queuemgrwindow.h
@@ -112,10 +112,7 @@ private:
     bool checkTargetAlbum(int queueId);
     void busy(bool busy);
     void processOneQueue();
-    void processing(const KUrl& url);
     void processed(const KUrl& url, const KUrl& tmp);
-    void processingFailed(const KUrl& url, const QString& errMsg);
-    void processingCanceled(const KUrl& url);
     void processingAborted();
 
     QueueMgrWindow();


[prev in list] [next in list] [prev in thread] [next in thread]