Changeset 99880 in vbox for trunk

Timestamp:

May 21, 2023 12:17:43 PM (20 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10451 Replacing VBOX_WITH_QHELP_VIEWER with VBOX_WITH_DOCS_QHELP.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (4 diffs)
• helpbrowser/UIHelpBrowserDialog.cpp (modified) (3 diffs)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (3 diffs)
• helpbrowser/UIHelpBrowserWidget.h (modified) (2 diffs)
• helpbrowser/UIHelpViewer.cpp (modified) (3 diffs)
• helpbrowser/UIHelpViewer.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -2377 +2377 @@
 QString UICommon::helpFile()
 {
-#if defined (VBOX_WITH_QHELP_VIEWER)
+#if defined (VBOX_WITH_DOCS_QHELP)
     const QString strName = "UserManual";
     const QString strSuffix = "qhc";

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -2144 +2144 @@
 {
     Q_UNUSED(strLocation);
-#if defined (VBOX_WITH_QHELP_VIEWER)
+#if defined (VBOX_WITH_DOCS_QHELP)
     showHelpBrowser(strLocation);
 #else
@@ -2173 +2173 @@
 void UIMessageCenter::sltHandleHelpRequest()
 {
-#if defined(VBOX_WITH_QHELP_VIEWER)
+#if defined(VBOX_WITH_DOCS_QHELP)
     sltHandleHelpRequestWithKeyword(uiCommon().helpKeyword(sender()));
 #endif /* #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))&& (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) */
@@ -2180 +2180 @@
 void UIMessageCenter::sltHandleHelpRequestWithKeyword(const QString &strHelpKeyword)
 {
-#if defined(VBOX_WITH_QHELP_VIEWER)
+#if defined(VBOX_WITH_DOCS_QHELP)
     /* First open or show the help browser: */
     showHelpBrowser(uiCommon().helpFile());
@@ -2378 +2378 @@
 {
     Q_UNUSED(pParent);
-#if defined(VBOX_WITH_QHELP_VIEWER)
+#if defined(VBOX_WITH_DOCS_QHELP)
     if (!QFileInfo(strHelpFilePath).exists())
     {

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

@@ -72 +72 @@
 void UIHelpBrowserDialog::showHelpForKeyword(const QString &strKeyword)
 {
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
     if (m_pWidget)
         m_pWidget->showHelpForKeyword(strKeyword);
@@ -82 +82 @@
 void UIHelpBrowserDialog::retranslateUi()
 {
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
     setWindowTitle(UIHelpBrowserWidget::tr("Oracle VM VirtualBox User Manual"));
 #endif
@@ -119 +119 @@
 void UIHelpBrowserDialog::prepareCentralWidget()
 {
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
     m_pWidget = new UIHelpBrowserWidget(EmbedTo_Dialog, m_strHelpFilePath);
     AssertPtrReturnVoid(m_pWidget);

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

@@ -30 +30 @@
 #include <QComboBox>
 #include <QtGlobal>
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
 # include <QtHelp/QHelpEngine>
 # include <QtHelp/QHelpContentWidget>
@@ -70 +70 @@
 #include "CSystemProperties.h"
 
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
 
 enum HelpBrowserTabs
@@ -2275 +2275 @@
 #include "UIHelpBrowserWidget.moc"
 
-#endif /*#ifdef VBOX_WITH_QHELP_VIEWER*/
+#endif /*#ifdef VBOX_WITH_DOCS_QHELP*/

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

@@ -58 +58 @@
 class UIZoomMenuAction;
 
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
 class SHARED_LIBRARY_STUFF UIHelpBrowserWidget  : public QIWithRetranslateUI<QWidget>
 {
@@ -220 +220 @@
 };
 
-#endif /* #ifdef VBOX_WITH_QHELP_VIEWER */
+#endif /* #ifdef VBOX_WITH_DOCS_QHELP */
 #endif /* !FEQT_INCLUDED_SRC_helpbrowser_UIHelpBrowserWidget_h */

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

@@ -29 +29 @@
 #include <QClipboard>
 #include <QtGlobal>
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
  #include <QtHelp/QHelpEngine>
  #include <QtHelp/QHelpContentWidget>
@@ -64 +64 @@
 #include "CSystemProperties.h"
 
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
 
 
@@ -1070 +1070 @@
 #include "UIHelpViewer.moc"
 
-#endif /* #ifdef VBOX_WITH_QHELP_VIEWER */
+#endif /* #ifdef VBOX_WITH_DOCS_QHELP */

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

@@ -44 +44 @@
 class UIFindInPageWidget;
 
-#ifdef VBOX_WITH_QHELP_VIEWER
+#ifdef VBOX_WITH_DOCS_QHELP
 
 /** A QTextBrowser extension used as poor man's html viewer. Since we were not happy with the quality of QTextBrowser's image
@@ -172 +172 @@
 };
 
-#endif /* #ifdef VBOX_WITH_QHELP_VIEWER */
+#endif /* #ifdef VBOX_WITH_DOCS_QHELP */
 #endif /* !FEQT_INCLUDED_SRC_helpbrowser_UIHelpViewer_h */