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

Timestamp:

Mar 1, 2022 11:29:17 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: Help stuff. bugref:9898

• QHelpEngine::linksForIdentifier -> QHelpEngine::documentsForIdentifier and returns a list of QHelpLink (title + url) instead of a QMap<title,url>.
• QString version of QTextBrowser::highlighted was removed, must use QUrl variant instead.
• QTextBrowser::setSource is not longer overridable, in 6 doSetSource should be overridden instead.

Location:

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

Files:

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

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

@@ -21 +21 @@
 #include <QtGlobal>
 #ifdef VBOX_WITH_QHELP_VIEWER
- #include <QtHelp/QHelpEngine>
- #include <QtHelp/QHelpContentWidget>
- #include <QtHelp/QHelpIndexWidget>
- #include <QtHelp/QHelpSearchEngine>
- #include <QtHelp/QHelpSearchQueryWidget>
- #include <QtHelp/QHelpSearchResultWidget>
+# include <QtHelp/QHelpEngine>
+# include <QtHelp/QHelpContentWidget>
+# include <QtHelp/QHelpIndexWidget>
+# include <QtHelp/QHelpSearchEngine>
+# include <QtHelp/QHelpSearchQueryWidget>
+# include <QtHelp/QHelpSearchResultWidget>
+# if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+#  include <QtHelp/QHelpLink>
+# endif
 #endif
 #include <QLabel>
@@ -71 +74 @@
 static const int iBookmarkUrlDataType = 6;
 
+
 /*********************************************************************************************************************************
-*   UIZoomMenuAction definition.                                                                                    *
+*   UIZoomMenuAction definition.                                                                                                 *
 *********************************************************************************************************************************/
 class UIZoomMenuAction : public QIWithRetranslateUI<QWidgetAction>
@@ -187 +191 @@
     void sigOpenLinkInNewTab(const QUrl &url, bool fBackground);
     void sigAddBookmark(const QUrl &url, const QString &strTitle);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void sigLinkHighlighted(const QUrl &url);
+#else
     void sigLinkHighlighted(const QString &strLink);
+#endif
     void sigZoomPercentageChanged(int iPercentage);
     void sigFindInPageWidgetVisibilityChanged(bool fVisible);
@@ -267 +275 @@
     /** list.first is tab title and list.second is tab's index. */
     void sigTabsListChanged(const QStringList &titleList);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void sigLinkHighlighted(const QUrl &url);
+#else
     void sigLinkHighlighted(const QString &strLink);
+#endif
     void sigZoomPercentageChanged(int iPercentage);
     void sigCopyAvailableChanged(bool fAvailable);
@@ -704 +716 @@
     connect(m_pContentViewer, &UIHelpViewer::sigAddBookmark,
             this, &UIHelpBrowserTab::sltAddBookmarkAction);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    connect(m_pContentViewer, static_cast<void(UIHelpViewer::*)(const QUrl&)>(&UIHelpViewer::highlighted),
+            this, &UIHelpBrowserTab::sigLinkHighlighted);
+#else
     connect(m_pContentViewer, static_cast<void(UIHelpViewer::*)(const QString&)>(&UIHelpViewer::highlighted),
             this, &UIHelpBrowserTab::sigLinkHighlighted);
+#endif
     connect(m_pContentViewer, &UIHelpViewer::sigZoomPercentageChanged,
             this, &UIHelpBrowserTab::sigZoomPercentageChanged);
@@ -1865 +1882 @@
 void UIHelpBrowserWidget::findAndShowUrlForKeyword(const QString &strKeyword)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    QList<QHelpLink> links = m_pHelpEngine->documentsForIdentifier(strKeyword);
+    if (!links.isEmpty())
+    {
+        /* We have to a have a single url per keyword in this case: */
+        m_pTabManager->setSource(links.first().url, true /* new tab */);
+    }
+#else
     QMap<QString, QUrl> map = m_pHelpEngine->linksForIdentifier(strKeyword);
     if (!map.isEmpty())
@@ -1872 +1897 @@
         m_pTabManager->setSource(keywordUrl, true /* new tab */);
     }
+#endif
 }
 
@@ -1922 +1948 @@
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void UIHelpBrowserWidget::sltLinkHighlighted(const QUrl &url)
+{
+    emit sigStatusBarMessage(url.url(), 0); /** @todo qt6: ??? */
+}
+#else
 void UIHelpBrowserWidget::sltLinkHighlighted(const QString &strLink)
 {
     emit sigStatusBarMessage(strLink, 0);
 }
+#endif
 
 void UIHelpBrowserWidget::sltMouseOverImage(const QString &strImageName)

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

@@ -110 +110 @@
     void sltFindPreviousInPage();
     void sltHistoryChanged(bool fBackwardAvailable, bool fForwardAvailable);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void sltLinkHighlighted(const QUrl &url);
+#else
     void sltLinkHighlighted(const QString &strLink);
+#endif
     void sltMouseOverImage(const QString &strImageName);
 

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

@@ -412 +412 @@
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void UIHelpViewer::doSetSource(const QUrl &url, QTextDocument::ResourceType type)
+#else
 void UIHelpViewer::setSource(const QUrl &url)
+#endif
 {
     clearOverlay();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QTextBrowser::doSetSource(url, type);
+#else
     QTextBrowser::setSource(url);
+#endif
     QTextDocument *pDocument = document();
     if (!pDocument || pDocument->isEmpty())

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

@@ -71 +71 @@
     virtual QVariant loadResource(int type, const QUrl &name) RT_OVERRIDE;
     void emitHistoryChangedSignal();
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /* must override doSetSource in 6.0 */
     virtual void setSource(const QUrl &url) RT_OVERRIDE;
+#endif
     void setFont(const QFont &);
     bool isFindInPageWidgetVisible() const;
@@ -100 +102 @@
     virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
     virtual void keyPressEvent(QKeyEvent *pEvent) RT_OVERRIDE;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    virtual void doSetSource(const QUrl &url, QTextDocument::ResourceType type = QTextDocument::UnknownResource) RT_OVERRIDE;
+#endif
 
 private slots: