use QUrl::fromLocalFile() on devices

fixes being unable to access eg. removable drives

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index 087868361d8dd2b6c582eeffc38849080f04de76..59c2ed7332d41628919ba8d229c423a9d2ffc356 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -134,7 +134,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     const QString udi = bookmark.metaDataItem("UDI");
     if (udi.isEmpty()) {
         setIcon(bookmark.icon());
-        setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data()));
+        setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().constData()));
         setUrl(bookmark.url());
     } else {
         initializeDevice(udi);
@@ -269,26 +269,26 @@ void PlacesItem::initializeDevice(const QString& udi)
     setUdi(udi);
 
     if (m_access) {
-        setUrl(m_access->filePath());
-        QObject::connect(m_access.data(), &Solid::StorageAccess::accessibilityChanged,
-                         m_signalHandler.data(), &PlacesItemSignalHandler::onAccessibilityChanged);
+        setUrl(QUrl::fromLocalFile(m_access->filePath()));
+        QObject::connect(m_access.data(), SIGNAL(accessibilityChanged(bool,QString)),
+                         m_signalHandler.data(), SLOT(onAccessibilityChanged()));
     } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) {
         Solid::Block *block = m_device.as<Solid::Block>();
         if (block) {
             const QString device = block->device();
-            setUrl(QString("audiocd:/?device=%1").arg(device));
+            setUrl(QStringLiteral("audiocd:/?device=%1").arg(device));
         } else {
-            setUrl(QString("audiocd:/"));
+            setUrl(QStringLiteral("audiocd:/"));
         }
     } else if (m_mtp) {
-        setUrl(QString("mtp:udi=%1").arg(m_device.udi()));
+        setUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()));
     }
 }
 
 void PlacesItem::onAccessibilityChanged()
 {
     setIconOverlays(m_device.emblems());
-    setUrl(m_access->filePath());
+    setUrl(QUrl::fromLocalFile(m_access->filePath()));
 }
 
 void PlacesItem::onTrashDirListerCompleted()

diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h
index 0bb116e574e0426bc806405b2918ac90b640eb45..4ae4fd677ba8f05756e8ef649adb79a69c9f1bfa 100644 (file)
--- a/src/panels/places/placesitem.h
+++ b/src/panels/places/placesitem.h
@@ -82,10 +82,10 @@ public:
 protected:
     virtual void onDataValueChanged(const QByteArray& role,
                                     const QVariant& current,
-                                    const QVariant& previous);
+                                    const QVariant& previous) Q_DECL_OVERRIDE;
 
     virtual void onDataChanged(const QHash<QByteArray, QVariant>& current,
-                               const QHash<QByteArray, QVariant>& previous);
+                               const QHash<QByteArray, QVariant>& previous) Q_DECL_OVERRIDE;
 
 private:
     PlacesItem(const PlacesItem& item);

diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 8e6494919eb6ec093c1bc654678c3d3a651778b2..057a8b2d7db626897b90a2c9d206b81e0ce86311 100644 (file)
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -657,7 +657,7 @@ void PlacesItemModel::updateBookmarks()
                     found = true;
                     if (newBookmark.metaDataItem("UDI").isEmpty()) {
                         item->setBookmark(newBookmark);
-                        item->setText(i18nc("KFile System Bookmarks", newBookmark.text().toUtf8().data()));
+                        item->setText(i18nc("KFile System Bookmarks", newBookmark.text().toUtf8().constData()));
                     }
                     break;
                 }
@@ -764,7 +764,7 @@ void PlacesItemModel::loadBookmarks()
                     // text, the retranslation will fail and the users custom text is still used.
                     // It is important to use "KFile System Bookmarks" as context (see
                     // createSystemBookmarks()).
-                    item->setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data()));
+                    item->setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().constData()));
                     item->setSystemItem(true);
                 }
 

diff --git a/src/panels/places/placesitemsignalhandler.h b/src/panels/places/placesitemsignalhandler.h
index d767b58d3c90093322a7559507358e5afaaea1aa..af66568adc841b9bc8cbc1731a3d7755b7ef7183 100644 (file)
--- a/src/panels/places/placesitemsignalhandler.h
+++ b/src/panels/places/placesitemsignalhandler.h
@@ -29,7 +29,7 @@ class PlacesItem;
  *        and performing a corresponding action.
  *
  * PlacesItem is derived from KStandardItem, which is no QObject-class
- * on purpose. To be able to internally listening to signals and performing a
+ * on purpose. To be able to internally listen to signals and performing a
  * corresponding action, PlacesItemSignalHandler is used.
  *
  * E.g. if the PlacesItem wants to react on accessibility-changes of a storage-access,

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index a84c474809770c5e286423b92cb1e3559530ba69..b04191f1c73fa42b8e9d1f18f698c2e6a4a4ee02 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -117,7 +117,7 @@ void PlacesPanel::showEvent(QShowEvent* event)
         m_controller->setSelectionBehavior(KItemListController::SingleSelection);
         m_controller->setSingleClickActivationEnforced(true);
 
-       readSettings();
+        readSettings();
 
         connect(m_controller, &KItemListController::itemActivated, this, &PlacesPanel::slotItemActivated);
         connect(m_controller, &KItemListController::itemMiddleClicked, this, &PlacesPanel::slotItemMiddleClicked);
@@ -538,5 +538,3 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
         }
     }
 }
-
-