Fwd: extragear/graphics/digikam

We changed this explicitly because Windows compilers don't like the
notation...

SVN commit 1090120 by jwienke:

make krazy happy

 M  +1 -1      digikam/tagfiltersidebarwidget.cpp  
 M  +1 -1      imageplugins/coreplugin/bwsepiatool.cpp  
 M  +1 -1      imageplugins/coreplugin/imageplugin_core.cpp  
 M  +2 -2      libs/database/albumdb.cpp  
 M  +1 -1      libs/database/collectionmanager.cpp  
 M  +1 -1      libs/database/haar/haariface.cpp  
 M  +3 -1      libs/database/imagecopyright.cpp  
 M  +2 -2      libs/database/imagequerybuilder.cpp  
 M  +2 -1      libs/database/schemaupdater.cpp  
 M  +1 -1      libs/dimg/filters/cb/cbfilter.h  
 M  +1 -1      libs/dimg/filters/hsl/hslfilter.h  
 M  +1 -1      libs/dimg/filters/nr/waveletsnr.cpp  
 M  +3 -3      libs/dmetadata/dmetadata.cpp  
 M  +1 -1      libs/template/altlangstredit.cpp  
 M  +2 -2      libs/template/templatemanager.cpp  
 M  +3 -3      libs/themeengine/texture.cpp  
 M  +2 -2      libs/widgets/iccprofiles/iccprofilescombobox.cpp  
 M  +1 -1      libs/widgets/metadata/metadatalistview.cpp  
 M  +1 -1      utilities/advancedrename/common/highlighter.cpp  
 M  +4 -4      utilities/advancedrename/common/parseobject.cpp  
 M  +1 -1      utilities/advancedrename/common/parser.cpp  
 M  +3 -3      utilities/advancedrename/common/parseresults.cpp  
 M  +1 -1      utilities/advancedrename/parser/options/filepropertiesoption.cpp  
 M  +1 -1      utilities/advancedrename/parser/options/metadataoption.cpp  
 M  +4 -4      utilities/imageeditor/canvas/iccsettings.cpp  
 M  +2 -2      utilities/nepomuk/digikamnepomukservice.cpp  
 M  +1 -1      utilities/setup/setupcollectionview.cpp  


--- trunk/extragear/graphics/digikam/digikam/tagfiltersidebarwidget.cpp #1090119:1090120
@@ -160,7 +160,7 @@
     QLabel *matchingConditionLabel = new QLabel(i18n("Matching Condition:"), this);
     matchingConditionLabel->setWhatsThis(i18n(
                     "Defines in which way the selected tags are combined to filter the images. "
-                    "This also includes the '%1' check box.").arg(notTaggedTitle));
+                    "This also includes the '%1' check box.", notTaggedTitle));
 
     d->matchingConditionComboBox = new QComboBox(this);
     d->matchingConditionComboBox->setWhatsThis(matchingConditionLabel->whatsThis());
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/bwsepiatool.cpp #1090119:1090120
@@ -150,7 +150,7 @@
 PreviewPixmapFactory::~PreviewPixmapFactory()
 {
     // Delete all hash items
-    foreach (QPixmap* pm, m_previewPixmapMap.values())
+    foreach (QPixmap* pm, m_previewPixmapMap.values()) // krazy:exclude=foreach
     {
         delete pm;
     }
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/imageplugin_core.cpp #1090119:1090120
@@ -401,7 +401,7 @@
                      << IccProfile::wideGamutRGB()
                      << IccProfile::proPhotoRGB();
 
-    foreach (IccProfile profile, standardProfiles)
+    foreach (IccProfile profile, standardProfiles) // krazy:exclude=foreach
     {
         d->profileMenuAction->addProfile(profile, profile.description());
         standardProfilePaths << profile.filePath();
--- trunk/extragear/graphics/digikam/libs/database/albumdb.cpp #1090119:1090120
@@ -543,14 +543,14 @@
 
     if (albumURL.isEmpty())
     {
-        *iconAlbumRelativePath = QString();
+        *iconAlbumRelativePath = QString(); // krazy:exclude=nullstrassign
         *icon = iconKDE;
         return !iconKDE.isEmpty();
     }
     else
     {
         *iconAlbumRelativePath = albumURL + '/' + iconName;
-        *icon = QString();
+        *icon = QString(); // krazy:exclude=nullstrassign
         return true;
     }
 }
--- trunk/extragear/graphics/digikam/libs/database/collectionmanager.cpp #1090119:1090120
@@ -1122,7 +1122,7 @@
         if (!rootPath.isEmpty() && filePath.startsWith(rootPath))
         {
             // see also bug #221155 for extra checks
-            if (filePath == rootPath || filePath.startsWith(rootPath + "/"))
+            if (filePath == rootPath || filePath.startsWith(rootPath + '/'))
                 return *location;
         }
     }
--- trunk/extragear/graphics/digikam/libs/database/haar/haariface.cpp #1090119:1090120
@@ -586,7 +586,7 @@
     // read cached signature map if possible
     else
     {
-        foreach (const qlonglong& imageid, signatureCache.keys())
+        foreach (const qlonglong &imageid, signatureCache.keys())
         {
             double& score              = scores[imageid];
             Haar::SignatureData &qSig  = *querySig;
--- trunk/extragear/graphics/digikam/libs/database/imagecopyright.cpp #1090119:1090120
@@ -282,8 +282,10 @@
 
 void ImageCopyright::setFromTemplate(const Template &t)
 {
-    foreach(QString author, t.authors())
+    foreach(QString author, t.authors()) // krazy:exclude=foreach
+    {
         setAuthor(author, ImageCopyright::AddEntryToExisting);
+    }
 
     setCredit(t.credit());
 
--- trunk/extragear/graphics/digikam/libs/database/imagequerybuilder.cpp #1090119:1090120
@@ -373,7 +373,7 @@
             sql += " (" + name + " IN (";
             AlbumDB::addBoundValuePlaceholders(sql, values.size());
             sql += ") ";
-            foreach (qlonglong v, values)
+            foreach (const qlonglong &v, values)
                 *boundValues << v;
             sql += " ) ";
         }
@@ -447,7 +447,7 @@
             }
             if (!wildcards.isEmpty())
             {
-                foreach(QString wildcard, wildcards)
+                foreach(QString wildcard, wildcards) // krazy:exclude=foreach
                 {
                     ImageQueryBuilder::addSqlOperator(sql, SearchXml::Or, firstCondition);
                     firstCondition = false;
--- trunk/extragear/graphics/digikam/libs/database/schemaupdater.cpp #1090119:1090120
@@ -891,7 +891,8 @@
                                 "If you are working on Linux, check that HAL is installed and running. "
                                 "In any case, you can seek advice from the [hidden email] mailing list. "
                                 "The database updating process will now be aborted because we do not want "
-                                "to create a new database based on false assumptions from a broken installation.");
+                                "to create a new database based on false assumptions from a broken installation.",
+                                albumLibraryPath);
         m_access->setLastError(errorMsg);
         m_setError = true;
         if (m_observer)
--- trunk/extragear/graphics/digikam/libs/dimg/filters/cb/cbfilter.h #1090119:1090120
@@ -70,7 +70,7 @@
 
 public:
 
-    CBFilter(DImg* orgImage, QObject* parent=0, const CBContainer& settings=CBContainer());
+    explicit CBFilter(DImg* orgImage, QObject* parent=0, const CBContainer& settings=CBContainer());
     virtual ~CBFilter();
 
 private:
--- trunk/extragear/graphics/digikam/libs/dimg/filters/hsl/hslfilter.h #1090119:1090120
@@ -65,7 +65,7 @@
 
 public:
 
-    HSLFilter(DImg* orgImage, QObject* parent=0, const HSLContainer& settings=HSLContainer());
+    explicit HSLFilter(DImg* orgImage, QObject* parent=0, const HSLContainer& settings=HSLContainer());
     virtual ~HSLFilter();
 
 private:
--- trunk/extragear/graphics/digikam/libs/dimg/filters/nr/waveletsnr.cpp #1090119:1090120
@@ -201,7 +201,7 @@
         for (row = 0; !m_cancel && (row < height); ++row)
         {
             hatTransform(temp, fimg[hpass] + row * width, 1, width, 1 << lev);
-            for (col = 0; col < width; col++)
+            for (col = 0; col < width; ++col)
             {
                 fimg[lpass][row * width + col] = temp[col] * 0.25;
             }
--- trunk/extragear/graphics/digikam/libs/dmetadata/dmetadata.cpp #1090119:1090120
@@ -700,7 +700,7 @@
     // Synchronize Iptc subjects tags with Xmp subjects tags.
     QStringList list = t.IptcSubjects();
     QStringList newList;
-    foreach(QString str, list)
+    foreach(QString str, list) // krazy:exclude=foreach
     {
         if (str.startsWith("XMP"))
         {
@@ -1357,7 +1357,7 @@
 QVariantList DMetadata::getMetadataFields(const MetadataFields& fields) const
 {
     QVariantList list;
-    foreach (MetadataInfo::Field field, fields)
+    foreach (MetadataInfo::Field field, fields) // krazy:exclude=foreach
     {
         list << getMetadataField(field);
     }
@@ -1491,7 +1491,7 @@
         {
             QString meters = QString("%L1").arg(value.toDouble(), 0, 'f', 2);
             // xgettext: no-c-format
-            return i18nc("Height in meters", "%L1m", meters);
+            return i18nc("Height in meters", "%L1m", meters); // krazy:exclude=i18ncheckarg
         }
 
         case MetadataInfo::PositionOrientation:
--- trunk/extragear/graphics/digikam/libs/template/altlangstredit.cpp #1090119:1090120
@@ -402,7 +402,7 @@
     QStringList list = d->values.keys();
     if (!list.isEmpty())
     {
-        foreach (QString item, list)
+        foreach (const QString &item, list)
         {
               d->languageCB->addItem(item);
               d->languageCB->setItemIcon(d->languageCB->count()-1, SmallIcon("dialog-ok"));
--- trunk/extragear/graphics/digikam/libs/template/templatemanager.cpp #1090119:1090120
@@ -303,7 +303,7 @@
 
             QDomElement authors = doc.createElement(QString::fromLatin1("authors"));
             elem.appendChild(authors);
-            foreach (QString name, t.authors())
+            foreach (const QString &name, t.authors())
             {
                 QDomElement e = doc.createElement(QString::fromLatin1("name"));
                 e.setAttribute(QString::fromLatin1("value"), name);
@@ -387,7 +387,7 @@
 
             QDomElement subjects = doc.createElement(QString::fromLatin1("subjects"));
             elem.appendChild(subjects);
-            foreach (QString subject, t.IptcSubjects())
+            foreach (const QString &subject, t.IptcSubjects())
             {
                 QDomElement e = doc.createElement(QString::fromLatin1("subject"));
                 e.setAttribute(QString::fromLatin1("value"), subject);
--- trunk/extragear/graphics/digikam/libs/themeengine/texture.cpp #1090119:1090120
@@ -213,9 +213,9 @@
 
     for (x = 0; x < d->width; ++x)
     {
-        *(pr++) = (unsigned char) (xr);
-        *(pg++) = (unsigned char) (xg);
-        *(pb++) = (unsigned char) (xb);
+        *(pr++) = (unsigned char) (xr); // krazy:exclude=postfixop
+        *(pg++) = (unsigned char) (xg); // krazy:exclude=postfixop
+        *(pb++) = (unsigned char) (xb); // krazy:exclude=postfixop
 
         xr += drx;
         xg += dgx;
--- trunk/extragear/graphics/digikam/libs/widgets/iccprofiles/iccprofilescombobox.cpp #1090119:1090120
@@ -77,7 +77,7 @@
 {
     QList<IccProfile> profiles;
     QSet<QString>     filePaths;
-    foreach (IccProfile profile, givenProfiles)
+    foreach (IccProfile profile, givenProfiles) // krazy:exclude=foreach
     {
         QString filePath = profile.filePath();
         if (!profile.description().isNull() && (filePath.isNull() || !filePaths.contains(filePath)) )
@@ -89,7 +89,7 @@
 
     qSort(profiles.begin(), profiles.end(), iccProfileLessThan);
 
-    foreach (IccProfile profile, profiles)
+    foreach (IccProfile profile, profiles) // krazy:exclude=foreach
     {
         QString description = profileUserString(profile);
         if (description.isNull())
--- trunk/extragear/graphics/digikam/libs/widgets/metadata/metadatalistview.cpp #1090119:1090120
@@ -281,7 +281,7 @@
     // Add not found tags from filter as grey items.
     if (!filters.isEmpty() && filters[0] != QString("FULL") && filters[0].contains("."))
     {
-        foreach(QString key, filters)
+        foreach(const QString &key, filters)
         {
             MdKeyListViewItem *pitem = findMdKeyItem(key);
             if (!pitem)
--- trunk/extragear/graphics/digikam/utilities/advancedrename/common/highlighter.cpp #1090119:1090120
@@ -93,7 +93,7 @@
     ParseSettings settings;
     settings.parseString = text;
     ParseResults invalid = parser->invalidModifiers(settings);
-    foreach (const ParseResults::ResultsKey& key, invalid.keys())
+    foreach (const ParseResults::ResultsKey &key, invalid.keys())
     {
         setFormat(key.first, key.second, errorFormat);
     }
--- trunk/extragear/graphics/digikam/utilities/advancedrename/common/parseobject.cpp #1090119:1090120
@@ -267,12 +267,12 @@
     QString escaped = token;
 
     // replace special characters for renaming options
-    escaped.replace("[", "\\[");
-    escaped.replace("]", "\\]");
+    escaped.replace('[', "\\[");
+    escaped.replace(']', "\\]");
 
     // replace special characters for modifiers
-    escaped.replace("{", "\\{");
-    escaped.replace("}", "\\}");
+    escaped.replace('{', "\\{");
+    escaped.replace('}', "\\}");
 
     return escaped;
 }
--- trunk/extragear/graphics/digikam/utilities/advancedrename/common/parser.cpp #1090119:1090120
@@ -265,7 +265,7 @@
     // We need to create a second ParseResults object with modified keys, otherwise the final parsing step will not
     // remove the modifier tokens from the result.
 
-    foreach (const ParseResults::ResultsKey& key, results.keys())
+    foreach (const ParseResults::ResultsKey &key, results.keys())
     {
         int off  = results.offset(key);
         int diff = 0;
--- trunk/extragear/graphics/digikam/utilities/advancedrename/common/parseresults.cpp #1090119:1090120
@@ -100,7 +100,7 @@
 
 ParseResults::ResultsKey ParseResults::keyAtPosition(int pos)
 {
-    foreach (const ResultsKey& key, m_results.keys())
+    foreach (const ResultsKey &key, m_results.keys())
     {
         if (pos == key.first)
         {
@@ -119,7 +119,7 @@
 
 ParseResults::ResultsKey ParseResults::keyAtApproximatePosition(int pos)
 {
-    foreach (const ResultsKey& key, m_results.keys())
+    foreach (const ResultsKey &key, m_results.keys())
     {
         int start  = key.first;
         int length = key.second;
@@ -187,7 +187,7 @@
 
 void ParseResults::debug()
 {
-    foreach (const ResultsKey& key, m_results.keys())
+    foreach (const ResultsKey &key, m_results.keys())
     {
         QString _token  = token(key);
         QString _result = result(key);
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/options/filepropertiesoption.cpp #1090119:1090120
@@ -90,7 +90,7 @@
     }
     else if (token == QString(".[ext]"))
     {
-        result = "." + fi.suffix();
+        result = '.' + fi.suffix();
         settings.useOriginalFileExtension = false;
     }
 
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/options/metadataoption.cpp #1090119:1090120
@@ -188,7 +188,7 @@
             dataMap = meta.getXmpTagsDataList(QStringList(), true);
         }
 
-        foreach (const QString& key, dataMap.keys())
+        foreach (const QString &key, dataMap.keys())
         {
             if (key.toLower().contains(keyword))
             {
--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/iccsettings.cpp #1090119:1090120
@@ -383,7 +383,7 @@
 QList<IccProfile> IccSettings::workspaceProfiles()
 {
     QList<IccProfile> profiles;
-    foreach (IccProfile profile, allProfiles())
+    foreach (IccProfile profile, allProfiles()) // krazy:exclude=foreach
     {
         switch (profile.type())
         {
@@ -400,7 +400,7 @@
 QList<IccProfile> IccSettings::displayProfiles()
 {
     QList<IccProfile> profiles;
-    foreach (IccProfile profile, allProfiles())
+    foreach (IccProfile profile, allProfiles()) // krazy:exclude=foreach
     {
         if (profile.type() == IccProfile::Display)
             profiles << profile;
@@ -411,7 +411,7 @@
 QList<IccProfile> IccSettings::inputProfiles()
 {
     QList<IccProfile> profiles;
-    foreach (IccProfile profile, allProfiles())
+    foreach (IccProfile profile, allProfiles()) // krazy:exclude=foreach
     {
         switch (profile.type())
         {
@@ -428,7 +428,7 @@
 QList<IccProfile> IccSettings::outputProfiles()
 {
     QList<IccProfile> profiles;
-    foreach (IccProfile profile, allProfiles())
+    foreach (IccProfile profile, allProfiles()) // krazy:exclude=foreach
     {
         if (profile.type() == IccProfile::Output)
             profiles << profile;
--- trunk/extragear/graphics/digikam/utilities/nepomuk/digikamnepomukservice.cpp #1090119:1090120
@@ -458,7 +458,7 @@
 void NepomukService::syncToNepomuk(const QList<qlonglong>& imageIds, SyncToNepomukSettings syncSettings)
 {
     QList<ImageInfo> infos;
-    foreach (qlonglong imageid, imageIds)
+    foreach (const qlonglong &imageid, imageIds)
     {
         ImageInfo info(imageid);
         if (!info.isNull())
@@ -538,7 +538,7 @@
         Nepomuk::Tag tag = nepomukForDigikamTag(d->tagInfo(tagId));
         if (tag.isValid())
         {
-            foreach (qlonglong imageId, imageIds)
+            foreach (const qlonglong &imageId, imageIds)
             {
                 ImageInfo info(imageId);
                 if (!info.isNull())
--- trunk/extragear/graphics/digikam/utilities/setup/setupcollectionview.cpp #1090119:1090120
@@ -545,7 +545,7 @@
         {
             if (!item.path.isEmpty() && path.startsWith(item.path))
             {
-                if (path == item.path || path.startsWith(item.path + "/"))
+                if (path == item.path || path.startsWith(item.path + '/'))
                 {
                     messageFromManager = i18n("You have previously added a collection "
                                             "that contains the path \"%1\".", path);

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Johannes Wienke-3]

Am 14.02.2010 20:11 schrieb Andi Clemens:
> We changed this explicitly because Windows compilers don't like the
> notation...

Hm, this is used in so many places in the source code and no one
complained right now. ;)

But maybe this should be placed in the hacking file?


_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Yes, this is used everywhere (QWidget& lala) because we patched this some
months ago... so why should anyone complain?
;-)

Andi Clemens
-----------------
www.digikam.org

On Sunday 14 February 2010 20:17:01 Johannes Wienke wrote:
> Am 14.02.2010 20:11 schrieb Andi Clemens:
> > We changed this explicitly because Windows compilers don't like the
> > notation...
>
> Hm, this is used in so many places in the source code and no one
> complained right now. ;)
>
> But maybe this should be placed in the hacking file?
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Johannes Wienke-2]

Am 14.02.2010 20:21 schrieb Andi Clemens:
> Yes, this is used everywhere (QWidget& lala) because we patched this some
> months ago... so why should anyone complain?
> ;-)

Because I know enough locations in the current trunk where this is not
the case. ;)


_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Hmm must be new... well anyway... :-)

Andi Clemens
-----------------
www.digikam.org

On Sunday 14 February 2010 20:27:13 Johannes Wienke wrote:
> Am 14.02.2010 20:21 schrieb Andi Clemens:
> > Yes, this is used everywhere (QWidget& lala) because we patched this some
> > months ago... so why should anyone complain?
> > ;-)
>
> Because I know enough locations in the current trunk where this is not
> the case. ;)
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Johannes Wienke-3]

Am 14.02.2010 20:30 schrieb Andi Clemens:
> Hmm must be new... well anyway... :-)

Anyway, if this is really an issue it should
1. be addressed in the HACKING file
2. be complained about by krazy2

;)


_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel