[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/utilities/queuemanager
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2010-09-14 8:22:12
Message-ID: 20100914082212.26D26AC888 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1175110 by cgilles:
polish
M +12 -12 actionthread.cpp
M +4 -4 assignedlist.cpp
M +7 -5 batchtool.h
M +2 -2 queuelist.cpp
M +4 -4 queuemgrwindow.cpp
M +1 -1 queuepool.cpp
--- trunk/extragear/graphics/digikam/utilities/queuemanager/actionthread.cpp \
#1175109:1175110 @@ -158,7 +158,7 @@
if (t)
{
ActionData ad1;
- ad1.fileUrl = t->item.itemUrl;
+ ad1.fileUrl = t->item.m_itemUrl;
ad1.status = ActionData::BatchStarted;
emit starting(ad1);
@@ -167,13 +167,13 @@
d->cancel = false;
int index = 0;
bool success = false;
- KUrl outUrl = t->item.itemUrl;
+ KUrl outUrl = t->item.m_itemUrl;
KUrl inUrl;
KUrl::List tmp2del;
DImg tmpImage;
- for (BatchToolMap::const_iterator it = t->item.toolsMap.constBegin();
- !d->cancel && (it != t->item.toolsMap.constEnd()) ; ++it)
+ for (BatchToolMap::const_iterator it = t->item.m_toolsMap.constBegin();
+ !d->cancel && (it != t->item.m_toolsMap.constEnd()) ; ++it)
{
index = it.key();
BatchToolSet set = it.value();
@@ -184,7 +184,7 @@
kDebug() << "Tool Index: " << index;
ActionData ad2;
- ad2.fileUrl = t->item.itemUrl;
+ ad2.fileUrl = t->item.m_itemUrl;
ad2.status = ActionData::TaskStarted;
ad2.index = index;
emit finished(ad2);
@@ -193,7 +193,7 @@
d->tool->setWorkingUrl(d->workingUrl);
d->tool->setRawDecodingSettings(d->rawDecodingSettings);
d->tool->setResetExifOrientationAllowed(d->exifSetOrientation);
- d->tool->setLastChainedTool(index == t->item.toolsMap.count());
+ d->tool->setLastChainedTool(index == t->item.m_toolsMap.count());
d->tool->setInputUrl(inUrl);
d->tool->setSettings(settings);
d->tool->setInputUrl(inUrl);
@@ -208,7 +208,7 @@
if (success && !d->cancel)
{
ActionData ad3;
- ad3.fileUrl = t->item.itemUrl;
+ ad3.fileUrl = t->item.m_itemUrl;
ad3.status = ActionData::TaskDone;
ad3.index = index;
emit finished(ad3);
@@ -216,13 +216,13 @@
else if (d->cancel)
{
ActionData ad4;
- ad4.fileUrl = t->item.itemUrl;
+ ad4.fileUrl = t->item.m_itemUrl;
ad4.status = ActionData::TaskCanceled;
ad4.index = index;
emit finished(ad4);
ActionData ad5;
- ad5.fileUrl = t->item.itemUrl;
+ ad5.fileUrl = t->item.m_itemUrl;
ad5.status = ActionData::BatchCanceled;
emit finished(ad5);
@@ -231,13 +231,13 @@
else
{
ActionData ad4;
- ad4.fileUrl = t->item.itemUrl;
+ ad4.fileUrl = t->item.m_itemUrl;
ad4.status = ActionData::TaskFailed;
ad4.index = index;
emit finished(ad4);
ActionData ad5;
- ad5.fileUrl = t->item.itemUrl;
+ ad5.fileUrl = t->item.m_itemUrl;
ad5.status = ActionData::BatchFailed;
emit finished(ad5);
@@ -251,7 +251,7 @@
tmp2del.removeAll(outUrl);
ActionData ad6;
- ad6.fileUrl = t->item.itemUrl;
+ ad6.fileUrl = t->item.m_itemUrl;
ad6.destUrl = outUrl;
ad6.status = ActionData::BatchDone;
emit finished(ad6);
--- trunk/extragear/graphics/digikam/utilities/queuemanager/assignedlist.cpp \
#1175109:1175110 @@ -191,13 +191,13 @@
}
AssignedBatchTools tools;
- tools.toolsMap = map;
+ tools.m_toolsMap = map;
return tools;
}
int AssignedListView::assignedCount()
{
- return assignedList().toolsMap.count();
+ return assignedList().m_toolsMap.count();
}
void AssignedListView::slotRemoveCurrentTool()
@@ -479,10 +479,10 @@
clear();
emit signalToolSelected(BatchToolSet());
- if (!tools.toolsMap.isEmpty())
+ if (!tools.m_toolsMap.isEmpty())
{
blockSignals(true);
- for (BatchToolMap::const_iterator it = tools.toolsMap.constBegin() ; it != \
tools.toolsMap.constEnd() ; ++it) + for (BatchToolMap::const_iterator it = \
tools.m_toolsMap.constBegin() ; it != tools.m_toolsMap.constEnd() ; ++it) \
addTool(it.key(), it.value()); blockSignals(false);
}
--- trunk/extragear/graphics/digikam/utilities/queuemanager/batchtool.h \
#1175109:1175110 @@ -274,10 +274,10 @@
AssignedBatchTools(){};
- QString targetSuffix(bool *extSet = 0)
+ QString targetSuffix(bool* extSet = 0) const
{
QString suffix;
- foreach(BatchToolSet set, toolsMap)
+ foreach(BatchToolSet set, m_toolsMap)
{
QString s = set.tool->outputSuffix();
if (!s.isEmpty())
@@ -296,14 +296,16 @@
{
*extSet = false;
}
- return (QFileInfo(itemUrl.fileName()).suffix());
+ return (QFileInfo(m_itemUrl.fileName()).suffix());
}
return suffix;
}
- KUrl itemUrl;
- BatchToolMap toolsMap;
+public:
+
+ KUrl m_itemUrl;
+ BatchToolMap m_toolsMap;
};
} // namespace Digikam
--- trunk/extragear/graphics/digikam/utilities/queuemanager/queuelist.cpp \
#1175109:1175110 @@ -792,7 +792,7 @@
{
QueueListViewItem* item = dynamic_cast<QueueListViewItem*>(*it);
if (item && !item->isDone())
- count += assignedTools().toolsMap.count();
+ count += assignedTools().m_toolsMap.count();
++it;
}
return count;
@@ -889,7 +889,7 @@
// Update suffix using assigned batch tool rules.
bool extensionSet = false;
- tools.itemUrl = item->info().fileUrl();
+ tools.m_itemUrl = item->info().fileUrl();
QString newSuffix = tools.targetSuffix(&extensionSet);
QString newName = \
QString("%1.%2").arg(fi.completeBaseName()).arg(newSuffix);
--- trunk/extragear/graphics/digikam/utilities/queuemanager/queuemgrwindow.cpp \
#1175109:1175110 @@ -920,13 +920,13 @@
QueueSettings settings = d->queuePool->currentQueue()->settings();
AssignedBatchTools tools4Item = d->queuePool->currentQueue()->assignedTools();
- tools4Item.itemUrl = set.info.fileUrl();
- QueueListViewItem* item = \
d->queuePool->currentQueue()->findItemByUrl(tools4Item.itemUrl); + \
tools4Item.m_itemUrl = set.info.fileUrl(); + QueueListViewItem* item \
= d->queuePool->currentQueue()->findItemByUrl(tools4Item.m_itemUrl); if (item)
{
d->itemsList.removeFirst();
- if (!tools4Item.toolsMap.isEmpty())
+ if (!tools4Item.m_toolsMap.isEmpty())
{
d->thread->setWorkingUrl(settings.targetUrl);
d->thread->processFile(tools4Item);
@@ -1186,7 +1186,7 @@
return;
}
- switch (tools.toolsMap.count())
+ switch (tools.m_toolsMap.count())
{
case 0:
{
--- trunk/extragear/graphics/digikam/utilities/queuemanager/queuepool.cpp \
#1175109:1175110 @@ -317,7 +317,7 @@
QueueListView* queue = dynamic_cast<QueueListView*>(widget(i));
if (queue)
{
- if (queue->assignedTools().toolsMap.isEmpty())
+ if (queue->assignedTools().m_toolsMap.isEmpty())
{
list.append(queueTitle(i));
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic