Store model as a DolphinPlacesModel

Because that's what it is. It's a subclass anyway but saves us some
casts in the future.

diff --git a/src/dolphinplacesmodelsingleton.cpp b/src/dolphinplacesmodelsingleton.cpp
index 754070c9298bc6f610f5119a8b3d5dfd1a7dd895..02fbf05d089ebd4c42e8f17934b7b514de0c3c25 100644 (file)
--- a/src/dolphinplacesmodelsingleton.cpp
+++ b/src/dolphinplacesmodelsingleton.cpp
@@ -70,7 +70,7 @@ DolphinPlacesModelSingleton &DolphinPlacesModelSingleton::instance()
     return s_self;
 }
 
     return s_self;
 }
 

-KFilePlacesModel *DolphinPlacesModelSingleton::placesModel() const
+DolphinPlacesModel *DolphinPlacesModelSingleton::placesModel() const

 {
     return m_placesModel.data();
 }
 {
     return m_placesModel.data();
 }

diff --git a/src/dolphinplacesmodelsingleton.h b/src/dolphinplacesmodelsingleton.h
index 7efe6e093cc6ff08e7bb8cd31b6cd1b45d172a44..84151fa8cbf0f8d921a18b0201be66a0e10eb9bb 100644 (file)
--- a/src/dolphinplacesmodelsingleton.h
+++ b/src/dolphinplacesmodelsingleton.h
@@ -47,7 +47,7 @@ class DolphinPlacesModelSingleton
 public:
     static DolphinPlacesModelSingleton& instance();
 
 public:
     static DolphinPlacesModelSingleton& instance();
 

-    KFilePlacesModel *placesModel() const;
+    DolphinPlacesModel *placesModel() const;

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


@@ -58,7 +58,7 @@ public:
 private:
     DolphinPlacesModelSingleton();
 
 private:
     DolphinPlacesModelSingleton();
 

-    QScopedPointer<KFilePlacesModel> m_placesModel;
+    QScopedPointer<DolphinPlacesModel> m_placesModel;

 };
 
 #endif // DOLPHINPLACESMODELSINGLETON_H
 };
 
 #endif // DOLPHINPLACESMODELSINGLETON_H