Merge branch 'ahcorde/5/standalone' of https://github.com/ignitionrob…

…otics/ign-gui into ahcorde/5/standalone Signed-off-by: ahcorde <ahcorde@gmail.com>
gazebosim · Jul 12, 2021 · 3733562 · 3733562
2 parents 4b3789f + 247b98e
commit 3733562
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Application.cc b/src/Application.cc
@@ -328,9 +328,10 @@ bool Application::LoadPlugin(const std::string &_filename,
   std::string delimiter = ";";
 #endif
 
-  systemPaths.AddPluginPaths(common::joinPaths(home, ".ignition", "gui", "plugins") +
-                             delimiter +
-                             IGN_GUI_PLUGIN_INSTALL_DIR);
+  systemPaths.AddPluginPaths(
+    common::joinPaths(home, ".ignition", "gui", "plugins") +
+    delimiter +
+    IGN_GUI_PLUGIN_INSTALL_DIR);
 
   auto pathToLib = systemPaths.FindSharedLibrary(_filename);
   if (pathToLib.empty())

diff --git a/src/MainWindow.cc b/src/MainWindow.cc
@@ -87,7 +87,8 @@ MainWindow::MainWindow()
   }
 
   App()->setWindowIcon(QIcon(
-    common::joinPaths(":", "qml", "images", "ignition_logo_50x50.png").c_str()));
+    common::joinPaths(
+      ":", "qml", "images", "ignition_logo_50x50.png").c_str()));
 }
 
 /////////////////////////////////////////////////

diff --git a/src/cmd/ign.cc b/src/cmd/ign.cc
@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include <iostream>
+#include <string>
 
 #include <ignition/common/Console.hh>