Fix Windows linkage (#1626)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Aug 3, 2022 · adf7210 · adf7210
1 parent 83c0bf5
commit adf7210
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/include/ignition/gazebo/gui/Gui.hh b/include/ignition/gazebo/gui/Gui.hh
@@ -45,7 +45,7 @@ namespace gui
   /// \param[in] _renderEngine --render-engine-gui option
   /// \return -1 on failure, 0 on success
   IGNITION_GAZEBO_GUI_VISIBLE int runGui(int &_argc,
-    char **_argv, const char *_guiConfig, const char * _renderEngine = nullptr);
+    char **_argv, const char *_guiConfig, const char *_renderEngine = nullptr);
 
   /// \brief Run GUI application
   /// \param[in] _argc Number of command line arguments (Used when running
@@ -64,7 +64,7 @@ namespace gui
   /// \return -1 on failure, 0 on success
   IGNITION_GAZEBO_GUI_VISIBLE int runGui(int &_argc, char **_argv,
         const char *_guiConfig, const char *_sdfFile, int _waitGui,
-        const char * _renderEngine = nullptr);
+        const char *_renderEngine = nullptr);
 
   /// \brief Create a Gazebo GUI application
   /// \param[in] _argc Number of command line arguments (Used when running

diff --git a/src/gui/Gui.cc b/src/gui/Gui.cc
@@ -30,10 +30,10 @@
 #include "ignition/gazebo/gui/Gui.hh"
 
 #include "AboutDialogHandler.hh"
-#include "QuickStartHandler.hh"
 #include "GuiFileHandler.hh"
 #include "GuiRunner.hh"
 #include "PathManager.hh"
+#include "QuickStartHandler.hh"
 
 namespace ignition
 {

diff --git a/src/gui/GuiFileHandler.hh b/src/gui/GuiFileHandler.hh
@@ -24,8 +24,8 @@
 
 #include <ignition/transport/Node.hh>
 
-#include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/Export.hh"
+#include "ignition/gazebo/config.hh"
 
 namespace ignition
 {

diff --git a/src/gui/QuickStartHandler.cc b/src/gui/QuickStartHandler.cc
@@ -17,10 +17,7 @@
 
 #include "QuickStartHandler.hh"
 
-#include <ignition/common/Console.hh>
-
 using namespace ignition;
-using namespace gazebo;
 using namespace gazebo::gui;
 
 /////////////////////////////////////////////////

diff --git a/src/gui/QuickStartHandler.hh b/src/gui/QuickStartHandler.hh
@@ -18,11 +18,10 @@
 #define IGNITION_GAZEBO_GUI_QUICKSTARTHANDLER_HH_
 
 #include <QtCore>
-#include <QDesktopServices>
 #include <string>
 
-#include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/Export.hh"
+#include "ignition/gazebo/config.hh"
 
 namespace ignition
 {
@@ -55,15 +54,15 @@ class QuickStartHandler : public QObject
 
   /// \brief Get starting world url from GUI.
   /// \return World url
-  public: std::string StartingWorld() const;
+  public: Q_INVOKABLE std::string StartingWorld() const;
 
   /// \brief Set the flag to show quick start menu again.
   /// \param[in] _showQuickStartOpts True to show.
   public: Q_INVOKABLE void SetShowAgain(const bool _showAgain);
 
   /// \brief Show again option.
   /// \return True to show again.
-  public: bool ShowAgain() const;
+  public: Q_INVOKABLE bool ShowAgain() const;
 
   /// \brief Show the quick start menu again.
   private: bool showAgain{true};
@@ -73,7 +72,6 @@ class QuickStartHandler : public QObject
 
   /// \brief Get starting world url.
   private: std::string startingWorld{""};
-
 };
 }
 }

diff --git a/src/ign.cc b/src/ign.cc
@@ -406,8 +406,7 @@ extern "C" int runServer(const char *_sdfString,
 }
 
 //////////////////////////////////////////////////
-extern "C" IGNITION_GAZEBO_VISIBLE int runGui(
-  const char *_guiConfig, const char *_file, int _waitGui,
+extern "C" int runGui(const char *_guiConfig, const char *_file, int _waitGui,
   const char *_renderEngine)
 {
   // argc and argv are going to be passed to a QApplication. The Qt