DolphinPlacesModel: remove usage of alternativeApplicationName

This is now not needed anymore since `PlacesItemModel::cleanupBookmarks` (now removed) from https://phabricator.kde.org/D9333 has run for on users systems.

diff --git a/src/dolphinplacesmodelsingleton.cpp b/src/dolphinplacesmodelsingleton.cpp
index 3044dc8f5544776a0887b687e9053ba6191604ad..301150394d84a3b3b150a369909ae99e9885eb7d 100644 (file)
--- a/src/dolphinplacesmodelsingleton.cpp
+++ b/src/dolphinplacesmodelsingleton.cpp
@@ -13,8 +13,8 @@
 #include <QIcon>
 #include <QMimeData>
 
 #include <QIcon>
 #include <QMimeData>
 

-DolphinPlacesModel::DolphinPlacesModel(const QString &alternativeApplicationName, QObject *parent)
-    : KFilePlacesModel(alternativeApplicationName, parent)
+DolphinPlacesModel::DolphinPlacesModel(QObject *parent)
+    : KFilePlacesModel(parent)

 {
     connect(&Trash::instance(), &Trash::emptinessChanged, this, &DolphinPlacesModel::slotTrashEmptinessChanged);
 }
 {
     connect(&Trash::instance(), &Trash::emptinessChanged, this, &DolphinPlacesModel::slotTrashEmptinessChanged);
 }


@@ -118,7 +118,7 @@ bool DolphinPlacesModel::isTrash(const QModelIndex &index) const
 }
 
 DolphinPlacesModelSingleton::DolphinPlacesModelSingleton()
 }
 
 DolphinPlacesModelSingleton::DolphinPlacesModelSingleton()

-    : m_placesModel(new DolphinPlacesModel(KAboutData::applicationData().componentName() + applicationNameSuffix()))
+    : m_placesModel(new DolphinPlacesModel())

 {
 }
 
 {
 }
 


@@ -133,9 +133,4 @@ DolphinPlacesModel *DolphinPlacesModelSingleton::placesModel() const
     return m_placesModel.data();
 }
 
     return m_placesModel.data();
 }
 

-QString DolphinPlacesModelSingleton::applicationNameSuffix()
-{
-    return QStringLiteral("-places-panel");
-}
-

 #include "moc_dolphinplacesmodelsingleton.cpp"
 #include "moc_dolphinplacesmodelsingleton.cpp"

diff --git a/src/dolphinplacesmodelsingleton.h b/src/dolphinplacesmodelsingleton.h
index a0524068f5d2e1d8f5a5826ccff34355a32f8813..161a19cbc82beae5a4a5fdb92ec1edfe5396245d 100644 (file)
--- a/src/dolphinplacesmodelsingleton.h
+++ b/src/dolphinplacesmodelsingleton.h
@@ -23,7 +23,7 @@ class DolphinPlacesModel : public KFilePlacesModel
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    explicit DolphinPlacesModel(const QString &alternativeApplicationName, QObject *parent = nullptr);
+    explicit DolphinPlacesModel(QObject *parent = nullptr);

     ~DolphinPlacesModel() override;
 
     bool panelsLocked() const;
     ~DolphinPlacesModel() override;
 
     bool panelsLocked() const;


@@ -54,9 +54,6 @@ public:
     static DolphinPlacesModelSingleton &instance();
 
     DolphinPlacesModel *placesModel() const;
     static DolphinPlacesModelSingleton &instance();
 
     DolphinPlacesModel *placesModel() const;

-    /** A suffix to the application-name of the stored bookmarks is
-     added, which is only read by PlacesItemModel. */
-    static QString applicationNameSuffix();

 
     DolphinPlacesModelSingleton(const DolphinPlacesModelSingleton &) = delete;
     DolphinPlacesModelSingleton &operator=(const DolphinPlacesModelSingleton &) = delete;
 
     DolphinPlacesModelSingleton(const DolphinPlacesModelSingleton &) = delete;
     DolphinPlacesModelSingleton &operator=(const DolphinPlacesModelSingleton &) = delete;