Merge branch 'Applications/17.12'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 634c2a9e79635d0c6c3bf8405c44501ad08a7084..01746169bd16de848e6e161fd48eff17e2fc19db 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -47,7 +47,9 @@ class KNewFileMenu;
 class QToolButton;
 class QIcon;
 class PlacesPanel;
+#ifndef Q_OS_WIN
 class TerminalPanel;
+#endif
 
 /**
  * @short Main window for Dolphin.
@@ -62,7 +64,7 @@ class DolphinMainWindow: public KXmlGuiWindow
 
 public:
     DolphinMainWindow();
-    virtual ~DolphinMainWindow();
+    ~DolphinMainWindow() override;
 
     /**
      * Returns the currently active view.
@@ -150,16 +152,16 @@ signals:
 
 protected:
     /** @see QWidget::showEvent() */
-    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent* event) override;
 
     /** @see QMainWindow::closeEvent() */
-    virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
+    void closeEvent(QCloseEvent* event) override;
 
     /** @see KMainWindow::saveProperties() */
-    virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE;
+    void saveProperties(KConfigGroup& group) override;
 
     /** @see KMainWindow::readProperties() */
-    virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE;
+    void readProperties(const KConfigGroup& group) override;
 
 private slots:
     /**
@@ -259,6 +261,12 @@ private slots:
      */
     void togglePanelLockState();
 
+    /**
+     * Is invoked if the Terminal panel got visible/invisible and takes care
+     * that the active view has the focus if the Terminal panel is invisible.
+     */
+    void slotTerminalPanelVisibilityChanged();
+
     /** Goes back one step of the URL history. */
     void goBack();
 
@@ -497,8 +505,8 @@ private:
     {
     public:
         UndoUiInterface();
-        virtual ~UndoUiInterface();
-        virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE;
+        ~UndoUiInterface() override;
+        void jobError(KIO::Job* job) override;
     };
 
     KNewFileMenu* m_newFileMenu;
@@ -516,7 +524,9 @@ private:
 
     KIO::Job* m_lastHandleUrlStatJob;
 
+#ifndef Q_OS_WIN
     TerminalPanel* m_terminalPanel;
+#endif
     PlacesPanel* m_placesPanel;
     bool m_tearDownFromPlacesRequested;
 };