diff options
| author | Méven Car <[email protected]> | 2023-09-29 09:29:16 +0200 |
|---|---|---|
| committer | Méven Car <[email protected]> | 2023-09-30 07:15:18 +0000 |
| commit | cff402356e269d562a3acf2292cfdac233b1032c (patch) | |
| tree | 9736345136ee73994467506248171243b6f46214 | |
| parent | 55a0a2fac47ed8cef9d65716b66ccbb71e411e6c (diff) | |
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.
| -rw-r--r-- | src/dolphinplacesmodelsingleton.cpp | 11 | ||||
| -rw-r--r-- | src/dolphinplacesmodelsingleton.h | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/dolphinplacesmodelsingleton.cpp b/src/dolphinplacesmodelsingleton.cpp index 3044dc8f5..301150394 100644 --- a/src/dolphinplacesmodelsingleton.cpp +++ b/src/dolphinplacesmodelsingleton.cpp @@ -13,8 +13,8 @@ #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); } @@ -118,7 +118,7 @@ bool DolphinPlacesModel::isTrash(const QModelIndex &index) const } 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(); } -QString DolphinPlacesModelSingleton::applicationNameSuffix() -{ - return QStringLiteral("-places-panel"); -} - #include "moc_dolphinplacesmodelsingleton.cpp" diff --git a/src/dolphinplacesmodelsingleton.h b/src/dolphinplacesmodelsingleton.h index a0524068f..161a19cbc 100644 --- a/src/dolphinplacesmodelsingleton.h +++ b/src/dolphinplacesmodelsingleton.h @@ -23,7 +23,7 @@ class DolphinPlacesModel : public KFilePlacesModel Q_OBJECT public: - explicit DolphinPlacesModel(const QString &alternativeApplicationName, QObject *parent = nullptr); + explicit DolphinPlacesModel(QObject *parent = nullptr); ~DolphinPlacesModel() override; bool panelsLocked() const; @@ -54,9 +54,6 @@ public: 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; |
