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

List:       kde-commits
Subject:    [digikam] core: polish
From:       Maik Qualmann <null () kde ! org>
Date:       2018-09-02 20:16:41
Message-ID: E1fwYnZ-0001hm-FJ () code ! kde ! org
[Download RAW message or body]

Git commit 71515b9a4dd38febd958c3b2494b583ce7b469a0 by Maik Qualmann.
Committed on 02/09/2018 at 20:16.
Pushed by mqualmann into branch 'master'.

polish

M  +8    -4    core/libs/widgets/mainview/dxmlguiwindow.cpp
M  +1    -1    core/utilities/assistants/webservices/common/wsstarter.cpp
M  +1    -1    core/utilities/assistants/webservices/common/wsstarter.h

https://commits.kde.org/digikam/71515b9a4dd38febd958c3b2494b583ce7b469a0

diff --git a/core/libs/widgets/mainview/dxmlguiwindow.cpp \
b/core/libs/widgets/mainview/dxmlguiwindow.cpp index 32a7da6352..01cfc13133 100644
--- a/core/libs/widgets/mainview/dxmlguiwindow.cpp
+++ b/core/libs/widgets/mainview/dxmlguiwindow.cpp
@@ -1273,10 +1273,6 @@ int DXmlGuiWindow::actionToWebService(QAction* const action) \
const  {
         return WSStarter::ExportFileTransfer;
     }
-    else if (action == m_importFileTransferAction)
-    {
-        return WSStarter::ImportFileTransfer;
-    }
 #endif
 
     else if (action == m_exportFlickrAction)
@@ -1339,6 +1335,14 @@ int DXmlGuiWindow::actionToWebService(QAction* const action) \
const  {
         return WSStarter::ImportGphoto;
     }
+
+#ifdef HAVE_KIO
+    else if (action == m_importFileTransferAction)
+    {
+        return WSStarter::ImportFileTransfer;
+    }
+#endif
+
     else if (action == m_importSmugmugAction)
     {
         return WSStarter::ImportSmugmug;
diff --git a/core/utilities/assistants/webservices/common/wsstarter.cpp \
b/core/utilities/assistants/webservices/common/wsstarter.cpp index \
                4f125efb40..5f804080dc 100644
--- a/core/utilities/assistants/webservices/common/wsstarter.cpp
+++ b/core/utilities/assistants/webservices/common/wsstarter.cpp
@@ -429,7 +429,7 @@ void WSStarter::fromWebService(int tool, DInfoInterface* const \
iface, QWidget* c  }
 }
 
-bool WSStarter::checkWebService(QWidget* const widget)
+bool WSStarter::checkWebService(QWidget* const widget) const
 {
     if (widget && (widget->isMinimized() || !widget->isHidden()))
     {
diff --git a/core/utilities/assistants/webservices/common/wsstarter.h \
b/core/utilities/assistants/webservices/common/wsstarter.h index \
                d20c3ac097..cb0a1ac53e 100644
--- a/core/utilities/assistants/webservices/common/wsstarter.h
+++ b/core/utilities/assistants/webservices/common/wsstarter.h
@@ -85,7 +85,7 @@ private:
     void toWebService(int tool, DInfoInterface* const iface, QWidget* const parent);
     void fromWebService(int tool, DInfoInterface* const iface, QWidget* const \
parent);  
-    bool checkWebService(QWidget* const widget);
+    bool checkWebService(QWidget* const widget) const;
 
 private:
 


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