Changeset 86583 in vbox

Timestamp:

Oct 15, 2020 9:41:04 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140945

Message:

FE/Qt: bugref:9831. Using RT_OS_LINUX instead of VBOX_WS_X11.

Location:

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

Files:

• UIHelpBrowserDialog.cpp (modified) (1 diff)
• UIHelpBrowserWidget.cpp (modified) (7 diffs)
• UIHelpBrowserWidget.h (modified) (1 diff)

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

@@ -84 +84 @@
     UIHelpBrowserWidget *pWidget = 0;
 
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     pWidget = new UIHelpBrowserWidget(EmbedTo_Dialog, m_strHelpFilePath, true /* show toolbar */, this);
 #endif

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

@@ -20 +20 @@
 #include <QDir>
 #include <QFont>
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
  #include <QtHelp/QHelpEngine>
  #include <QtHelp/QHelpContentWidget>
@@ -63 +63 @@
 private:
 
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     const QHelpEngine* m_pHelpEngine;
 #endif
@@ -70 +70 @@
 UIHelpBrowserViewer::UIHelpBrowserViewer(const QHelpEngine *pHelpEngine, QWidget *pParent /* = 0 */)
     :QTextBrowser(pParent)
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     , m_pHelpEngine(pHelpEngine)
 #endif
 {
-#ifndef VBOX_WS_X11
+#ifndef RT_OS_LINUX
     Q_UNUSED(pHelpEngine);
 #endif
@@ -81 +81 @@
 QVariant UIHelpBrowserViewer::loadResource(int type, const QUrl &name)
 {
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     if (name.scheme() == "qthelp" && m_pHelpEngine)
         return QVariant(m_pHelpEngine->fileData(name));
@@ -104 +104 @@
     , m_pToolBar(0)
     , m_strHelpFilePath(strHelpFilePath)
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     , m_pHelpEngine(0)
 #endif
@@ -151 +151 @@
     m_pMainLayout = new QHBoxLayout(this);
     AssertReturnVoid(m_pMainLayout);
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     m_pHelpEngine = new QHelpEngine(m_strHelpFilePath, this);
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
@@ -249 +249 @@
 void UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished()
 {
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     AssertReturnVoid(m_pTextBrowser && m_pHelpEngine);
 

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

@@ -126 +126 @@
 
     QString       m_strHelpFilePath;
-#ifdef VBOX_WS_X11
+#ifdef RT_OS_LINUX
     QHelpEngine  *m_pHelpEngine;
 #endif