GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / dolphinplacesmodelsingleton.cpp

diff --git a/src/dolphinplacesmodelsingleton.cpp b/src/dolphinplacesmodelsingleton.cpp
index 5ce70edbac9628ab61f5f317b0054b1861634830..301150394d84a3b3b150a369909ae99e9885eb7d 100644 (file)
--- 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);
 }
@@ -51,8 +51,7 @@ void DolphinPlacesModel::setPanelsLocked(bool locked)
 QStringList DolphinPlacesModel::mimeTypes() const
 {
     QStringList types = KFilePlacesModel::mimeTypes();
-    types << DragAndDropHelper::arkDndServiceMimeType()
-          << DragAndDropHelper::arkDndPathMimeType();
+    types << DragAndDropHelper::arkDndServiceMimeType() << DragAndDropHelper::arkDndPathMimeType();
     return types;
 }
 
@@ -119,9 +118,8 @@ bool DolphinPlacesModel::isTrash(const QModelIndex &index) const
 }
 
 DolphinPlacesModelSingleton::DolphinPlacesModelSingleton()
-    : m_placesModel(new DolphinPlacesModel(KAboutData::applicationData().componentName() + applicationNameSuffix()))
+    : m_placesModel(new DolphinPlacesModel())
 {
-
 }
 
 DolphinPlacesModelSingleton &DolphinPlacesModelSingleton::instance()
@@ -135,7 +133,4 @@ DolphinPlacesModel *DolphinPlacesModelSingleton::placesModel() const
     return m_placesModel.data();
 }
 
-QString DolphinPlacesModelSingleton::applicationNameSuffix()
-{
-    return QStringLiteral("-places-panel");
-}
+#include "moc_dolphinplacesmodelsingleton.cpp"