SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphinplacesmodelsingleton.cpp

diff --git a/src/dolphinplacesmodelsingleton.cpp b/src/dolphinplacesmodelsingleton.cpp
index 258be155ba3bd412fa2d54b3961e1facf156b69a..2d8d3572d3e235253dd9f2891ec7e4a1a34f789f 100644 (file)
--- a/src/dolphinplacesmodelsingleton.cpp
+++ b/src/dolphinplacesmodelsingleton.cpp
@@ -9,7 +9,6 @@
 #include "views/draganddrophelper.h"
 
 #include <KAboutData>
 #include "views/draganddrophelper.h"
 
 #include <KAboutData>

-#include <KFilePlacesModel>

 
 #include <QIcon>
 #include <QMimeData>
 
 #include <QIcon>
 #include <QMimeData>


@@ -52,8 +51,7 @@ void DolphinPlacesModel::setPanelsLocked(bool locked)
 QStringList DolphinPlacesModel::mimeTypes() const
 {
     QStringList types = KFilePlacesModel::mimeTypes();
 QStringList DolphinPlacesModel::mimeTypes() const
 {
     QStringList types = KFilePlacesModel::mimeTypes();

-    types << DragAndDropHelper::arkDndServiceMimeType()
-          << DragAndDropHelper::arkDndPathMimeType();
+    types << DragAndDropHelper::arkDndServiceMimeType() << DragAndDropHelper::arkDndPathMimeType();

     return types;
 }
 
     return types;
 }
 


@@ -122,7 +120,6 @@ bool DolphinPlacesModel::isTrash(const QModelIndex &index) const
 DolphinPlacesModelSingleton::DolphinPlacesModelSingleton()
     : m_placesModel(new DolphinPlacesModel(KAboutData::applicationData().componentName() + applicationNameSuffix()))
 {
 DolphinPlacesModelSingleton::DolphinPlacesModelSingleton()
     : m_placesModel(new DolphinPlacesModel(KAboutData::applicationData().componentName() + applicationNameSuffix()))
 {

-

 }
 
 DolphinPlacesModelSingleton &DolphinPlacesModelSingleton::instance()
 }
 
 DolphinPlacesModelSingleton &DolphinPlacesModelSingleton::instance()