2 ➡️ 3 (#146)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Nov 11, 2020 · d440a56 · d440a56
2 parents 4892e2d + 5a02f30
commit d440a56
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -135,7 +135,13 @@
 
 ## Ignition Gui 2
 
-### Ignition Gui 2.X.X
+### Ignition Gui 2.3.3 (2020-08-31)
+
+1. Fix running plugins with bad world names.
+    * [Pull request 111](https://github.com/ignitionrobotics/ign-gui/pull/111)
+
+1. Disable more tests known to fail on macOS and Windows.
+    * [Pull request 112](https://github.com/ignitionrobotics/ign-gui/pull/112)
 
 ### Ignition Gui 2.3.2 (2020-08-19)
 

diff --git a/src/plugins/image_display/ImageDisplay.cc b/src/plugins/image_display/ImageDisplay.cc
@@ -15,16 +15,21 @@
  *
 */
 
+#include "ImageDisplay.hh"
+
 #include <QQuickImageProvider>
+
+#include <algorithm>
 #include <iostream>
+#include <string>
+#include <vector>
 
 #include <ignition/common/Console.hh>
 #include <ignition/common/Image.hh>
 #include <ignition/plugin/Register.hh>
 #include <ignition/transport/Node.hh>
 
 #include "ignition/gui/Application.hh"
-#include "ImageDisplay.hh"
 
 namespace ignition
 {

diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc
@@ -15,6 +15,9 @@
  *
 */
 
+#include "Scene3D.hh"
+
+#include <algorithm>
 #include <cmath>
 #include <map>
 #include <sstream>
@@ -54,8 +57,6 @@
 #include "ignition/gui/GuiEvents.hh"
 #include "ignition/gui/MainWindow.hh"
 
-#include "Scene3D.hh"
-
 namespace ignition
 {
 namespace gui

diff --git a/src/plugins/world_control/WorldControl.cc b/src/plugins/world_control/WorldControl.cc
@@ -15,15 +15,17 @@
  *
 */
 
+#include "WorldControl.hh"
+
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/Time.hh>
 #include <ignition/common/StringUtils.hh>
 #include <ignition/plugin/Register.hh>
 
 #include "ignition/gui/Helpers.hh"
 
-#include "WorldControl.hh"
-
 namespace ignition
 {
 namespace gui

diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc
@@ -15,15 +15,17 @@
  *
 */
 
+#include "WorldStats.hh"
+
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/StringUtils.hh>
 #include <ignition/common/Time.hh>
 #include <ignition/plugin/Register.hh>
 
 #include "ignition/gui/Helpers.hh"
 
-#include "WorldStats.hh"
-
 namespace ignition
 {
 namespace gui