Changeset 88526 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 15, 2021 11:42:22 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. some refactoring

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (42 diffs)
• UIHelpBrowserWidget.h (modified) (2 diffs)
• UIHelpViewer.cpp (modified) (7 diffs)
• UIHelpViewer.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -211 +211 @@
 public slots:
 
-    void sltHandleFindInPageAction(bool fToggled);
+    void sltFindInPageAction(bool fToggled);
 
 private slots:
 
-    void sltHandleHomeAction();
-    void sltHandleForwardAction();
-    void sltHandleBackwardAction();
-    void sltHandleHistoryChanged();
-    void sltHandleAddressBarIndexChanged(int index);
-    void sltHandleAddBookmarkAction();
+    void sltHomeAction();
+    void sltForwardAction();
+    void sltBackwardAction();
+    void sltHistoryChanged();
+    void sltAddressBarIndexChanged(int index);
+    void sltAddBookmarkAction();
     void sltAnchorClicked(const QUrl &link);
     void sltFindInPageWidgetVisibilityChanged(bool  fVisible);
@@ -294 +294 @@
 public slots:
 
-    void sltHandleCloseCurrentTab();
-    void sltHandleCloseOtherTabs();
-    void sltHandleZoomOperation(UIHelpViewer::ZoomOperation enmZoomOperation);
+    void sltCloseCurrentTab();
+    void sltCloseOtherTabs();
+    void sltZoomOperation(UIHelpViewer::ZoomOperation enmZoomOperation);
 
 private slots:
 
-    void sltHandletabTitleChange(const QString &strTitle);
-    void sltHandleOpenLinkInNewTab(const QUrl &url, bool fBackground);
-    void sltHandleTabClose(int iTabIndex);
-    void sltHandleContextMenuTabClose();
-    void sltHandleCurrentChanged(int iTabIndex);
+    void slttabTitleChange(const QString &strTitle);
+    void sltOpenLinkInNewTab(const QUrl &url, bool fBackground);
+    void sltTabClose(int iTabIndex);
+    void sltContextMenuTabClose();
+    void sltCurrentChanged(int iTabIndex);
     void sltShowTabBarContextMenu(const QPoint &pos);
-    void sltHandleCloseOtherTabsContextMenuAction();
+    void sltCloseOtherTabsContextMenuAction();
     void sltCopyAvailableChanged(bool fAvailable);
 
@@ -662 +662 @@
         this, &UIHelpBrowserTab::sigSourceChanged);
     connect(m_pContentViewer, &UIHelpViewer::historyChanged,
-        this, &UIHelpBrowserTab::sltHandleHistoryChanged);
+        this, &UIHelpBrowserTab::sltHistoryChanged);
     connect(m_pContentViewer, &UIHelpViewer::anchorClicked,
         this, &UIHelpBrowserTab::sltAnchorClicked);
@@ -668 +668 @@
         this, &UIHelpBrowserTab::sigOpenLinkInNewTab);
     connect(m_pContentViewer, &UIHelpViewer::sigGoBackward,
-            this, &UIHelpBrowserTab::sltHandleBackwardAction);
+            this, &UIHelpBrowserTab::sltBackwardAction);
     connect(m_pContentViewer, &UIHelpViewer::sigGoForward,
-            this, &UIHelpBrowserTab::sltHandleForwardAction);
+            this, &UIHelpBrowserTab::sltForwardAction);
     connect(m_pContentViewer, &UIHelpViewer::sigGoHome,
-            this, &UIHelpBrowserTab::sltHandleHomeAction);
+            this, &UIHelpBrowserTab::sltHomeAction);
     connect(m_pContentViewer, &UIHelpViewer::sigAddBookmark,
-            this, &UIHelpBrowserTab::sltHandleAddBookmarkAction);
+            this, &UIHelpBrowserTab::sltAddBookmarkAction);
     connect(m_pContentViewer, static_cast<void(UIHelpViewer::*)(const QString&)>(&UIHelpViewer::highlighted),
             this, &UIHelpBrowserTab::sigLinkHighlighted);
@@ -706 +706 @@
     m_pFindInPageAction->setShortcut(QKeySequence::Find);
 
-    connect(m_pHomeAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleHomeAction);
-    connect(m_pAddBookmarkAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleAddBookmarkAction);
-    connect(m_pForwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleForwardAction);
-    connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleBackwardAction);
-    connect(m_pFindInPageAction, &QAction::toggled, this, &UIHelpBrowserTab::sltHandleFindInPageAction);
+    connect(m_pHomeAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHomeAction);
+    connect(m_pAddBookmarkAction, &QAction::triggered, this, &UIHelpBrowserTab::sltAddBookmarkAction);
+    connect(m_pForwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltForwardAction);
+    connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltBackwardAction);
+    connect(m_pFindInPageAction, &QAction::toggled, this, &UIHelpBrowserTab::sltFindInPageAction);
 
     m_pForwardAction->setEnabled(false);
@@ -726 +726 @@
     m_pAddressBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     connect(m_pAddressBar, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-            this, &UIHelpBrowserTab::sltHandleAddressBarIndexChanged);
+            this, &UIHelpBrowserTab::sltAddressBarIndexChanged);
 
 
@@ -752 +752 @@
 }
 
-void UIHelpBrowserTab::sltHandleHomeAction()
+void UIHelpBrowserTab::sltHomeAction()
 {
     if (!m_pContentViewer)
@@ -759 +759 @@
 }
 
-void UIHelpBrowserTab::sltHandleForwardAction()
+void UIHelpBrowserTab::sltForwardAction()
 {
     if (m_pContentViewer)
@@ -765 +765 @@
 }
 
-void UIHelpBrowserTab::sltHandleBackwardAction()
+void UIHelpBrowserTab::sltBackwardAction()
 {
     if (m_pContentViewer)
@@ -771 +771 @@
 }
 
-void UIHelpBrowserTab::sltHandleFindInPageAction(bool fToggled)
+void UIHelpBrowserTab::sltFindInPageAction(bool fToggled)
 {
     if (m_pContentViewer)
@@ -777 +777 @@
 }
 
-void UIHelpBrowserTab::sltHandleHistoryChanged()
+void UIHelpBrowserTab::sltHistoryChanged()
 {
     if (!m_pContentViewer)
@@ -806 +806 @@
 }
 
-void UIHelpBrowserTab::sltHandleAddressBarIndexChanged(int iIndex)
+void UIHelpBrowserTab::sltAddressBarIndexChanged(int iIndex)
 {
     if (!m_pAddressBar && iIndex >= m_pAddressBar->count())
@@ -822 +822 @@
 }
 
-void UIHelpBrowserTab::sltHandleAddBookmarkAction()
+void UIHelpBrowserTab::sltAddBookmarkAction()
 {
     emit sigAddBookmark(source(), documentTitle());
@@ -878 +878 @@
             this, &UIHelpBrowserTabManager::sigSourceChanged);
     connect(pTabWidget, &UIHelpBrowserTab::sigTitleUpdate,
-            this, &UIHelpBrowserTabManager::sltHandletabTitleChange);
+            this, &UIHelpBrowserTabManager::slttabTitleChange);
     connect(pTabWidget, &UIHelpBrowserTab::sigOpenLinkInNewTab,
-            this, &UIHelpBrowserTabManager::sltHandleOpenLinkInNewTab);
+            this, &UIHelpBrowserTabManager::sltOpenLinkInNewTab);
     connect(pTabWidget, &UIHelpBrowserTab::sigAddBookmark,
             this, &UIHelpBrowserTabManager::sigAddBookmark);
@@ -1082 +1082 @@
     UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(currentWidget());
     if (pTab)
-        pTab->sltHandleFindInPageAction(fTrigger);
-}
-
-void UIHelpBrowserTabManager::sltHandletabTitleChange(const QString &strTitle)
+        pTab->sltFindInPageAction(fTrigger);
+}
+
+void UIHelpBrowserTabManager::slttabTitleChange(const QString &strTitle)
 {
     for (int i = 0; i < count(); ++i)
@@ -1099 +1099 @@
 }
 
-void UIHelpBrowserTabManager::sltHandleOpenLinkInNewTab(const QUrl &url, bool fBackground)
+void UIHelpBrowserTabManager::sltOpenLinkInNewTab(const QUrl &url, bool fBackground)
 {
     if (url.isValid())
@@ -1114 +1114 @@
 }
 
-void UIHelpBrowserTabManager::sltHandleTabClose(int iTabIndex)
+void UIHelpBrowserTabManager::sltTabClose(int iTabIndex)
 {
     if (count() <= 1)
@@ -1126 +1126 @@
 }
 
-void UIHelpBrowserTabManager::sltHandleContextMenuTabClose()
+void UIHelpBrowserTabManager::sltContextMenuTabClose()
 {
     QAction *pAction = qobject_cast<QAction*>(sender());
@@ -1134 +1134 @@
     if (iTabIndex < 0 || iTabIndex >= count())
         return;
-    sltHandleTabClose(iTabIndex);
-}
-
-void UIHelpBrowserTabManager::sltHandleCloseOtherTabsContextMenuAction()
+    sltTabClose(iTabIndex);
+}
+
+void UIHelpBrowserTabManager::sltCloseOtherTabsContextMenuAction()
 {
     /* Find the index of the sender tab. we will close all tabs but sender tab: */
@@ -1149 +1149 @@
 }
 
-void UIHelpBrowserTabManager::sltHandleCloseCurrentTab()
-{
-    sltHandleTabClose(currentIndex());
-}
-
-void UIHelpBrowserTabManager::sltHandleCloseOtherTabs()
+void UIHelpBrowserTabManager::sltCloseCurrentTab()
+{
+    sltTabClose(currentIndex());
+}
+
+void UIHelpBrowserTabManager::sltCloseOtherTabs()
 {
     closeAllTabsBut(currentIndex());
 }
 
-void UIHelpBrowserTabManager::sltHandleCurrentChanged(int iTabIndex)
+void UIHelpBrowserTabManager::sltCurrentChanged(int iTabIndex)
 {
     Q_UNUSED(iTabIndex);
@@ -1165 +1165 @@
 }
 
-void UIHelpBrowserTabManager::sltHandleZoomOperation(UIHelpViewer::ZoomOperation enmZoomOperation)
+void UIHelpBrowserTabManager::sltZoomOperation(UIHelpViewer::ZoomOperation enmZoomOperation)
 {
     for (int i = 0; i < count(); ++i)
@@ -1181 +1181 @@
     QMenu menu;
     QAction *pCloseAll = menu.addAction(UIHelpBrowserWidget::tr("Close Other Tabs"));
-    connect(pCloseAll, &QAction::triggered, this, &UIHelpBrowserTabManager::sltHandleCloseOtherTabsContextMenuAction);
+    connect(pCloseAll, &QAction::triggered, this, &UIHelpBrowserTabManager::sltCloseOtherTabsContextMenuAction);
     pCloseAll->setData(tabBar()->tabAt(pos));
 
     QAction *pClose = menu.addAction(UIHelpBrowserWidget::tr("Close Tab"));
-    connect(pClose, &QAction::triggered, this, &UIHelpBrowserTabManager::sltHandleContextMenuTabClose);
+    connect(pClose, &QAction::triggered, this, &UIHelpBrowserTabManager::sltContextMenuTabClose);
     pClose->setData(tabBar()->tabAt(pos));
 
@@ -1195 +1195 @@
     setTabsClosable(true);
     setTabBarAutoHide(true);
-    connect(this, &UIHelpBrowserTabManager::tabCloseRequested, this, &UIHelpBrowserTabManager::sltHandleTabClose);
-    connect(this, &UIHelpBrowserTabManager::currentChanged, this, &UIHelpBrowserTabManager::sltHandleCurrentChanged);
+    connect(this, &UIHelpBrowserTabManager::tabCloseRequested, this, &UIHelpBrowserTabManager::sltTabClose);
+    connect(this, &UIHelpBrowserTabManager::currentChanged, this, &UIHelpBrowserTabManager::sltCurrentChanged);
     if (tabBar())
     {
@@ -1312 +1312 @@
     m_pShowHideSideBarAction->setChecked(true);
     connect(m_pShowHideSideBarAction, &QAction::toggled,
-            this, &UIHelpBrowserWidget::sltHandleWidgetVisibilityToggle);
+            this, &UIHelpBrowserWidget::sltWidgetVisibilityToggle);
 
     m_pShowHideToolBarAction = new QAction(this);
@@ -1318 +1318 @@
     m_pShowHideToolBarAction->setChecked(true);
     connect(m_pShowHideToolBarAction, &QAction::toggled,
-            this, &UIHelpBrowserWidget::sltHandleWidgetVisibilityToggle);
+            this, &UIHelpBrowserWidget::sltWidgetVisibilityToggle);
 
     m_pShowHideStatusBarAction = new QAction(this);
@@ -1324 +1324 @@
     m_pShowHideStatusBarAction->setChecked(true);
     connect(m_pShowHideStatusBarAction, &QAction::toggled,
-            this, &UIHelpBrowserWidget::sltHandleWidgetVisibilityToggle);
+            this, &UIHelpBrowserWidget::sltWidgetVisibilityToggle);
 
     m_pCopySelectedTextAction = new QAction(this);
@@ -1350 +1350 @@
     m_pZoomMenuAction = new UIZoomMenuAction(this);
     connect(m_pZoomMenuAction, &UIZoomMenuAction::sigZoomChanged,
-            this, &UIHelpBrowserWidget::sltHandleZoomActions);
+            this, &UIHelpBrowserWidget::sltZoomActions);
 }
 
@@ -1393 +1393 @@
             this, &UIHelpBrowserWidget::sltAddNewBookmark);
     connect(m_pTabManager, &UIHelpBrowserTabManager::sigTabsListChanged,
-            this, &UIHelpBrowserWidget::sltHandleTabListChanged);
+            this, &UIHelpBrowserWidget::sltTabListChanged);
     connect(m_pTabManager, &UIHelpBrowserTabManager::currentChanged,
-            this, &UIHelpBrowserWidget::sltHandleCurrentTabChanged);
+            this, &UIHelpBrowserWidget::sltCurrentTabChanged);
     connect(m_pTabManager, &UIHelpBrowserTabManager::sigLinkHighlighted,
             this, &UIHelpBrowserWidget::sigLinkHighlighted);
@@ -1406 +1406 @@
 
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
-            this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
+            this, &UIHelpBrowserWidget::sltHelpEngineSetupFinished);
     connect(m_pContentWidget, &QHelpContentWidget::clicked,
-            this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
+            this, &UIHelpBrowserWidget::sltContentWidgetItemClicked);
     connect(m_pContentModel, &QHelpContentModel::contentsCreated,
-            this, &UIHelpBrowserWidget::sltHandleContentsCreated);
+            this, &UIHelpBrowserWidget::sltContentsCreated);
     connect(m_pContentWidget, &QHelpContentWidget::customContextMenuRequested,
             this, &UIHelpBrowserWidget::sltShowLinksContextMenu);
@@ -1446 +1446 @@
 
     connect(m_pSearchQueryWidget, &QHelpSearchQueryWidget::search,
-            this, &UIHelpBrowserWidget::sltHandleSearchStart);
+            this, &UIHelpBrowserWidget::sltSearchStart);
     connect(m_pSearchResultWidget, &QHelpSearchResultWidget::requestShowLink,
             this, &UIHelpBrowserWidget::sltOpenLinkWithUrl);
@@ -1452 +1452 @@
             this, &UIHelpBrowserWidget::sltShowLinksContextMenu);
     connect(m_pSearchEngine, &QHelpSearchEngine::indexingStarted,
-            this, &UIHelpBrowserWidget::sltHandleIndexingStarted);
+            this, &UIHelpBrowserWidget::sltIndexingStarted);
     connect(m_pSearchEngine, &QHelpSearchEngine::indexingFinished,
-            this, &UIHelpBrowserWidget::sltHandleIndexingFinished);
+            this, &UIHelpBrowserWidget::sltIndexingFinished);
     connect(m_pSearchEngine, &QHelpSearchEngine::searchingStarted,
-            this, &UIHelpBrowserWidget::sltHandleSearchingStarted);
+            this, &UIHelpBrowserWidget::sltSearchingStarted);
 
     m_pSearchEngine->reindexDocumentation();
@@ -1673 +1673 @@
 }
 
-void UIHelpBrowserWidget::sltHandleWidgetVisibilityToggle(bool fToggled)
+void UIHelpBrowserWidget::sltWidgetVisibilityToggle(bool fToggled)
 {
     if (sender() == m_pShowHideSideBarAction)
@@ -1729 +1729 @@
 }
 
-void UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished()
+void UIHelpBrowserWidget::sltHelpEngineSetupFinished()
 {
     AssertReturnVoid(m_pTabManager);
@@ -1736 +1736 @@
 }
 
-void UIHelpBrowserWidget::sltHandleContentWidgetItemClicked(const QModelIndex & index)
+void UIHelpBrowserWidget::sltContentWidgetItemClicked(const QModelIndex & index)
 {
     AssertReturnVoid(m_pTabManager && m_pHelpEngine && m_pContentWidget);
@@ -1765 +1765 @@
 }
 
-void UIHelpBrowserWidget::sltHandleContentsCreated()
+void UIHelpBrowserWidget::sltContentsCreated()
 {
     m_fModelContentCreated = true;
@@ -1772 +1772 @@
 }
 
-void UIHelpBrowserWidget::sltHandleIndexingStarted()
+void UIHelpBrowserWidget::sltIndexingStarted()
 {
     if (m_pSearchContainerWidget)
@@ -1778 +1778 @@
 }
 
-void UIHelpBrowserWidget::sltHandleIndexingFinished()
+void UIHelpBrowserWidget::sltIndexingFinished()
 {
     AssertReturnVoid(m_pTabManager &&
@@ -1793 +1793 @@
 }
 
-void UIHelpBrowserWidget::sltHandleSearchingStarted()
-{
-}
-
-void UIHelpBrowserWidget::sltHandleSearchStart()
+void UIHelpBrowserWidget::sltSearchingStarted()
+{
+}
+
+void UIHelpBrowserWidget::sltSearchStart()
 {
     AssertReturnVoid(m_pSearchEngine && m_pSearchQueryWidget);
@@ -1919 +1919 @@
     pCloseOtherTabsAction->setEnabled(titles.size() > 1);
 
-    connect(pCloseTabAction, &QAction::triggered, m_pTabManager, &UIHelpBrowserTabManager::sltHandleCloseCurrentTab);
-    connect(pCloseOtherTabsAction, &QAction::triggered, m_pTabManager, &UIHelpBrowserTabManager::sltHandleCloseOtherTabs);
+    connect(pCloseTabAction, &QAction::triggered, m_pTabManager, &UIHelpBrowserTabManager::sltCloseCurrentTab);
+    connect(pCloseOtherTabsAction, &QAction::triggered, m_pTabManager, &UIHelpBrowserTabManager::sltCloseOtherTabs);
 
     m_pTabsMenu->addSeparator();
@@ -1928 +1928 @@
         QAction *pAction = m_pTabsMenu->addAction(titles[i]);
         pAction->setData(i);
-        connect(pAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleTabChoose);
+        connect(pAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltTabChoose);
     }
     if (m_pTabManager)
-        sltHandleCurrentTabChanged(m_pTabManager->currentIndex());
+        sltCurrentTabChanged(m_pTabManager->currentIndex());
 }
 
@@ -1940 +1940 @@
 }
 
-void UIHelpBrowserWidget::sltHandleZoomActions(int iZoomOperation)
+void UIHelpBrowserWidget::sltZoomActions(int iZoomOperation)
 {
     if (iZoomOperation >= (int) UIHelpViewer::ZoomOperation_Max)
         return;
     UIHelpViewer::ZoomOperation enmOperation = (UIHelpViewer::ZoomOperation)(iZoomOperation);
-    m_pTabManager->sltHandleZoomOperation(enmOperation);
-}
-
-void UIHelpBrowserWidget::sltHandleTabListChanged(const QStringList &titleList)
+    m_pTabManager->sltZoomOperation(enmOperation);
+}
+
+void UIHelpBrowserWidget::sltTabListChanged(const QStringList &titleList)
 {
     updateTabsMenu(titleList);
 }
 
-void UIHelpBrowserWidget::sltHandleTabChoose()
+void UIHelpBrowserWidget::sltTabChoose()
 {
     QAction *pAction = qobject_cast<QAction*>(sender());
@@ -1963 +1963 @@
 }
 
-void UIHelpBrowserWidget::sltHandleCurrentTabChanged(int iIndex)
+void UIHelpBrowserWidget::sltCurrentTabChanged(int iIndex)
 {
     Q_UNUSED(iIndex);

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h

@@ -76 +76 @@
 private slots:
 
-    void sltHandleHelpEngineSetupFinished();
-    void sltHandleContentWidgetItemClicked(const QModelIndex &index);
-    void sltHandleWidgetVisibilityToggle(bool togggled);
+    void sltHelpEngineSetupFinished();
+    void sltContentWidgetItemClicked(const QModelIndex &index);
+    void sltWidgetVisibilityToggle(bool togggled);
     void sltShowPrintDialog();
-    void sltHandleContentsCreated();
-    void sltHandleIndexingStarted();
-    void sltHandleIndexingFinished();
-    void sltHandleSearchingStarted();
-    void sltHandleSearchStart();
+    void sltContentsCreated();
+    void sltIndexingStarted();
+    void sltIndexingFinished();
+    void sltSearchingStarted();
+    void sltSearchStart();
     void sltViewerSourceChange(const QUrl &source);
     void sltOpenLinkWithUrl(const QUrl &url);
@@ -92 +92 @@
     void sltCopyLink();
     void sltAddNewBookmark(const QUrl &url, const QString &strTitle);
-    void sltHandleZoomActions(int iZoomOperation);
-    void sltHandleTabListChanged(const QStringList &titleList);
-    void sltHandleTabChoose();
-    void sltHandleCurrentTabChanged(int iIndex);
+    void sltZoomActions(int iZoomOperation);
+    void sltTabListChanged(const QStringList &titleList);
+    void sltTabChoose();
+    void sltCurrentTabChanged(int iIndex);
     void sltZoomPercentageChanged(int iPercentage);
     void sltCopySelectedText();

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -345 +345 @@
     setUndoRedoEnabled(true);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigDragging,
-            this, &UIHelpViewer::sltHandleFindWidgetDrag);
+            this, &UIHelpViewer::sltFindWidgetDrag);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSearchTextChanged,
-            this, &UIHelpViewer::sltHandleFindInPageSearchTextChange);
+            this, &UIHelpViewer::sltFindInPageSearchTextChange);
 
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSelectPreviousMatch,
@@ -545 +545 @@
     QAction *pOpenLinkAction = new QAction(UIHelpBrowserWidget::tr("Open Link"));
     connect(pOpenLinkAction, &QAction::triggered,
-            this, &UIHelpViewer::sltHandleOpenLink);
+            this, &UIHelpViewer::sltOpenLink);
 
     QAction *pOpenInNewTabAction = new QAction(UIHelpBrowserWidget::tr("Open Link in New Tab"));
     connect(pOpenInNewTabAction, &QAction::triggered,
-            this, &UIHelpViewer::sltHandleOpenLinkInNewTab);
+            this, &UIHelpViewer::sltOpenLinkInNewTab);
 
     QAction *pCopyLink = new QAction(UIHelpBrowserWidget::tr("Copy Link"));
     connect(pCopyLink, &QAction::triggered,
-            this, &UIHelpViewer::sltHandleCopyLink);
+            this, &UIHelpViewer::sltCopyLink);
 
     QAction *pFindInPage = new QAction(UIHelpBrowserWidget::tr("Find in Page"));
@@ -821 +821 @@
 }
 
-void UIHelpViewer::sltHandleOpenLinkInNewTab()
+void UIHelpViewer::sltOpenLinkInNewTab()
 {
     QAction *pSender = qobject_cast<QAction*>(sender());
@@ -831 +831 @@
 }
 
-void UIHelpViewer::sltHandleOpenLink()
+void UIHelpViewer::sltOpenLink()
 {
     QAction *pSender = qobject_cast<QAction*>(sender());
@@ -841 +841 @@
 }
 
-void UIHelpViewer::sltHandleCopyLink()
+void UIHelpViewer::sltCopyLink()
 {
     QAction *pSender = qobject_cast<QAction*>(sender());
@@ -855 +855 @@
 }
 
-void UIHelpViewer::sltHandleFindWidgetDrag(const QPoint &delta)
+void UIHelpViewer::sltFindWidgetDrag(const QPoint &delta)
 {
     if (!m_pFindInPageWidget)
@@ -869 +869 @@
 }
 
-void UIHelpViewer::sltHandleFindInPageSearchTextChange(const QString &strSearchText)
+void UIHelpViewer::sltFindInPageSearchTextChange(const QString &strSearchText)
 {
     m_iSearchTermLength = strSearchText.length();
     findAllMatches(strSearchText);
     highlightFinds(m_iSearchTermLength);
-    //scrollToMatch(int iMatchIndex);
     selectMatch(0, m_iSearchTermLength);
     if (m_pFindInPageWidget)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

@@ -92 +92 @@
 private slots:
 
-    void sltHandleOpenLinkInNewTab();
-    void sltHandleOpenLink();
-    void sltHandleCopyLink();
-    void sltHandleFindWidgetDrag(const QPoint &delta);
-    void sltHandleFindInPageSearchTextChange(const QString &strSearchText);
+    void sltOpenLinkInNewTab();
+    void sltOpenLink();
+    void sltCopyLink();
+    void sltFindWidgetDrag(const QPoint &delta);
+    void sltFindInPageSearchTextChange(const QString &strSearchText);
     void sltSelectPreviousMatch();
     void sltSelectNextMatch();