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

List:       kde-commits
Subject:    [digikam] utilities/importui: polish and remove unused code
From:       Maik Qualmann <null () kde ! org>
Date:       2017-10-01 7:20:59
Message-ID: E1dyYYd-0001h5-P3 () code ! kde ! org
[Download RAW message or body]

Git commit 2daa4968ad2a4d9b785d5d59ad96ec52f9249a7d by Maik Qualmann.
Committed on 01/10/2017 at 07:20.
Pushed by mqualmann into branch 'master'.

polish and remove unused code

M  +6    -13   utilities/importui/main/importui.cpp
M  +0    -1    utilities/importui/main/importui.h
M  +11   -15   utilities/importui/widgets/renamecustomizer.cpp
M  +1    -7    utilities/importui/widgets/renamecustomizer.h

https://commits.kde.org/digikam/2daa4968ad2a4d9b785d5d59ad96ec52f9249a7d

diff --git a/utilities/importui/main/importui.cpp \
b/utilities/importui/main/importui.cpp index 6332c0d071..ffa782ef02 100644
--- a/utilities/importui/main/importui.cpp
+++ b/utilities/importui/main/importui.cpp
@@ -54,7 +54,6 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <QKeySequence>
-#include <QDesktopServices>
 #include <QInputDialog>
 #include <QMenuBar>
 #include <QMenu>
@@ -239,7 +238,6 @@ void ImportUI::setupUserArea()
 
     d->renameCustomizer = new RenameCustomizer(d->advBox, d->cameraTitle);
     d->renameCustomizer->setWhatsThis(i18n("Set how digiKam will rename files as \
                they are downloaded."));
-    //d->view->setRenameCustomizer(d->renameCustomizer);
     d->advBox->addItem(d->renameCustomizer, \
QIcon::fromTheme(QLatin1String("insert-image")), i18n("File Renaming Options"),  \
QLatin1String("RenameCustomizer"), true);  
@@ -500,11 +498,11 @@ void ImportUI::setupActions()
     connect(sortByRatingAction,   SIGNAL(triggered()), imageSortMapper, \
                SLOT(map()));
     connect(sortByDownloadAction, SIGNAL(triggered()), imageSortMapper, \
SLOT(map()));  
-    imageSortMapper->setMapping(sortByNameAction, \
                (int)CamItemSortSettings::SortByFileName);
-    imageSortMapper->setMapping(sortByPathAction, \
                (int)CamItemSortSettings::SortByFilePath);
-    imageSortMapper->setMapping(sortByDateAction, \
(int)CamItemSortSettings::SortByCreationDate); //TODO: Implement sort by creation \
date. +    imageSortMapper->setMapping(sortByNameAction,     \
(int)CamItemSortSettings::SortByFileName); +    \
imageSortMapper->setMapping(sortByPathAction,     \
(int)CamItemSortSettings::SortByFilePath); +    \
imageSortMapper->setMapping(sortByDateAction,     \
(int)CamItemSortSettings::SortByCreationDate); //TODO: Implement sort by creation \
                date.
     imageSortMapper->setMapping(sortByFileSizeAction, \
                (int)CamItemSortSettings::SortByFileSize);
-    imageSortMapper->setMapping(sortByRatingAction, \
(int)CamItemSortSettings::SortByRating); +    \
imageSortMapper->setMapping(sortByRatingAction,   \
                (int)CamItemSortSettings::SortByRating);
     imageSortMapper->setMapping(sortByDownloadAction, \
(int)CamItemSortSettings::SortByDownloadState);  
     d->itemSortAction->setCurrentItem(ImportSettings::instance()->getImageSortBy());
@@ -912,11 +910,6 @@ void ImportUI::saveSettings()
     config->sync();
 }
 
-void ImportUI::slotProcessUrl(const QString& url)
-{
-    QDesktopServices::openUrl(QUrl(url));
-}
-
 bool ImportUI::isBusy() const
 {
     return d->busy;
@@ -1685,11 +1678,11 @@ void ImportUI::slotUpdateDownloadName()
         {
             if (d->renameCustomizer->useDefault())
             {
-                newName = d->renameCustomizer->newName(info.name, info.ctime);
+                newName = d->renameCustomizer->newName(info.name);
             }
             else if (d->renameCustomizer->isEnabled())
             {
-                newName = d->renameCustomizer->newName(info.url().toLocalFile(), \
info.ctime); +                newName = \
d->renameCustomizer->newName(info.url().toLocalFile());  }
             else if (!refInfo.downloadName.isEmpty())
             {
diff --git a/utilities/importui/main/importui.h b/utilities/importui/main/importui.h
index 45fa301a5a..f1ea6ad405 100644
--- a/utilities/importui/main/importui.h
+++ b/utilities/importui/main/importui.h
@@ -156,7 +156,6 @@ private Q_SLOTS:
 
     void slotClose();
     void slotCancelButton();
-    void slotProcessUrl(const QString& url);
 
     void slotShowLog();
     void slotConnected(bool val);
diff --git a/utilities/importui/widgets/renamecustomizer.cpp \
b/utilities/importui/widgets/renamecustomizer.cpp index d8e5749bc3..67931a2bcd 100644
--- a/utilities/importui/widgets/renamecustomizer.cpp
+++ b/utilities/importui/widgets/renamecustomizer.cpp
@@ -67,7 +67,6 @@ public:
         renameDefault(0),
         renameCustom(0),
         changedTimer(0),
-        focusedWidget(0),
         renameDefaultBox(0),
         renameDefaultCaseType(0),
         fileMetadataLabel(0),
@@ -89,7 +88,6 @@ public:
 
     QTimer*                changedTimer;
 
-    QWidget*               focusedWidget;
     QWidget*               renameDefaultBox;
 
     QComboBox*             renameDefaultCaseType;
@@ -231,19 +229,24 @@ AdvancedRenameManager* RenameCustomizer::renameManager() const
     return d->advancedRenameManager;
 }
 
-QString RenameCustomizer::newName(const QString& fileName, const QDateTime& \
dateTime) const +QString RenameCustomizer::newName(const QString& fileName) const
 {
-    Q_UNUSED(dateTime)
-
     QString result = fileName.trimmed();
 
     if (d->renameDefault->isChecked())
     {
         switch (changeCase())
         {
-        case UPPER: return result.toUpper(); break;
-        case LOWER: return result.toLower(); break;
-        default: return result;
+            case UPPER:
+                return result.toUpper();
+                break;
+
+            case LOWER:
+                return result.toLower();
+                break;
+
+            default:
+                return result;
         }
     }
 
@@ -277,8 +280,6 @@ void RenameCustomizer::slotRadioButtonClicked(int id)
 
 void RenameCustomizer::slotRenameOptionsChanged()
 {
-    d->focusedWidget = focusWidget();
-
     d->changedTimer->setSingleShot(true);
     d->changedTimer->start(500);
 }
@@ -336,9 +337,4 @@ void RenameCustomizer::saveSettings()
     config->sync();
 }
 
-void RenameCustomizer::restoreFocus()
-{
-    d->focusedWidget->setFocus();
-}
-
 }  // namespace Digikam
diff --git a/utilities/importui/widgets/renamecustomizer.h \
b/utilities/importui/widgets/renamecustomizer.h index 43a597ea9b..2419f54334 100644
--- a/utilities/importui/widgets/renamecustomizer.h
+++ b/utilities/importui/widgets/renamecustomizer.h
@@ -37,8 +37,6 @@
 
 #include "digikam_export.h"
 
-class QDateTime;
-
 namespace Digikam
 {
 
@@ -62,7 +60,7 @@ public:
 
     void    setUseDefault(bool val);
     bool    useDefault() const;
-    QString newName(const QString& fileName, const QDateTime& date) const;
+    QString newName(const QString& fileName) const;
     Case    changeCase() const;
     void    setChangeCase(Case val);
 
@@ -76,10 +74,6 @@ Q_SIGNALS:
 
     void signalChanged();
 
-public Q_SLOTS:
-
-    void restoreFocus();
-
 private:
 
     void readSettings();


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