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

List:       kde-commits
Subject:    [digikam] /: changing QString in slotUpdateDownloadName()
From:       Maik Qualmann <metzpinguin () gmail ! com>
Date:       2015-12-31 17:09:39
Message-ID: E1aEgjL-0000e0-AG () scm ! kde ! org
[Download RAW message or body]

Git commit 2169684a220f527b445e8c08f6a82c6ffa5f9fe5 by Maik Qualmann.
Committed on 31/12/2015 at 17:06.
Pushed by mqualmann into branch 'master'.

changing QString in slotUpdateDownloadName()
BUGS: 357168
FIXED-IN: 5.0.0

M  +2    -2    NEWS
M  +4    -4    utilities/importui/main/importui.cpp

http://commits.kde.org/digikam/2169684a220f527b445e8c08f6a82c6ffa5f9fe5

diff --git a/NEWS b/NEWS
index 18cacfc..641bd5e 100644
--- a/NEWS
+++ b/NEWS
@@ -98,5 +98,5 @@ BUGFIXES FROM KDE BUGZILLA \
(https://www.digikam.org/changelog):  062 ==> 356975 - Nikon 5300 12bit \
RAW/NEF: wrong white/black level.  063 ==> 356639 - Digikam crash when i \
create a new folder.  064 ==> 357301 - Album view is not updated \
                automatically anymore.
-065 ==> 
-
+065 ==> 357168 - digikam goes reset.
+066 ==> 
diff --git a/utilities/importui/main/importui.cpp \
b/utilities/importui/main/importui.cpp index 6ccafbe..5f16746 100644
--- a/utilities/importui/main/importui.cpp
+++ b/utilities/importui/main/importui.cpp
@@ -1652,13 +1652,14 @@ void ImportUI::slotUpdateDownloadName()
     bool hasNoSelection       = selected.count() == 0;
     CamItemInfoList list      = d->view->allItems();
     DownloadSettings settings = downloadSettings();
+    QString newName;
 
     foreach (CamItemInfo info, list)
     {
         CamItemInfo& refInfo = d->view->camItemInfoRef(info.folder, \
                info.name);
-        qCDebug(DIGIKAM_IMPORTUI_LOG) << "slotDownloadNameChanged, old: " \
<< refInfo.downloadName; +        // qCDebug(DIGIKAM_IMPORTUI_LOG) << \
"slotDownloadNameChanged, old: " << refInfo.downloadName;  
-        QString newName = info.name;
+        newName = info.name;
 
         if (hasNoSelection || selected.contains(info.url()))
         {
@@ -1709,8 +1710,7 @@ void ImportUI::slotUpdateDownloadName()
         }
 
         refInfo.downloadName = newName;
-
-        qCDebug(DIGIKAM_IMPORTUI_LOG) << "slotDownloadNameChanged, new: " \
<< refInfo.downloadName; +        // qCDebug(DIGIKAM_IMPORTUI_LOG) << \
"slotDownloadNameChanged, new: " << refInfo.downloadName;  }
 
     d->view->updateIconView();


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