From bca889a2bdc89ee3fca3a8a8da6f2e1835cab49b Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 15 May 2018 10:50:54 +0200
Subject: QUrl for paths

---
 framework/src/extensionmodel.cpp | 6 +++---
 framework/src/extensionmodel.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/src/extensionmodel.cpp b/framework/src/extensionmodel.cpp
index 5f42aa7a..9256f5df 100644
--- a/framework/src/extensionmodel.cpp
+++ b/framework/src/extensionmodel.cpp
@@ -60,7 +60,7 @@ void ExtensionModel::load()
         QDir dir{path + "/org/kube/" + mExtensionPoint};
         for (const auto &pluginName : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
             const auto pluginPath = dir.path() + "/" + pluginName;
-            mPaths.insert(pluginName, pluginPath);
+            mPaths.insert(pluginName, QUrl::fromLocalFile(pluginPath));
             auto item = new QStandardItem;
             item->setData(pluginName, Name);
             item->setData(pluginName, Tooltip);
@@ -85,12 +85,12 @@ void ExtensionModel::load()
     setSourceModel(model);
 }
 
-QString ExtensionModel::findSource(const QString &extensionName, const QString &sourceName)
+QUrl ExtensionModel::findSource(const QString &extensionName, const QString &sourceName)
 {
     if (mPaths.isEmpty()) {
         load();
     }
-    return mPaths.value(extensionName) + "/" + sourceName;
+    return mPaths.value(extensionName).resolved(QUrl{extensionName + "/" + sourceName});
 }
 
 void ExtensionModel::setSortOrder(const QVariantList &order)
diff --git a/framework/src/extensionmodel.h b/framework/src/extensionmodel.h
index 54cbb753..91ec2ef5 100644
--- a/framework/src/extensionmodel.h
+++ b/framework/src/extensionmodel.h
@@ -54,14 +54,14 @@ public:
     void setExtensionPoint(const QString &order);
     QString extensionPoint() const;
 
-    Q_INVOKABLE QString findSource(const QString &extensionName, const QString &sourceName);
+    Q_INVOKABLE QUrl findSource(const QString &extensionName, const QString &sourceName);
 
 private slots:
     void load();
 
 private:
     QStringList mSortOrder;
-    QHash<QString, QString> mPaths;
+    QHash<QString, QUrl> mPaths;
     QString mExtensionPoint;
 };
 
-- 
cgit v1.2.3