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

List:       kde-commits
Subject:    [digikam] core/utilities/timeadjust: polish
From:       Maik Qualmann <null () kde ! org>
Date:       2018-09-19 19:18:10
Message-ID: E1g2hzG-0000H7-Aa () code ! kde ! org
[Download RAW message or body]

Git commit 628572578ea75bc2f106fdbab1726a686d2ef479 by Maik Qualmann.
Committed on 19/09/2018 at 19:17.
Pushed by mqualmann into branch 'master'.

polish

M  +5    -5    core/utilities/timeadjust/timeadjustdialog.cpp
M  +1    -2    core/utilities/timeadjust/timeadjusttask.cpp
M  +1    -1    core/utilities/timeadjust/timeadjusttask.h
M  +3    -3    core/utilities/timeadjust/timeadjustthread.cpp
M  +1    -1    core/utilities/timeadjust/timeadjustthread.h

https://commits.kde.org/digikam/628572578ea75bc2f106fdbab1726a686d2ef479

diff --git a/core/utilities/timeadjust/timeadjustdialog.cpp b/core/utilities/timeadjust/timeadjustdialog.cpp
index 2dfb8277e8..c8adb09209 100644
--- a/core/utilities/timeadjust/timeadjustdialog.cpp
+++ b/core/utilities/timeadjust/timeadjustdialog.cpp
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2012      by Smit Mehta <smit dot meh at gmail dot com>
  * Copyright (C) 2003-2005 by Jesper Pedersen <blackie@kde.org>
- * Copyright (C) 2006-2015 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (c) 2018      by Maik Qualmann <metzpinguin at gmail dot com>
  *
  * This program is free software; you can redistribute it
@@ -51,16 +51,16 @@
 
 // KDE includes
 
-#include <ksharedconfig.h>
 #include <kconfiggroup.h>
+#include <ksharedconfig.h>
 #include <klocalizedstring.h>
-#include <kwindowconfig.h>
 
 // Local includes
 
 #include "dmetadata.h"
 #include "dprogresswdg.h"
 #include "digikam_debug.h"
+#include "dxmlguiwindow.h"
 #include "dinfointerface.h"
 #include "timeadjustlist.h"
 #include "digikam_version.h"
@@ -229,7 +229,7 @@ void TimeAdjustDialog::readSettings()
 
     winId();
     KConfigGroup group2 = config->group(QLatin1String("Time Adjust Dialog"));
-    KWindowConfig::restoreWindowSize(windowHandle(), group2);
+    DXmlGuiWindow::restoreWindowSize(windowHandle(), group2);
     resize(windowHandle()->size());
 }
 
@@ -260,7 +260,7 @@ void TimeAdjustDialog::saveSettings()
     group.writeEntry(QLatin1String("File Timestamp Type"),           prm.fileDateSource);
 
     KConfigGroup group2 = config->group(QLatin1String("Time Adjust Dialog"));
-    KWindowConfig::saveWindowSize(windowHandle(), group2);
+    DXmlGuiWindow::saveWindowSize(windowHandle(), group2);
 }
 
 void TimeAdjustDialog::disableApplTimestamp()
diff --git a/core/utilities/timeadjust/timeadjusttask.cpp b/core/utilities/timeadjust/timeadjusttask.cpp
index 007a7de5e8..5874b29c34 100644
--- a/core/utilities/timeadjust/timeadjusttask.cpp
+++ b/core/utilities/timeadjust/timeadjusttask.cpp
@@ -35,7 +35,6 @@ extern "C"
 // Qt includes
 
 #include <QFile>
-#include <QFileInfo>
 
 // Local includes
 
@@ -83,7 +82,7 @@ void TimeAdjustTask::setSettings(const TimeAdjustContainer& settings)
     d->settings = settings;
 }
 
-void TimeAdjustTask::setItemsMap(QMap<QUrl, QDateTime> itemsMap)
+void TimeAdjustTask::setItemsMap(const QMap<QUrl, QDateTime>& itemsMap)
 {
     d->itemsMap = itemsMap;
 }
diff --git a/core/utilities/timeadjust/timeadjusttask.h b/core/utilities/timeadjust/timeadjusttask.h
index e31987baa7..85b56d63d4 100644
--- a/core/utilities/timeadjust/timeadjusttask.h
+++ b/core/utilities/timeadjust/timeadjusttask.h
@@ -47,7 +47,7 @@ public:
     ~TimeAdjustTask();
 
     void setSettings(const TimeAdjustContainer& settings);
-    void setItemsMap(QMap<QUrl, QDateTime> itemsMap);
+    void setItemsMap(const QMap<QUrl, QDateTime>& itemsMap);
 
 Q_SIGNALS:
 
diff --git a/core/utilities/timeadjust/timeadjustthread.cpp b/core/utilities/timeadjust/timeadjustthread.cpp
index e1099d5465..7e5372af42 100644
--- a/core/utilities/timeadjust/timeadjustthread.cpp
+++ b/core/utilities/timeadjust/timeadjustthread.cpp
@@ -70,16 +70,16 @@ TimeAdjustThread::~TimeAdjustThread()
     delete d;
 }
 
-void TimeAdjustThread::setUpdatedDates(const QMap<QUrl, QDateTime>& map)
+void TimeAdjustThread::setUpdatedDates(const QMap<QUrl, QDateTime>& itemsMap)
 {
-    d->itemsMap = map;
+    d->itemsMap = itemsMap;
     ActionJobCollection collection;
 
     foreach (const QUrl& url, d->itemsMap.keys())
     {
         TimeAdjustTask* const t = new TimeAdjustTask(url);
         t->setSettings(d->settings);
-        t->setItemsMap(map);
+        t->setItemsMap(d->itemsMap);
 
         connect(t, SIGNAL(signalProcessStarted(QUrl)),
                 this, SIGNAL(signalProcessStarted(QUrl)));
diff --git a/core/utilities/timeadjust/timeadjustthread.h b/core/utilities/timeadjust/timeadjustthread.h
index 30a30aad57..999f932b39 100644
--- a/core/utilities/timeadjust/timeadjustthread.h
+++ b/core/utilities/timeadjust/timeadjustthread.h
@@ -50,7 +50,7 @@ public:
     explicit TimeAdjustThread(QObject* const parent);
     ~TimeAdjustThread();
 
-    void setUpdatedDates(const QMap<QUrl, QDateTime>& map);
+    void setUpdatedDates(const QMap<QUrl, QDateTime>& itemsMap);
     void setSettings(const TimeAdjustContainer& settings);
     void cancel();
 
[prev in list] [next in list] [prev in thread] [next in thread]