Get the code to compile

Author: peterfpeterson

qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpWindow.h

@@ -16,9 +16,8 @@
 class QHelpEngine;
 class QString;
 class QWidget;
-#ifdef DOCS_QTHELP
 class pqHelpWindow;
-#endif
+
 namespace MantidQt {
 namespace MantidWidgets {
 
@@ -55,10 +54,8 @@ public slots:
 
   /// The full path of the collection file.
   std::string m_collectionFile;
-#ifdef DOCS_QTHELP
   /// The window that renders the help information
   static QPointer<pqHelpWindow> g_helpWindow;
-#endif
   /// Whether this is the very first startup of the helpwindow.
   bool m_firstRun;
 

qt/widgets/common/src/InterfaceManager.cpp

@@ -281,7 +281,11 @@ void InterfaceManager::showCustomInterfaceHelp(const QString &name, const QStrin
 void InterfaceManager::showWebPage(const QString &url) { MantidDesktopServices::openUrl(url); }
 
 void InterfaceManager::closeHelpWindow() {
+#ifdef DOCS_QTHELP
   if (MantidHelpWindow::helpWindowExists()) {
+#else
+  if (true) {
+#endif
     auto window = createHelpWindow();
     if (window)
       window->shutdown();

qt/widgets/common/src/MantidHelpWindow.cpp

@@ -31,13 +31,14 @@
 #include <memory>
 #include <stdexcept>
 
-#ifdef DOCS_QTHELP
 namespace MantidQt::MantidWidgets {
 
 using std::string;
 using namespace MantidQt::API;
 
+#ifdef DOCS_QTHELP
 REGISTER_HELPWINDOW(MantidHelpWindow)
+#endif
 
 namespace {
 /// static logger
@@ -64,6 +65,8 @@ const QString HTML_BASE_PATH("/");
 /// Page to display if nothing provided
 const QString DEFAULT_PAGENAME("index");
 
+bool MantidHelpWindow::helpWindowExists() { return !g_helpWindow.isNull(); }
+
 /**
  * Default constructor shows the base index page.
  */
@@ -299,7 +302,7 @@ void MantidHelpWindow::shutdown() {
  *
  * @param binDir The location of the mantid executable.
  */
-void MantidHelpWindow::findCollectionFile(std::string &binDir) {
+void MantidHelpWindow::findCollectionFile(const std::string &binDir) {
   // this being empty notes the feature being disabled
   m_collectionFile = "";
 
@@ -316,9 +319,9 @@ void MantidHelpWindow::findCollectionFile(std::string &binDir) {
   }
 
   // try where the builds will put it for a single configuration build
-  searchDir.cdUp();
+  UNUSED_ARG(searchDir.cdUp());
   if (searchDir.cd("docs")) {
-    searchDir.cd("qthelp");
+    UNUSED_ARG(searchDir.cd("qthelp"));
     path = searchDir.absoluteFilePath(COLLECTION_FILE);
     g_log.debug() << "Trying \"" << path.toStdString() << "\"\n";
     if (searchDir.exists(COLLECTION_FILE)) {
@@ -327,9 +330,9 @@ void MantidHelpWindow::findCollectionFile(std::string &binDir) {
     }
   }
   // try where the builds will put it for a multi-configuration build
-  searchDir.cdUp();
+  UNUSED_ARG(searchDir.cdUp());
   if (searchDir.cd("docs")) {
-    searchDir.cd("qthelp");
+    UNUSED_ARG(searchDir.cd("qthelp"));
     path = searchDir.absoluteFilePath(COLLECTION_FILE);
     g_log.debug() << "Trying \"" << path.toStdString() << "\"\n";
     if (searchDir.exists(COLLECTION_FILE)) {
@@ -340,9 +343,9 @@ void MantidHelpWindow::findCollectionFile(std::string &binDir) {
 
   // try in windows/linux install location
   searchDir = QDir(QString::fromStdString(binDir));
-  searchDir.cdUp();
-  searchDir.cd("share");
-  searchDir.cd("doc");
+  UNUSED_ARG(searchDir.cdUp());
+  UNUSED_ARG(searchDir.cd("share"));
+  UNUSED_ARG(searchDir.cd("doc"));
   path = searchDir.absoluteFilePath(COLLECTION_FILE);
   g_log.debug() << "Trying \"" << path.toStdString() << "\"\n";
   if (searchDir.exists(COLLECTION_FILE)) {
@@ -352,10 +355,10 @@ void MantidHelpWindow::findCollectionFile(std::string &binDir) {
 
   // try a special place for mac/osx
   searchDir = QDir(QString::fromStdString(binDir));
-  searchDir.cdUp();
-  searchDir.cdUp();
-  searchDir.cd("share");
-  searchDir.cd("doc");
+  UNUSED_ARG(searchDir.cdUp());
+  UNUSED_ARG(searchDir.cdUp());
+  UNUSED_ARG(searchDir.cd("share"));
+  UNUSED_ARG(searchDir.cd("doc"));
   path = searchDir.absoluteFilePath(COLLECTION_FILE);
   g_log.debug() << "Trying \"" << path.toStdString() << "\"\n";
   if (searchDir.exists(COLLECTION_FILE)) {
@@ -381,4 +384,3 @@ void MantidHelpWindow::determineFileLocs() {
 void MantidHelpWindow::warning(const QString &msg) { g_log.warning(msg.toStdString()); }
 
 } // namespace MantidQt::MantidWidgets
-#endif

qt/widgets/common/src/PythonHelpWindow.cpp

@@ -1,4 +1,6 @@
 #include "MantidQtWidgets/Common/PythonHelpWindow.h"
+#include "MantidKernel/RegistrationHelper.h"
+#include "MantidQtWidgets/Common/InterfaceManager.h"
 #include "MantidQtWidgets/Common/PythonHelpBridge.h"
 #include <QString>
 #include <string>