From 0fde0519fe039bf14ab4d2b8871a7463ee870aca Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Fri, 8 Aug 2014 17:05:02 -0400
Subject: [PATCH] some more include rearangements for boost/python
---
modules/gui/pymod/data_viewer_proxy.cc | 2 +-
modules/gui/pymod/wrap_gui.cc | 2 +-
modules/gui/src/data_viewer/data_viewer.cc | 2 +-
modules/gui/src/gl_canvas.cc | 2 +-
modules/gui/src/gosty.cc | 18 +++++++++---------
modules/gui/src/gosty_app.hh | 2 +-
modules/gui/src/main.hh | 6 +++---
.../gui/src/panels/panel_bar_widget_holder.cc | 2 +-
modules/gui/src/python_shell/python_shell.cc | 2 +-
modules/gui/src/scene_menu.cc | 2 +-
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/modules/gui/pymod/data_viewer_proxy.cc b/modules/gui/pymod/data_viewer_proxy.cc
index 9ee1c099a..3ddf8339b 100644
--- a/modules/gui/pymod/data_viewer_proxy.cc
+++ b/modules/gui/pymod/data_viewer_proxy.cc
@@ -22,9 +22,9 @@
Authors: Ansgar Philippsen, Andreas Schenk
*/
-#include <ost/message.hh>
#include "data_viewer_proxy.hh"
+#include <ost/message.hh>
namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/pymod/wrap_gui.cc b/modules/gui/pymod/wrap_gui.cc
index a4474a6f8..6e4baae55 100644
--- a/modules/gui/pymod/wrap_gui.cc
+++ b/modules/gui/pymod/wrap_gui.cc
@@ -16,10 +16,10 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <iostream>
#include <boost/python.hpp>
#include <QString>
+#include <iostream>
#include <ost/config.hh>
#include <ost/gui/admin.hh>
using namespace boost::python;
diff --git a/modules/gui/src/data_viewer/data_viewer.cc b/modules/gui/src/data_viewer/data_viewer.cc
index 2c1966b4e..d64e88df2 100644
--- a/modules/gui/src/data_viewer/data_viewer.cc
+++ b/modules/gui/src/data_viewer/data_viewer.cc
@@ -23,6 +23,7 @@
Authors: Ansgar Philippsen, Andreas Schenk, Jeff Lovelace
*/
+#include <ost/gui/gosty_app.hh>
#include <cassert>
#include <iostream>
//#include <cstring>
@@ -33,7 +34,6 @@
#include <ost/message.hh>
//#include <ost/img/alg/fft.hh>
#include <ost/img/alg/norm.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/dock_widget.hh>
#include <ost/gui/perspective.hh>
diff --git a/modules/gui/src/gl_canvas.cc b/modules/gui/src/gl_canvas.cc
index f94bff045..9e39789b9 100644
--- a/modules/gui/src/gl_canvas.cc
+++ b/modules/gui/src/gl_canvas.cc
@@ -16,11 +16,11 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
+#include <ost/gui/python_shell/python_interpreter.hh>
#ifndef _MSC_VER
#include <sys/time.h>
#endif
-#include <ost/gui/python_shell/python_interpreter.hh>
#include "gl_canvas.hh"
#include "gl_win.hh"
diff --git a/modules/gui/src/gosty.cc b/modules/gui/src/gosty.cc
index a767d1b9f..b5275bb3e 100644
--- a/modules/gui/src/gosty.cc
+++ b/modules/gui/src/gosty.cc
@@ -16,23 +16,23 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <utility>
-#include <vector>
-#include <signal.h>
-#include <iostream>
-#include <sstream>
-#include <ctime>
-#include <ost/gui/module_config.hh>
-#include <ost/log.hh>
-#include <ost/platform.hh>
#include <ost/gui/python_shell/text_logger.hh>
#include <ost/gui/python_shell/python_shell.hh>
#include <ost/gui/python_shell/python_interpreter.hh>
#include "gl_win.hh"
#include "widget_state_saver.hh"
#include "gosty.hh"
+#include <ost/log.hh>
+#include <ost/platform.hh>
+#include <ost/gui/module_config.hh>
+#include <utility>
+#include <vector>
+#include <signal.h>
+#include <iostream>
+#include <sstream>
+#include <ctime>
// must come last
#include <QApplication>
#include <QResource>
diff --git a/modules/gui/src/gosty_app.hh b/modules/gui/src/gosty_app.hh
index a635c407a..1cf803e00 100644
--- a/modules/gui/src/gosty_app.hh
+++ b/modules/gui/src/gosty_app.hh
@@ -25,8 +25,8 @@
#include <ost/config.hh>
-#include <ost/gui/module_config.hh>
#include <ost/gui/main.hh>
+#include <ost/gui/module_config.hh>
#include <ost/gui/widget_geom_handler.hh>
diff --git a/modules/gui/src/main.hh b/modules/gui/src/main.hh
index deee07972..86105fb96 100644
--- a/modules/gui/src/main.hh
+++ b/modules/gui/src/main.hh
@@ -19,11 +19,11 @@
#ifndef OST_GUI_OST_MAIN_HH
#define OST_GUI_OST_MAIN_HH
-#include <map>
-#include <boost/shared_ptr.hpp>
-#include <ost/gui/module_config.hh>
#include <ost/gui/python_shell/text_logger.hh>
+#include <boost/shared_ptr.hpp>
+#include <ost/gui/module_config.hh>
+#include <map>
#include "widget_state_saver.hh"
diff --git a/modules/gui/src/panels/panel_bar_widget_holder.cc b/modules/gui/src/panels/panel_bar_widget_holder.cc
index a9789cb2a..358f86eef 100644
--- a/modules/gui/src/panels/panel_bar_widget_holder.cc
+++ b/modules/gui/src/panels/panel_bar_widget_holder.cc
@@ -16,7 +16,6 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <cassert>
#include <ost/gui/gosty_app.hh>
@@ -30,6 +29,7 @@
#include "panel_bar.hh"
#include "panel_bar_widget_holder.hh"
+#include <cassert>
#include <QApplication>
#include <QMenu>
#include <QHBoxLayout>
diff --git a/modules/gui/src/python_shell/python_shell.cc b/modules/gui/src/python_shell/python_shell.cc
index 6690506d2..b651747b8 100644
--- a/modules/gui/src/python_shell/python_shell.cc
+++ b/modules/gui/src/python_shell/python_shell.cc
@@ -21,8 +21,8 @@
Author: Marco Biasini
*/
-#include "python_shell.hh"
#include "python_shell_widget.hh"
+#include "python_shell.hh"
#include <ost/gui/gosty_app.hh>
#include <ost/gui/widget_registry.hh>
diff --git a/modules/gui/src/scene_menu.cc b/modules/gui/src/scene_menu.cc
index ef02a2aee..bedcf0df4 100644
--- a/modules/gui/src/scene_menu.cc
+++ b/modules/gui/src/scene_menu.cc
@@ -16,9 +16,9 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
#include <ost/dyn_cast.hh>
#include <ost/mol/view_op.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gfx/scene.hh>
#include <ost/gfx/entity.hh>
--
GitLab