[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam/frameworks] utilities/queuemanager: KUrl -> QUrl
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2015-01-01 21:36:46
Message-ID: E1Y6nQE-0000vT-Kf () scm ! kde ! org
[Download RAW message or body]
Git commit 706d6005d27a7c9e2ff119cc7be22e3462666aa1 by Gilles Caulier.
Committed on 01/01/2015 at 21:23.
Pushed by cgilles into branch 'frameworks'.
KUrl -> QUrl
M +1 -1 utilities/queuemanager/main/queuemgrwindow.cpp
M +1 -1 utilities/queuemanager/main/queuemgrwindow.h
M +3 -3 utilities/queuemanager/manager/actions.h
M +11 -11 utilities/queuemanager/manager/batchtool.cpp
M +7 -7 utilities/queuemanager/manager/batchtool.h
M +2 -2 utilities/queuemanager/manager/batchtoolutils.h
M +2 -2 utilities/queuemanager/manager/queuesettings.h
M +16 -13 utilities/queuemanager/manager/task.cpp
M +2 -2 utilities/queuemanager/manager/task.h
M +1 -1 utilities/queuemanager/manager/workflowmanager.cpp
M +7 -7 utilities/queuemanager/views/queuelist.cpp
M +2 -2 utilities/queuemanager/views/queuelist.h
http://commits.kde.org/digikam/706d6005d27a7c9e2ff119cc7be22e3462666aa1
diff --git a/utilities/queuemanager/main/queuemgrwindow.cpp \
b/utilities/queuemanager/main/queuemgrwindow.cpp index 8aed7d0..9cf0900 100644
--- a/utilities/queuemanager/main/queuemgrwindow.cpp
+++ b/utilities/queuemanager/main/queuemgrwindow.cpp
@@ -864,7 +864,7 @@ bool QueueMgrWindow::checkTargetAlbum(int queueId)
if (!queue->settings().useOrgAlbum)
{
QString queueName = d->queuePool->queueTitle(queueId);
- KUrl processedItemsAlbumUrl = queue->settings().workingUrl;
+ QUrl processedItemsAlbumUrl = queue->settings().workingUrl;
qCDebug(DIGIKAM_GENERAL_LOG) << "Target album for queue " << queueName << " \
is: " << processedItemsAlbumUrl.toLocalFile();
if (processedItemsAlbumUrl.isEmpty())
diff --git a/utilities/queuemanager/main/queuemgrwindow.h \
b/utilities/queuemanager/main/queuemgrwindow.h index c40ff99..0341976 100644
--- a/utilities/queuemanager/main/queuemgrwindow.h
+++ b/utilities/queuemanager/main/queuemgrwindow.h
@@ -32,7 +32,7 @@
// KDE includes
-#include <kurl.h>
+#include <QUrl>
// Local includes
diff --git a/utilities/queuemanager/manager/actions.h \
b/utilities/queuemanager/manager/actions.h index c2b8c93..b0aea35 100644
--- a/utilities/queuemanager/manager/actions.h
+++ b/utilities/queuemanager/manager/actions.h
@@ -31,7 +31,7 @@
// KDE includes
-#include <kurl.h>
+#include <QUrl>
namespace Digikam
{
@@ -64,8 +64,8 @@ public:
QString message;
- KUrl fileUrl;
- KUrl destUrl;
+ QUrl fileUrl;
+ QUrl destUrl;
};
} // namespace Digikam
diff --git a/utilities/queuemanager/manager/batchtool.cpp \
b/utilities/queuemanager/manager/batchtool.cpp index 5ba03de..0f15035 100644
--- a/utilities/queuemanager/manager/batchtool.cpp
+++ b/utilities/queuemanager/manager/batchtool.cpp
@@ -85,9 +85,9 @@ public:
QString toolDescription; // User friendly tool \
description. QString toolIconName;
- KUrl inputUrl;
- KUrl outputUrl;
- KUrl workingUrl;
+ QUrl inputUrl;
+ QUrl outputUrl;
+ QUrl workingUrl;
DImg image;
@@ -207,22 +207,22 @@ void BatchTool::setSettings(const BatchToolSettings& settings)
emit signalAssignSettings2Widget();
}
-void BatchTool::setInputUrl(const KUrl& inputUrl)
+void BatchTool::setInputUrl(const QUrl &inputUrl)
{
d->inputUrl = inputUrl;
}
-KUrl BatchTool::inputUrl() const
+QUrl BatchTool::inputUrl() const
{
return d->inputUrl;
}
-void BatchTool::setOutputUrl(const KUrl& outputUrl)
+void BatchTool::setOutputUrl(const QUrl &outputUrl)
{
d->outputUrl = outputUrl;
}
-KUrl BatchTool::outputUrl() const
+QUrl BatchTool::outputUrl() const
{
return d->outputUrl;
}
@@ -287,12 +287,12 @@ RawDecodingSettings BatchTool::rawDecodingSettings() const
return d->rawDecodingSettings;
}
-void BatchTool::setWorkingUrl(const KUrl& workingUrl)
+void BatchTool::setWorkingUrl(const QUrl &workingUrl)
{
d->workingUrl = workingUrl;
}
-KUrl BatchTool::workingUrl() const
+QUrl BatchTool::workingUrl() const
{
return d->workingUrl;
}
@@ -338,12 +338,12 @@ void BatchTool::setOutputUrlFromInputUrl()
temp.open();
qCDebug(DIGIKAM_GENERAL_LOG) << "path: " << temp.fileName();
- KUrl url;
+ QUrl url;
url.setPath(path);
setOutputUrl(QUrl::fromLocalFile(temp.fileName()));
}
-bool BatchTool::isRawFile(const KUrl& url) const
+bool BatchTool::isRawFile(const QUrl &url) const
{
QString rawFilesExt(KDcraw::rawFiles());
QFileInfo fileInfo(url.toLocalFile());
diff --git a/utilities/queuemanager/manager/batchtool.h \
b/utilities/queuemanager/manager/batchtool.h index e2815c4..00f4821 100644
--- a/utilities/queuemanager/manager/batchtool.h
+++ b/utilities/queuemanager/manager/batchtool.h
@@ -109,18 +109,18 @@ public:
/** Manage current input url processed by this tool.
*/
- void setInputUrl(const KUrl& inputUrl);
- KUrl inputUrl() const;
+ void setInputUrl(const QUrl &inputUrl);
+ QUrl inputUrl() const;
/** Manage current output url processed by this tool.
*/
- void setOutputUrl(const KUrl& outputUrl);
- KUrl outputUrl() const;
+ void setOutputUrl(const QUrl &outputUrl);
+ QUrl outputUrl() const;
/** Manage current working url used by this tool to process items.
*/
- void setWorkingUrl(const KUrl& workingUrl);
- KUrl workingUrl() const;
+ void setWorkingUrl(const QUrl &workingUrl);
+ QUrl workingUrl() const;
/** Manage instance of current image data container loaded by this tool.
*/
@@ -228,7 +228,7 @@ protected:
/** Method to check if file pointed by url is a RAW image
*/
- bool isRawFile(const KUrl& url) const;
+ bool isRawFile(const QUrl &url) const;
/** Set string to describe an error which appear during apply() method.
*/
diff --git a/utilities/queuemanager/manager/batchtoolutils.h \
b/utilities/queuemanager/manager/batchtoolutils.h index df74817..4bb7585 100644
--- a/utilities/queuemanager/manager/batchtoolutils.h
+++ b/utilities/queuemanager/manager/batchtoolutils.h
@@ -33,7 +33,7 @@
// KDE includes
-#include <kurl.h>
+#include <QUrl>
// Local includes
@@ -98,7 +98,7 @@ public:
public:
QString m_destFileName;
- KUrl m_itemUrl;
+ QUrl m_itemUrl;
BatchSetList m_toolsList;
};
diff --git a/utilities/queuemanager/manager/queuesettings.h \
b/utilities/queuemanager/manager/queuesettings.h index a750201..011c3e2 100644
--- a/utilities/queuemanager/manager/queuesettings.h
+++ b/utilities/queuemanager/manager/queuesettings.h
@@ -26,7 +26,7 @@
// KDE includes
-#include <kurl.h>
+#include <QUrl>
// Libkdcraw includes
@@ -86,7 +86,7 @@ public:
QString renamingParser;
- KUrl workingUrl;
+ QUrl workingUrl;
ConflictRule conflictRule;
RenamingRule renamingRule;
diff --git a/utilities/queuemanager/manager/task.cpp \
b/utilities/queuemanager/manager/task.cpp index 7924567..8eab10f 100644
--- a/utilities/queuemanager/manager/task.cpp
+++ b/utilities/queuemanager/manager/task.cpp
@@ -106,7 +106,7 @@ void Task::slotCancel()
}
-void Task::emitActionData(ActionData::ActionStatus st, const QString& mess, const \
KUrl& dest) +void Task::emitActionData(ActionData::ActionStatus st, const QString& \
mess, const QUrl &dest) {
ActionData ad;
ad.fileUrl = d->tools.m_itemUrl;
@@ -127,14 +127,15 @@ void Task::run()
// Loop with all batch tools operations to apply on item.
- bool success = false;
- int index = 0;
- KUrl outUrl = d->tools.m_itemUrl;
- KUrl workUrl = !d->settings.useOrgAlbum ? d->settings.workingUrl : \
KUrl(d->tools.m_itemUrl.directory(KUrl::AppendTrailingSlash));
- KUrl inUrl;
- KUrl::List tmp2del;
- DImg tmpImage;
- QString errMsg;
+ bool success = false;
+ int index = 0;
+ QUrl outUrl = d->tools.m_itemUrl;
+ QUrl workUrl = !d->settings.useOrgAlbum ? d->settings.workingUrl
+ : \
d->tools.m_itemUrl.adjusted(QUrl::RemoveFilename); + QUrl inUrl;
+ QList<QUrl> tmp2del;
+ DImg tmpImage;
+ QString errMsg;
foreach (const BatchToolSet& set, d->tools.m_toolsList)
{
@@ -186,15 +187,16 @@ void Task::run()
// We don't remove last output tmp url.
tmp2del.removeAll(outUrl);
- foreach (const KUrl& url, tmp2del)
+ foreach (const QUrl &url, tmp2del)
{
unlink(QFile::encodeName(url.toLocalFile()).constData());
}
// Move processed temp file to target
- KUrl dest = workUrl;
- dest.setFileName(d->tools.m_destFileName);
+ QUrl dest = workUrl;
+ dest = dest.adjusted(QUrl::RemoveFilename);
+ dest.setPath(dest.path() + d->tools.m_destFileName);
QString renameMess;
QFileInfo fi(dest.toLocalFile());
@@ -216,7 +218,8 @@ void Task::run()
else
{
i++;
- dest.setFileName(fi.completeBaseName() + QString("_%1.").arg(i) \
+ fi.completeSuffix()); + dest = \
dest.adjusted(QUrl::RemoveFilename); + dest.setPath(dest.path() + \
fi.completeBaseName() + QString("_%1.").arg(i) + fi.completeSuffix()); fileFound = \
true; }
}
diff --git a/utilities/queuemanager/manager/task.h \
b/utilities/queuemanager/manager/task.h index de018c7..875883a 100644
--- a/utilities/queuemanager/manager/task.h
+++ b/utilities/queuemanager/manager/task.h
@@ -27,7 +27,7 @@
// KDE includes
-#include <kurl.h>
+#include <QUrl>
// Libkdcraw includes
@@ -71,7 +71,7 @@ protected:
private:
- void emitActionData(ActionData::ActionStatus st, const QString& mess=QString(), \
const KUrl& dest=KUrl()); + void emitActionData(ActionData::ActionStatus st, const \
QString& mess=QString(), const QUrl &dest=QUrl());
private:
diff --git a/utilities/queuemanager/manager/workflowmanager.cpp \
b/utilities/queuemanager/manager/workflowmanager.cpp index 647dd19..5713834 100644
--- a/utilities/queuemanager/manager/workflowmanager.cpp
+++ b/utilities/queuemanager/manager/workflowmanager.cpp
@@ -387,7 +387,7 @@ bool WorkflowManager::load(QStringList& failed)
}
else if (name2 == "workingurl")
{
- q.qSettings.workingUrl = KUrl(val2);
+ q.qSettings.workingUrl = QUrl(val2);
}
else if (name2 == "conflictrule")
{
diff --git a/utilities/queuemanager/views/queuelist.cpp \
b/utilities/queuemanager/views/queuelist.cpp index 90a0661..514dd24 100644
--- a/utilities/queuemanager/views/queuelist.cpp
+++ b/utilities/queuemanager/views/queuelist.cpp
@@ -42,7 +42,7 @@
#include <kactioncollection.h>
#include <kiconloader.h>
#include <klocalizedstring.h>
-#include <kurl.h>
+#include <QUrl>
// Local includes
@@ -360,8 +360,8 @@ Qt::DropActions QueueListView::supportedDropActions() const
QMimeData* QueueListView::mimeData(const QList<QTreeWidgetItem*> items) const
{
- KUrl::List urls;
- KUrl::List kioURLs;
+ QList<QUrl> urls;
+ QList<QUrl> kioURLs;
QList<int> albumIDs;
QList<qlonglong> imageIDs;
@@ -740,7 +740,7 @@ void QueueListView::slotThumbnailLoaded(const LoadingDescription& \
desc, const QP {
QueueListViewItem* const item = dynamic_cast<QueueListViewItem*>(*it);
- if (item && item->info().fileUrl() == KUrl(desc.filePath))
+ if (item && item->info().fileUrl() == QUrl(desc.filePath))
{
if (pix.isNull())
{
@@ -891,7 +891,7 @@ QueueListViewItem* QueueListView::findItemById(qlonglong id)
return 0;
}
-QueueListViewItem* QueueListView::findItemByUrl(const KUrl& url)
+QueueListViewItem* QueueListView::findItemByUrl(const QUrl &url)
{
QTreeWidgetItemIterator it(this);
@@ -1064,7 +1064,7 @@ void QueueListView::updateDestFileNames()
QFileInfo fi(info.filePath());
ParseSettings ps;
- ps.fileUrl = KUrl(fi.absoluteFilePath());
+ ps.fileUrl = QUrl(fi.absoluteFilePath());
files << ps;
}
@@ -1158,7 +1158,7 @@ void QueueListView::slotCollectionImageChange(const \
CollectionImageChangeset& ch }
}
-void QueueListView::reloadThumbs(const KUrl& url)
+void QueueListView::reloadThumbs(const QUrl &url)
{
d->thumbLoadThread->find(ThumbnailIdentifier(url.toLocalFile()));
}
diff --git a/utilities/queuemanager/views/queuelist.h \
b/utilities/queuemanager/views/queuelist.h index 6a539fd..972f9e4 100644
--- a/utilities/queuemanager/views/queuelist.h
+++ b/utilities/queuemanager/views/queuelist.h
@@ -113,7 +113,7 @@ public:
int pendingItemsCount();
int pendingTasksCount();
- QueueListViewItem* findItemByUrl(const KUrl& url);
+ QueueListViewItem* findItemByUrl(const QUrl &url);
QueueListViewItem* findItemById(qlonglong id);
void setSettings(const QueueSettings& settings);
@@ -124,7 +124,7 @@ public:
void setEnableToolTips(bool val);
- void reloadThumbs(const KUrl& url);
+ void reloadThumbs(const QUrl &url);
void setItemBusy(qlonglong id);
QPixmap progressPixmapForIndex(int index) const;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic