Merge branch 'Applications/19.08'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 8e821d8aae23ed497eba4bb88aad947ef9991c6c..98b812497986f472efb9360815633af928fa21a0 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -409,6 +409,8 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
     }
 
     m_searchModeEnabled = enabled;
     }
 
     m_searchModeEnabled = enabled;

+
+    emit searchModeEnabledChanged(enabled);

 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const


@@ -451,7 +453,7 @@ QString DolphinViewContainer::caption() const
     }
 
     KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
     }
 
     KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();

-    const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, url(), 1, Qt::MatchExactly);
+    const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegExp);

 
     if (!matchedPlaces.isEmpty()) {
         return placesModel->text(matchedPlaces.first());
 
     if (!matchedPlaces.isEmpty()) {
         return placesModel->text(matchedPlaces.first());


@@ -698,7 +700,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
                 app = browser;
                 if (app.startsWith('!')) {
                     // a literal command has been configured, remove the '!' prefix
                 app = browser;
                 if (app.startsWith('!')) {
                     // a literal command has been configured, remove the '!' prefix

-                    app = app.mid(1);
+                    app.remove(0, 1);

                 }
             }
         } else {
                 }
             }
         } else {


@@ -786,7 +788,7 @@ void DolphinViewContainer::showErrorMessage(const QString& msg)
 
 bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
 {
 
 bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
 {

-    return url.scheme().contains(QStringLiteral("search"));
+    return url.scheme().contains(QLatin1String("search"));

 }
 
 void DolphinViewContainer::saveViewState()
 }
 
 void DolphinViewContainer::saveViewState()