From 3ccdcc2176bc5e4e03f733c21d05a5a4b0c1af25 Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Thu, 9 Jun 2022 23:23:29 +0200 Subject: Clean up code that became redundant through framework changes There were two changes in framework that triggered this commit: KHamburgerMenu and KToolTipHelper. When the Dolphin-specific hamburger menu was replaced by KHamburgerMenu, I didn't clean everything up correctly. Not anymore! Help texts also weren't updated accordingly. This commit replaces any mention of the old hamburger menu which was called "Control" with text that reflects the current application state. The other framework change "KToolTipHelper" takes responsibility for opening links in help texts. So we won't need code to do this in Dolphin anymore. This means we can also get rid of some duplicate help texts which only existed because links didn't work correctly in some places. --- src/dolphinmainwindow.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/dolphinmainwindow.h') diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index fe844ad1b..e7355e3ed 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -39,7 +39,6 @@ class KFileItem; class KFileItemList; class KJob; class KNewFileMenu; -class KHelpMenu; class KToolBarPopupAction; class QToolButton; class PlacesPanel; @@ -248,11 +247,6 @@ protected: /** @see KMainWindow::readProperties() */ void readProperties(const KConfigGroup& group) override; - /** Handles QWhatsThisClickedEvent and passes all others on. */ - bool event(QEvent* event) override; - /** Handles QWhatsThisClickedEvent and passes all others on. */ - bool eventFilter(QObject*, QEvent*) override; - /** Sets a sane initial window size **/ QSize sizeHint() const override; @@ -700,7 +694,6 @@ private: }; KNewFileMenu* m_newFileMenu; - KHelpMenu* m_helpMenu; DolphinTabWidget* m_tabWidget; DolphinViewContainer* m_activeViewContainer; @@ -710,10 +703,6 @@ private: DolphinBookmarkHandler* m_bookmarkHandler; SelectionMode::ActionTextHelper* m_actionTextHelper; - // Members for the toolbar menu that is shown when the menubar is hidden: - QToolButton* m_controlButton; - QTimer* m_updateToolBarTimer; - KIO::OpenUrlJob *m_lastHandleUrlOpenJob; TerminalPanel* m_terminalPanel; -- cgit v1.3