X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6551c000fc68134932cdc21f2cc7086b34bff30b..7d41ad943abddc9641686e8768460960ade03c4b:/src/dolphinpart.h

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 92ee71d2c..70886d10d 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -20,25 +20,22 @@
 #ifndef DOLPHINPART_H
 #define DOLPHINPART_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/fileinfoextension.h>
+#include <KParts/ReadOnlyPart>
+#include <KUrl>
 
 #include <QItemSelectionModel>
 
-class KNewFileMenu;
+class DolphinNewFileMenu;
 class DolphinViewActionHandler;
 class QActionGroup;
-class KAction;
 class KFileItemList;
 class KFileItem;
 class DolphinPartBrowserExtension;
-class DolphinSortFilterProxyModel;
 class DolphinRemoteEncoding;
-class DolphinModel;
 class KDirLister;
 class DolphinView;
 class KAboutData;
+class DolphinRemoveAction;
 
 class DolphinPart : public KParts::ReadOnlyPart
 {
@@ -66,7 +63,7 @@ public:
      * Standard KParts::ReadOnlyPart openUrl method.
      * Called by Konqueror to view a directory in DolphinPart.
      */
-    virtual bool openUrl(const KUrl& url);
+    virtual bool openUrl(const QUrl& url) Q_DECL_OVERRIDE;
 
     /// see the supportsUndo property
     bool supportsUndo() const { return true; }
@@ -117,7 +114,6 @@ Q_SIGNALS:
     void aboutToOpenURL();
 
 private Q_SLOTS:
-    void slotCompleted(const KUrl& url);
     void slotMessage(const QString& msg);
     void slotErrorMessage(const QString& msg);
     /**
@@ -129,6 +125,10 @@ private Q_SLOTS:
      * Handles clicking on an item
      */
     void slotItemActivated(const KFileItem& item);
+    /**
+     * Handles activation of multiple items
+     */
+    void slotItemsActivated(const KFileItemList& items);
     /**
      * Creates a new window showing the content of \a url.
      */
@@ -153,7 +153,7 @@ private Q_SLOTS:
      * Testcase 1: fish://localhost
      * Testcase 2: showing a directory that is being renamed by another window (#180156)
      */
-    void slotRedirection(const KUrl& oldUrl, const KUrl& newUrl);
+    void slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl);
 
     /**
      * Updates the state of the 'Edit' menu actions and emits
@@ -224,6 +224,8 @@ private Q_SLOTS:
     void setFilesToSelect(const KUrl::List& files);
     KUrl::List filesToSelect() const { return KUrl::List(); } // silence moc
 
+    virtual bool eventFilter(QObject*, QEvent*);
+
 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,
@@ -238,46 +240,12 @@ private:
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
     DolphinPartBrowserExtension* m_extension;
-    KNewFileMenu* m_newFileMenu;
+    DolphinNewFileMenu* m_newFileMenu;
+    QAction* m_findFileAction;
+    QAction* m_openTerminalAction;
     QString m_nameFilter;
+    DolphinRemoveAction* m_removeAction;
     Q_DISABLE_COPY(DolphinPart)
 };
 
-class DolphinPartBrowserExtension : public KParts::BrowserExtension
-{
-    Q_OBJECT
-public:
-    DolphinPartBrowserExtension( DolphinPart* part )
-        : KParts::BrowserExtension( part ), m_part(part) {}
-
-    virtual void restoreState(QDataStream &stream);
-    virtual void saveState(QDataStream &stream);
-
-public Q_SLOTS:
-    void cut();
-    void copy();
-    void paste();
-    void pasteTo(const KUrl&);
-    void reparseConfiguration();
-
-private:
-    DolphinPart* m_part;
-};
-
-
-class DolphinPartFileInfoExtension : public KParts::FileInfoExtension
-{
-    Q_OBJECT
-
-public:
-    DolphinPartFileInfoExtension(DolphinPart* part);
-
-    virtual QueryModes supportedQueryModes() const;
-    virtual bool hasSelection() const;
-
-    virtual KFileItemList queryFor(QueryMode mode) const;
-protected:
-    DolphinPart* part() const;
-};
-
 #endif /* DOLPHINPART_H */