From kde-commits  Mon Dec 31 16:19:19 2012
From: Andi Clemens <andi.clemens () googlemail ! com>
Date: Mon, 31 Dec 2012 16:19:19 +0000
To: kde-commits
Subject: [digikam] utilities/importui/main: cleanup code
Message-Id: <20121231161919.303ABA60C4 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=135698381419284

Git commit 95f00627a9da1149c120dd0e4f1d3bc737938738 by Andi Clemens.
Committed on 31/12/2012 at 16:57.
Pushed by aclemens into branch 'master'.

cleanup code

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

http://commits.kde.org/digikam/95f00627a9da1149c120dd0e4f1d3bc737938738

diff --git a/utilities/importui/main/importui.cpp b/utilities/importui/main=
/importui.cpp
index b9e1cbe..e1bfcfc 100644
--- a/utilities/importui/main/importui.cpp
+++ b/utilities/importui/main/importui.cpp
@@ -2098,9 +2098,7 @@ bool ImportUI::downloadCameraItems(PAlbum* pAlbum, bo=
ol onlySelected, bool delet
 =

 bool ImportUI::createSubAlbums(KUrl& downloadUrl, const CamItemInfo& info)
 {
-    QString downloadName    =3D info.downloadName;
-    QDateTime dateTime      =3D info.mtime;
-
+    QDateTime dateTime =3D info.mtime;
     QString errMsg;
 =

     if (d->albumCustomizer->autoAlbumDateEnabled())
@@ -2145,7 +2143,9 @@ bool ImportUI::createSubAlbums(KUrl& downloadUrl, con=
st CamItemInfo& info)
     {
         // We use the target file name to compute sub-albums name to take =
a care about
         // conversion on the fly option.
-        QFileInfo fi(downloadName.isEmpty() ? info.name : downloadName);
+        QFileInfo fi(info.downloadName.isEmpty()
+                     ? info.name
+                     : info.downloadName);
 =

         QString subAlbum =3D fi.suffix().toUpper();
 =