Fix temporary regression of sorting introduced by SVN commit 1126410

[dolphin.git] / src / dolphinpart.h

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index afbf387cc0933568620516268325b32d08254d3f..5629b9c2dfcbcea306b5ca1486f26e4a36a56028 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -25,7 +25,7 @@
 
 #include <QItemSelectionModel>
 
-class KNewMenu;
+class KNewFileMenu;
 class DolphinViewActionHandler;
 class QActionGroup;
 class KAction;
@@ -52,6 +52,9 @@ class DolphinPart : public KParts::ReadOnlyPart
     // Used by konqueror when typing something like /home/dfaure/*.diff in the location bar
     Q_PROPERTY( QString nameFilter READ nameFilter WRITE setNameFilter )
 
+    // Used by konqueror to implement the --select command-line option
+    Q_PROPERTY( KUrl::List filesToSelect READ filesToSelect WRITE setFilesToSelect )
+
 public:
     explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args);
     ~DolphinPart();
@@ -142,12 +145,6 @@ private Q_SLOTS:
                              const KUrl& url,
                              const QList<QAction*>& customActions);
 
-    /**
-     * Asks the host to open the URL \a url if the current view has
-     * a different URL.
-     */
-    void slotRequestUrlChange(const KUrl& url);
-
     /**
      * Informs the host that we are opening \a url (e.g. after a redirection
      * coming from KDirLister).
@@ -214,6 +211,12 @@ private Q_SLOTS:
 
     void createDirectory();
 
+    /**
+     * Called by konqueror --select
+     */
+    void setFilesToSelect(const KUrl::List& files);
+    KUrl::List filesToSelect() const { return KUrl::List(); } // silence moc
+
 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,
@@ -233,7 +236,7 @@ private:
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
     DolphinPartBrowserExtension* m_extension;
-    KNewMenu* m_newMenu;
+    KNewFileMenu* m_newMenu;
     QString m_nameFilter;
     Q_DISABLE_COPY(DolphinPart)
 };