Modernize: Use override where possible

[dolphin.git] / src / dolphinpart.h

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 3203cb90fdcf73024b648376111182bcdc0764c2..845d843651aa6b1d9e7c548646abf1f800b4b001 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -20,21 +20,21 @@
 #ifndef DOLPHINPART_H
 #define DOLPHINPART_H
 
 #ifndef DOLPHINPART_H
 #define DOLPHINPART_H
 

-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-class KNewMenu;
+#include <KParts/ReadOnlyPart>
+#include <QUrl>
+
+
+class DolphinNewFileMenu;

 class DolphinViewActionHandler;
 class QActionGroup;
 class DolphinViewActionHandler;
 class QActionGroup;

-class KAction;

 class KFileItemList;
 class KFileItem;
 class DolphinPartBrowserExtension;
 class KFileItemList;
 class KFileItem;
 class DolphinPartBrowserExtension;

-class DolphinSortFilterProxyModel;
-class DolphinModel;
+class DolphinRemoteEncoding;

 class KDirLister;
 class DolphinView;
 class KDirLister;
 class DolphinView;

-class QLineEdit;

 class KAboutData;
 class KAboutData;

+class DolphinRemoveAction;

 
 class DolphinPart : public KParts::ReadOnlyPart
 {
 
 class DolphinPart : public KParts::ReadOnlyPart
 {


@@ -49,9 +49,12 @@ 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 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( QList<QUrl> filesToSelect READ filesToSelect WRITE setFilesToSelect )
+

 public:
     explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args);
 public:
     explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args);

-    ~DolphinPart();
+    ~DolphinPart() override;

 
     static KAboutData* createAboutData();
 
 
     static KAboutData* createAboutData();
 


@@ -59,7 +62,7 @@ public:
      * Standard KParts::ReadOnlyPart openUrl method.
      * Called by Konqueror to view a directory in DolphinPart.
      */
      * Standard KParts::ReadOnlyPart openUrl method.
      * Called by Konqueror to view a directory in DolphinPart.
      */

-    virtual bool openUrl(const KUrl& url);
+    bool openUrl(const QUrl& url) override;

 
     /// see the supportsUndo property
     bool supportsUndo() const { return true; }
 
     /// see the supportsUndo property
     bool supportsUndo() const { return true; }


@@ -95,7 +98,7 @@ protected:
     /**
      * We reimplement openUrl so no need to implement openFile.
      */
     /**
      * We reimplement openUrl so no need to implement openFile.
      */

-    virtual bool openFile() { return true; }
+    bool openFile() override { return true; }

 
 Q_SIGNALS:
     /**
 
 Q_SIGNALS:
     /**


@@ -110,9 +113,7 @@ Q_SIGNALS:
     void aboutToOpenURL();
 
 private Q_SLOTS:
     void aboutToOpenURL();
 
 private Q_SLOTS:

-    void slotCompleted(const KUrl& url);
-    void slotCanceled(const KUrl& url);
-    void slotInfoMessage(const QString& msg);
+    void slotMessage(const QString& msg);

     void slotErrorMessage(const QString& msg);
     /**
      * Shows the information for the item \a item inside the statusbar. If the
     void slotErrorMessage(const QString& msg);
     /**
      * Shows the information for the item \a item inside the statusbar. If the


@@ -122,24 +123,28 @@ private Q_SLOTS:
     /**
      * Handles clicking on an item
      */
     /**
      * Handles clicking on an item
      */

-    void slotItemTriggered(const KFileItem& item);
+    void slotItemActivated(const KFileItem& item);

     /**
     /**

-     * Creates a new window showing the content of \a url.
+     * Handles activation of multiple items

      */
      */

-    void createNewWindow(const KUrl& url);
+    void slotItemsActivated(const KFileItemList& items);

     /**
     /**

-     * Opens the context menu on the current mouse position.
-     * @item  File item context. If item is 0, the context menu
-     *        should be applied to \a url.
-     * @url   URL which contains \a item.
+     * Creates a new window showing the content of \a url.

      */
      */

-    void slotOpenContextMenu(const KFileItem& item, const KUrl& url);
-
+    void createNewWindow(const QUrl &url);

     /**
     /**

-     * Asks the host to open the URL \a url if the current view has
-     * a different URL.
+     * Opens the context menu on the current mouse position.
+     * @pos           Position in screen coordinates.
+     * @item          File item context. If item is null, the context menu
+     *                should be applied to \a url.
+     * @url           URL which contains \a item.
+     * @customActions Actions that should be added to the context menu,
+     *                if the file item is null.

      */
      */

-    void slotRequestUrlChange(const KUrl& url);
+    void slotOpenContextMenu(const QPoint& pos,
+                             const KFileItem& item,
+                             const QUrl& url,
+                             const QList<QAction*>& customActions);

 
     /**
      * Informs the host that we are opening \a url (e.g. after a redirection
 
     /**
      * Informs the host that we are opening \a url (e.g. after a redirection


@@ -147,7 +152,7 @@ private Q_SLOTS:
      * Testcase 1: fish://localhost
      * Testcase 2: showing a directory that is being renamed by another window (#180156)
      */
      * 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 QUrl& oldUrl, const QUrl& newUrl);

 
     /**
      * Updates the state of the 'Edit' menu actions and emits
 
     /**
      * Updates the state of the 'Edit' menu actions and emits


@@ -171,11 +176,28 @@ private Q_SLOTS:
      */
     void slotEditMimeType();
 
      */
     void slotEditMimeType();
 

+    /**
+     * Connected to the "select_items_matching" action.
+     * Opens a dialog which permits to select all items matching a pattern like "*.jpg".
+     */
+    void slotSelectItemsMatchingPattern();
+
+    /**
+     * Connected to the "unselect_items_matching" action.
+     * Opens a dialog which permits to unselect all items matching a pattern like "*.jpg".
+     */
+    void slotUnselectItemsMatchingPattern();
+

     /**
      * Open a terminal window, starting with the current directory.
      */
     void slotOpenTerminal();
 
     /**
      * Open a terminal window, starting with the current directory.
      */
     void slotOpenTerminal();
 

+    /**
+     * Open KFind with the current path.
+     */
+    void slotFindFile();
+

     /**
      * Updates the 'Create New...' sub menu, just before it's shown.
      */
     /**
      * Updates the 'Create New...' sub menu, just before it's shown.
      */


@@ -193,39 +215,36 @@ private Q_SLOTS:
     */
     void updateProgress(int percent);
 
     */
     void updateProgress(int percent);
 

+    void createDirectory();
+
+    /**
+     * Called by konqueror --select
+     */
+    void setFilesToSelect(const QList<QUrl> &files);
+    QList<QUrl> filesToSelect() const { return QList<QUrl>(); } // silence moc
+
+    bool eventFilter(QObject*, QEvent*) override;
+

 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,
                         const QString& text, const QString& url,
                         QActionGroup* actionGroup);
 
 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,
                         const QString& text, const QString& url,
                         QActionGroup* actionGroup);
 

+    void openSelectionDialog(const QString& title, const QString& text,
+                             bool selectItems);
+

 private:
     DolphinView* m_view;
     DolphinViewActionHandler* m_actionHandler;
 private:
     DolphinView* m_view;
     DolphinViewActionHandler* m_actionHandler;

-    KDirLister* m_dirLister;
-    DolphinModel* m_dolphinModel;
-    DolphinSortFilterProxyModel* m_proxyModel;
+    DolphinRemoteEncoding* m_remoteEncoding;

     DolphinPartBrowserExtension* m_extension;
     DolphinPartBrowserExtension* m_extension;

-    KNewMenu* m_newMenu;
+    DolphinNewFileMenu* m_newFileMenu;
+    QAction* m_findFileAction;
+    QAction* m_openTerminalAction;

     QString m_nameFilter;
     QString m_nameFilter;

+    DolphinRemoveAction* m_removeAction;

     Q_DISABLE_COPY(DolphinPart)
 };
 
     Q_DISABLE_COPY(DolphinPart)
 };
 

-class DolphinPartBrowserExtension : public KParts::BrowserExtension
-{
-    Q_OBJECT
-public:
-    DolphinPartBrowserExtension( DolphinPart* part )
-        : KParts::BrowserExtension( part ), m_part(part) {}
-
-public Q_SLOTS:
-    void cut();
-    void copy();
-    void paste();
-    void reparseConfiguration();
-
-private:
-    DolphinPart* m_part;
-};
-

 #endif /* DOLPHINPART_H */
 #endif /* DOLPHINPART_H */