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

List:       kde-commits
Subject:    [kipi-plugins/frameworks] common/libkipiplugins/tools: port++
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-11-26 7:50:16
Message-ID: E1XtXMe-0007eq-EM () scm ! kde ! org
[Download RAW message or body]

Git commit 4069b592b78a9b5fbe588ea5a6907c728ba48d88 by Gilles Caulier.
Committed on 26/11/2014 at 07:50.
Pushed by cgilles into branch 'frameworks'.

port++

M  +10   -11   common/libkipiplugins/tools/kpbinaryiface.cpp
M  +4    -11   common/libkipiplugins/tools/kpbinaryiface.h

http://commits.kde.org/kipi-plugins/4069b592b78a9b5fbe588ea5a6907c728ba48d88


diff --git a/common/libkipiplugins/tools/kpbinaryiface.cpp \
b/common/libkipiplugins/tools/kpbinaryiface.cpp index 48adb83..c3323f4 \
                100644
--- a/common/libkipiplugins/tools/kpbinaryiface.cpp
+++ b/common/libkipiplugins/tools/kpbinaryiface.cpp
@@ -30,11 +30,10 @@
 
 // KDE includes
 
-#include <kapplication.h>
-#include <kmessagebox.h>
 #include <kfiledialog.h>
 #include <klocale.h>
-#include <kvbox.h>
+#include <kconfig.h>
+#include <kconfiggroup.h>
 
 // Local includes
 
@@ -53,7 +52,7 @@ KPBinaryIface::KPBinaryIface(const QString& binaryName, \
const QString& minimalVe  m_binaryBaseName(goodBaseName(binaryName)),
       m_binaryArguments(args), 
       m_projectName(projectName), 
-      m_url(KUrl(url)),
+      m_url(QUrl(url)),
       m_isFound(false), 
       m_developmentVersion(false),
       m_version(""), 
@@ -130,20 +129,20 @@ void KPBinaryIface::setVersion(QString& version)
 
 void KPBinaryIface::slotNavigateAndCheck()
 {
-    KUrl start;
+    QUrl start;
 
     if (isValid() && !m_pathDir.isEmpty())
     {
-        start = KUrl(m_pathDir);
+        start = QUrl(m_pathDir);
     }
     else
     {
 #if defined Q_OS_MAC
-        start = KUrl(QString("/Applications/"));
+        start = QUrl(QString("/Applications/"));
 #elif defined Q_OS_WIN
-        start = KUrl(QString("C:/Program Files/"));
+        start = QUrl(QString("C:/Program Files/"));
 #else
-        start = KUrl(QString("/usr/bin/"));
+        start = QUrl(QString("/usr/bin/"));
 #endif
     }
 
@@ -151,7 +150,7 @@ void KPBinaryIface::slotNavigateAndCheck()
                                              QString(m_binaryBaseName),
                                              0,
                                              QString(i18n("Navigate to \
                %1", m_binaryBaseName)));
-    QString dir = KUrl(f).directory();
+    QString dir = QUrl(f).adjusted(QUrl::RemoveFilename).path();
     m_searchPaths << dir;
 
     if (checkDir(dir))
@@ -259,7 +258,7 @@ bool KPBinaryIface::recheckDirectories()
         return true;
     }
 
-    foreach(QString dir, m_searchPaths)
+    foreach(const QString& dir, m_searchPaths)
     {
         checkDir(dir);
 
diff --git a/common/libkipiplugins/tools/kpbinaryiface.h \
b/common/libkipiplugins/tools/kpbinaryiface.h index bb9b127..8c8eafd 100644
--- a/common/libkipiplugins/tools/kpbinaryiface.h
+++ b/common/libkipiplugins/tools/kpbinaryiface.h
@@ -33,13 +33,7 @@
 #include <QLineEdit>
 #include <QSet>
 #include <QGridLayout>
-
-// KDE includes
-
-#include <kurl.h>
-#include <kmessagebox.h>
-#include <kconfig.h>
-#include <kconfiggroup.h>
+#include <QUrl>
 
 // Local includes
 
@@ -61,8 +55,7 @@ public:
                   const QString& projectName, 
                   const QString& url,
                   const QString& pluginName, 
-                  const QStringList& args = QStringList()
-                 );
+                  const QStringList& args = QStringList());
     virtual ~KPBinaryIface();
 
     bool                isFound()               const { return m_isFound;  \
} @@ -82,7 +75,7 @@ public:
     virtual QString     minimalVersion()        const { return \
m_minimalVersion;                }  
 
-    virtual KUrl        url()                   const { return m_url;      \
} +    virtual QUrl        url()                   const { return m_url;    \
                }
     virtual QString     projectName()           const { return \
m_projectName;                   }  
     static QString      goodBaseName(const QString& b)
@@ -123,7 +116,7 @@ protected:
     const QString       m_binaryBaseName;
     const QStringList   m_binaryArguments;
     const QString       m_projectName;
-    const KUrl          m_url;
+    const QUrl          m_url;
 
     bool                m_isFound;
     bool                m_developmentVersion;


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