dolphinview: fix crash

[dolphin.git] / src / dolphinplacesmodelsingleton.h

diff --git a/src/dolphinplacesmodelsingleton.h b/src/dolphinplacesmodelsingleton.h
index 7efe6e093cc6ff08e7bb8cd31b6cd1b45d172a44..161a19cbc82beae5a4a5fdb92ec1edfe5396245d 100644 (file)
--- a/src/dolphinplacesmodelsingleton.h
+++ b/src/dolphinplacesmodelsingleton.h
@@ -7,8 +7,8 @@
 #ifndef DOLPHINPLACESMODELSINGLETON_H
 #define DOLPHINPLACESMODELSINGLETON_H
 
-#include <QString>
 #include <QScopedPointer>
+#include <QString>
 
 #include <KFilePlacesModel>
 
@@ -23,9 +23,15 @@ 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;
+    void setPanelsLocked(bool locked);
+
+    QStringList mimeTypes() const override;
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
+
 protected:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
@@ -36,6 +42,7 @@ private:
     bool isTrash(const QModelIndex &index) const;
 
     bool m_isEmpty = false;
+    bool m_panelsLocked = true; // common-case, panels are locked
 };
 
 /**
@@ -43,22 +50,18 @@ private:
  */
 class DolphinPlacesModelSingleton
 {
-
 public:
-    static DolphinPlacesModelSingleton& instance();
+    static DolphinPlacesModelSingleton &instance();
 
-    KFilePlacesModel *placesModel() const;
-    /** A suffix to the application-name of the stored bookmarks is
-     added, which is only read by PlacesItemModel. */
-    static QString applicationNameSuffix();
+    DolphinPlacesModel *placesModel() const;
 
-    DolphinPlacesModelSingleton(const DolphinPlacesModelSingleton&) = delete;
-    DolphinPlacesModelSingleton& operator=(const DolphinPlacesModelSingleton&) = delete;
+    DolphinPlacesModelSingleton(const DolphinPlacesModelSingleton &) = delete;
+    DolphinPlacesModelSingleton &operator=(const DolphinPlacesModelSingleton &) = delete;
 
 private:
     DolphinPlacesModelSingleton();
 
-    QScopedPointer<KFilePlacesModel> m_placesModel;
+    QScopedPointer<DolphinPlacesModel> m_placesModel;
 };
 
 #endif // DOLPHINPLACESMODELSINGLETON_H