[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] utilities/queuemanager/manager: Fix warning under Windows, reported by Ananta
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2013-01-10 10:08:11
Message-ID: 20130110100811.23830A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 64bccbbeca0c29b44bd421b146cbebfbf184f1e9 by Gilles Caulier.
Committed on 10/01/2013 at 11:07.
Pushed by cgilles into branch 'master'.
Fix warning under Windows, reported by Ananta
M +6 -6 utilities/queuemanager/manager/batchtool.cpp
http://commits.kde.org/digikam/64bccbbeca0c29b44bd421b146cbebfbf184f1e9
diff --git a/utilities/queuemanager/manager/batchtool.cpp b/utilities/queuemanager/manager/batchtool.cpp
index 6964a3a..443214d 100644
--- a/utilities/queuemanager/manager/batchtool.cpp
+++ b/utilities/queuemanager/manager/batchtool.cpp
@@ -115,9 +115,9 @@ public:
{
}
- bool continueQuery(const DImg*)
+ bool continueQuery(const DImg* const)
{
- return !d->cancel;
+ return (!d->cancel);
}
private:
@@ -340,7 +340,7 @@ void BatchTool::setOutputUrlFromInputUrl()
bool BatchTool::isRawFile(const KUrl& url) const
{
- QString rawFilesExt(KDcraw::rawFiles());
+ QString rawFilesExt(KDcraw::rawFiles());
QFileInfo fileInfo(url.toLocalFile());
return (rawFilesExt.toUpper().contains(fileInfo.suffix().toUpper()));
}
@@ -355,8 +355,8 @@ bool BatchTool::loadToDImg() const
if (d->rawLoadingRule == QueueSettings::USEEMBEDEDJPEG && isRawFile(inputUrl()))
{
QImage img;
- bool ret = KDcraw::loadRawPreview(img, inputUrl().toLocalFile());
- d->image = DImg(img);
+ bool ret = KDcraw::loadRawPreview(img, inputUrl().toLocalFile());
+ d->image = DImg(img);
return ret;
}
@@ -416,7 +416,7 @@ bool BatchTool::apply()
if (it.value().canConvert<QPolygon>())
{
QPolygon pol = it.value().value<QPolygon>();
- int size = pol.size() > 20 ? 20 : pol.size();
+ int size = (pol.size() > 20) ? 20 : pol.size();
QString tmp;
tmp.append(QString("[%1 items] : ").arg(pol.size()));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic