From 3451e84e5866c0ec19c8321aa0f3e4767f66ebde Mon Sep 17 00:00:00 2001
From: mariva00 <mariva00@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 21 Sep 2010 09:35:54 +0000
Subject: [PATCH] Compatibility with CentOS 5.5 / Removed Plot Viewer
Changed order of header inclusion to work around a Pyton/PyQt bug.
Removed Plotviewer
Enforced compatibilty with python 2.4
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2704 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/bindings/pymod/msms.py | 16 ++++++++-
modules/gui/pymod/CMakeLists.txt | 1 -
modules/gui/pymod/export_scene_win.cc | 2 +-
modules/gui/pymod/init_context_menu.py | 4 +--
.../scene/immutable_gradient_info_handler.py | 4 +--
.../gui/pymod/scene/immutable_info_handler.py | 2 +-
.../scene/immutable_loader_info_handler.py | 2 +-
.../scene/immutable_preset_info_handler.py | 2 +-
modules/gui/pymod/scene/preset.py | 2 +-
modules/gui/pymod/scene/render_op.py | 2 +-
.../gui/pymod/scene/scene_selection_helper.py | 2 +-
modules/gui/pymod/scene/visibility_op.py | 2 +-
modules/gui/pymod/wrap_gui.cc | 2 --
modules/gui/src/CMakeLists.txt | 35 -------------------
modules/gui/src/data_viewer/argand.cc | 4 +--
modules/gui/src/data_viewer/argand.hh | 4 +--
modules/gui/src/data_viewer/data_viewer.cc | 16 ++++-----
.../src/data_viewer/data_viewer_panel_base.cc | 5 +--
.../src/data_viewer/data_viewer_panel_base.hh | 12 +++----
.../gui/src/data_viewer/drawing_functions.hh | 2 +-
modules/gui/src/data_viewer/fft_panel.cc | 2 +-
modules/gui/src/data_viewer/img2qt.cc | 2 +-
modules/gui/src/data_viewer/info_panel.cc | 6 ++--
modules/gui/src/data_viewer/info_panel.hh | 6 ++--
modules/gui/src/data_viewer/overlay_base.hh | 12 +++----
.../gui/src/data_viewer/overlay_manager.hh | 6 ++--
.../src/data_viewer/overlay_manager_gui.cc | 2 +-
.../src/data_viewer/overlay_manager_gui.hh | 10 +++---
.../src/data_viewer/pointlist_overlay_base.cc | 6 ++--
.../src/data_viewer/pointlist_overlay_base.hh | 14 ++++----
modules/gui/src/data_viewer/strategies.hh | 10 +++---
modules/gui/src/dock_widget.hh | 2 +-
.../entity_explorer/entity_explorer_model.hh | 2 +-
modules/gui/src/file_browser.cc | 17 ++++-----
modules/gui/src/file_browser.hh | 6 ++--
modules/gui/src/file_loader.cc | 16 ++++-----
modules/gui/src/file_loader.hh | 6 ++--
modules/gui/src/file_type_dialog.cc | 8 ++---
modules/gui/src/file_type_dialog.hh | 7 ++--
modules/gui/src/file_viewer.cc | 2 +-
modules/gui/src/file_viewer.hh | 6 ++--
modules/gui/src/gl_canvas.cc | 8 ++---
modules/gui/src/gl_canvas.hh | 10 +++---
modules/gui/src/gl_win.cc | 2 +-
modules/gui/src/gl_win.hh | 11 +++---
modules/gui/src/gosty.cc | 4 +--
modules/gui/src/gosty.hh | 2 +-
modules/gui/src/gosty_app.cc | 12 +++----
modules/gui/src/gosty_app.hh | 6 ++--
modules/gui/src/input/spnav_input.hh | 4 +--
modules/gui/src/loader_manager.cc | 6 ++--
modules/gui/src/main.cc | 24 ++++++-------
modules/gui/src/main.hh | 1 -
modules/gui/src/main_area.cc | 4 +--
modules/gui/src/main_area.hh | 2 +-
modules/gui/src/main_window.hh | 4 +--
modules/gui/src/messages/log_reader.hh | 6 ++--
.../gui/src/messages/message_box_widget.cc | 10 +++---
.../gui/src/messages/message_box_widget.hh | 6 ++--
modules/gui/src/messages/message_widget.cc | 11 +++---
modules/gui/src/messages/message_widget.hh | 7 ++--
modules/gui/src/panels/bottom_bar.cc | 2 +-
modules/gui/src/panels/button_bar.hh | 8 ++---
modules/gui/src/panels/button_box.hh | 10 +++---
modules/gui/src/panels/drop_box.cc | 4 +--
modules/gui/src/panels/event_button.hh | 8 ++---
modules/gui/src/panels/panel_bar.cc | 4 +--
modules/gui/src/panels/panel_bar.hh | 10 +++---
.../gui/src/panels/panel_bar_widget_holder.cc | 24 ++++++-------
.../gui/src/panels/panel_bar_widget_holder.hh | 4 +--
modules/gui/src/panels/panel_manager.cc | 6 ++--
modules/gui/src/panels/panel_manager.hh | 10 +++---
.../gui/src/panels/panel_widget_container.hh | 10 +++---
modules/gui/src/panels/side_bar.cc | 2 +-
modules/gui/src/panels/splitter_panel_bar.cc | 6 ++--
modules/gui/src/panels/splitter_panel_bar.hh | 8 ++---
modules/gui/src/panels/tabbed_panel_bar.cc | 6 ++--
modules/gui/src/panels/tabbed_panel_bar.hh | 14 ++++----
modules/gui/src/perspective.cc | 18 +++++-----
modules/gui/src/perspective.hh | 12 +++----
modules/gui/src/plot_viewer/plot_axis_base.cc | 4 +--
modules/gui/src/plot_viewer/plot_axis_base.hh | 2 +-
.../src/plot_viewer/plot_axis_horizontal.cc | 4 +--
.../gui/src/plot_viewer/plot_axis_vertical.cc | 4 +--
.../gui/src/plot_viewer/plot_data_entry.hh | 2 +-
.../plot_viewer/plot_data_graphics_item.cc | 4 +--
.../plot_data_graphics_item_base.hh | 4 +--
modules/gui/src/plot_viewer/plot_data_info.hh | 2 +-
.../plot_function_graphics_item.hh | 2 +-
.../plot_viewer/plot_graphics_cross_item.cc | 4 +--
.../plot_viewer/plot_graphics_cross_item.hh | 4 +--
.../plot_graphics_diagonal_cross_item.cc | 4 +--
.../plot_graphics_diagonal_cross_item.hh | 4 +--
.../plot_viewer/plot_graphics_ellipse_item.cc | 4 +--
.../plot_viewer/plot_graphics_ellipse_item.hh | 4 +--
.../plot_graphics_rectangle_item.cc | 4 +--
.../plot_graphics_rectangle_item.hh | 4 +--
.../gui/src/plot_viewer/plot_group_info.hh | 2 +-
modules/gui/src/plot_viewer/plot_info_base.hh | 6 ++--
.../gui/src/plot_viewer/plot_legend_panel.cc | 2 +-
.../gui/src/plot_viewer/plot_legend_panel.hh | 4 +--
modules/gui/src/plot_viewer/plot_viewer.cc | 4 +--
modules/gui/src/plot_viewer/plot_viewer.hh | 8 ++---
.../gui/src/plot_viewer/plot_viewer_panel.cc | 2 +-
.../gui/src/plot_viewer/plot_viewer_panel.hh | 4 +--
.../gui/src/python_shell/completer_base.cc | 2 +-
.../src/python_shell/main_thread_runner.hh | 2 +-
.../gui/src/python_shell/output_redirector.cc | 2 +-
.../gui/src/python_shell/output_redirector.hh | 2 +-
.../gui/src/python_shell/python_completer.cc | 2 +-
.../src/python_shell/python_interpreter.cc | 2 +-
.../src/python_shell/python_interpreter.hh | 7 ++--
.../python_shell/python_interpreter_worker.hh | 4 +--
modules/gui/src/python_shell/python_shell.cc | 4 +--
.../src/python_shell/python_shell_widget.cc | 14 ++++----
.../src/python_shell/python_shell_widget.hh | 4 +--
.../python_shell/python_syntax_highlighter.cc | 4 +--
.../python_shell/python_syntax_highlighter.hh | 4 +--
modules/gui/src/python_shell/shell_history.hh | 2 +-
modules/gui/src/python_shell/state.cc | 2 +-
modules/gui/src/python_shell/transition.cc | 6 ++--
modules/gui/src/python_shell/transition.hh | 4 +--
.../gui/src/python_shell/transition_guard.hh | 2 +-
modules/gui/src/remote_loader.cc | 10 +++---
modules/gui/src/remote_loader.hh | 10 +++---
modules/gui/src/remote_site_loader.hh | 4 +--
modules/gui/src/scene_menu.hh | 9 +++--
modules/gui/src/scene_selection.cc | 2 +-
modules/gui/src/scene_selection.hh | 6 ++--
modules/gui/src/scene_win/context_menu.cc | 8 ++---
modules/gui/src/scene_win/context_menu.hh | 8 ++---
.../src/scene_win/current_selection_node.cc | 4 +--
.../src/scene_win/current_selection_node.hh | 6 ++--
modules/gui/src/scene_win/custom_part_node.cc | 2 +-
modules/gui/src/scene_win/custom_part_node.hh | 6 ++--
modules/gui/src/scene_win/entity_node.cc | 6 ++--
modules/gui/src/scene_win/entity_part_node.cc | 2 +-
modules/gui/src/scene_win/entity_part_node.hh | 6 ++--
modules/gui/src/scene_win/gfx_scene_node.cc | 2 +-
modules/gui/src/scene_win/gfx_scene_node.hh | 6 ++--
modules/gui/src/scene_win/label_node.cc | 2 +-
modules/gui/src/scene_win/label_node.hh | 6 ++--
modules/gui/src/scene_win/render_mode_node.cc | 2 +-
modules/gui/src/scene_win/render_mode_node.hh | 6 ++--
.../gui/src/scene_win/render_modes_node.cc | 4 +--
.../gui/src/scene_win/render_modes_node.hh | 6 ++--
modules/gui/src/scene_win/root_node.cc | 2 +-
modules/gui/src/scene_win/root_node.hh | 6 ++--
modules/gui/src/scene_win/scene_node.hh | 4 +--
modules/gui/src/scene_win/scene_win.cc | 6 ++--
modules/gui/src/scene_win/scene_win.hh | 4 +--
modules/gui/src/scene_win/scene_win_model.hh | 8 ++---
.../align_properties_painter.cc | 2 +-
.../align_properties_painter.hh | 2 +-
.../sequence_viewer/alignment_view_object.cc | 2 +-
.../src/sequence_viewer/background_painter.cc | 2 +-
.../src/sequence_viewer/background_painter.hh | 2 +-
modules/gui/src/sequence_viewer/base_row.cc | 2 +-
modules/gui/src/sequence_viewer/base_row.hh | 6 ++--
.../src/sequence_viewer/base_view_object.cc | 2 +-
.../src/sequence_viewer/base_view_object.hh | 4 +--
.../sequence_viewer/conservation_painter.cc | 2 +-
.../sequence_viewer/conservation_painter.hh | 2 +-
modules/gui/src/sequence_viewer/painter.hh | 6 ++--
modules/gui/src/sequence_viewer/secstr_row.cc | 2 +-
modules/gui/src/sequence_viewer/secstr_row.hh | 4 +--
.../src/sequence_viewer/seq_secstr_painter.cc | 2 +-
.../src/sequence_viewer/seq_secstr_painter.hh | 4 +--
.../sequence_viewer/seq_selection_painter.cc | 2 +-
.../sequence_viewer/seq_selection_painter.hh | 2 +-
.../src/sequence_viewer/seq_text_painter.cc | 2 +-
.../src/sequence_viewer/seq_text_painter.hh | 2 +-
.../src/sequence_viewer/sequence_delegate.cc | 2 +-
.../src/sequence_viewer/sequence_delegate.hh | 4 +--
.../gui/src/sequence_viewer/sequence_model.cc | 8 ++---
.../gui/src/sequence_viewer/sequence_model.hh | 4 +--
.../gui/src/sequence_viewer/sequence_row.cc | 2 +-
.../gui/src/sequence_viewer/sequence_row.hh | 2 +-
.../sequence_viewer/sequence_table_view.cc | 6 ++--
.../sequence_viewer/sequence_table_view.hh | 4 +--
.../sequence_viewer/sequence_view_object.cc | 2 +-
.../src/sequence_viewer/sequence_viewer.cc | 22 ++++++------
.../src/sequence_viewer/sequence_viewer.hh | 6 ++--
.../gui/src/sequence_viewer/tick_painter.hh | 2 +-
modules/gui/src/sequence_viewer/title_row.cc | 2 +-
modules/gui/src/sequence_viewer/title_row.hh | 2 +-
modules/gui/src/thin_splitter.cc | 6 ++--
modules/gui/src/tools/manipulator.cc | 4 +--
modules/gui/src/tools/manipulator.hh | 3 +-
modules/gui/src/tools/map_tool.cc | 4 +--
modules/gui/src/tools/map_tool.hh | 2 +-
modules/gui/src/tools/measure_tool.cc | 2 +-
modules/gui/src/tools/measure_tool.hh | 2 +-
modules/gui/src/tools/selection_tool.cc | 2 +-
modules/gui/src/tools/selection_tool.hh | 2 +-
modules/gui/src/tools/tool.hh | 3 +-
modules/gui/src/tools/tool_bar.cc | 8 ++---
modules/gui/src/tools/tool_bar.hh | 4 +--
modules/gui/src/tools/tool_manager.hh | 2 +-
modules/gui/src/tools/tool_option.hh | 3 +-
modules/gui/src/tools/tool_option_group.hh | 2 +-
modules/gui/src/tools/tool_options.hh | 2 +-
modules/gui/src/tools/tool_options_win.cc | 4 +--
modules/gui/src/tools/tool_options_win.hh | 2 +-
modules/gui/src/widget.hh | 4 +--
modules/gui/src/widget_geom_handler.cc | 2 +-
modules/gui/src/widget_geom_handler.hh | 2 +-
modules/gui/src/widget_pool.hh | 2 +-
modules/gui/src/widget_registry.cc | 2 +-
209 files changed, 528 insertions(+), 552 deletions(-)
diff --git a/modules/bindings/pymod/msms.py b/modules/bindings/pymod/msms.py
index e41bd5c1d..dc3b85906 100644
--- a/modules/bindings/pymod/msms.py
+++ b/modules/bindings/pymod/msms.py
@@ -24,6 +24,20 @@ from ost import mol
from ost import settings
from ost import geom
+
+
+## \brief custom exception that substitutes CalledProcessError
+#
+# Python 2.4 does not include the CalledProcessError exception.
+# This one substitutes it
+class MsmsProcessError(Exception):
+ def __init__(self, returncode,command):
+ self.returncode = returncode
+ self.command = command
+ def __str__(self):
+ return repr(self.returncode)
+
+
## \brief Method to check if MSMS executable is present
#
# \param msms_exe Explicit path to msms executable
@@ -106,7 +120,7 @@ def _RunMSMS(command):
#check for successful completion of msms
if proc.returncode!=0:
print "WARNING: msms error\n", stdout_value
- raise subprocess.CalledProcessError(proc.returncode, command)
+ raise subprocess.MsmsProcessError(proc.returncode, command)
return stdout_value
diff --git a/modules/gui/pymod/CMakeLists.txt b/modules/gui/pymod/CMakeLists.txt
index a9b647083..d4661d360 100644
--- a/modules/gui/pymod/CMakeLists.txt
+++ b/modules/gui/pymod/CMakeLists.txt
@@ -3,7 +3,6 @@ set(OST_GUI_PYMOD_SOURCES
export_alignment_view.cc
export_message_widget.cc
export_gl_win.cc
- export_plot.cc
export_tool.cc
export_py_shell.cc
export_gosty.cc
diff --git a/modules/gui/pymod/export_scene_win.cc b/modules/gui/pymod/export_scene_win.cc
index 38056d017..6db3578c7 100644
--- a/modules/gui/pymod/export_scene_win.cc
+++ b/modules/gui/pymod/export_scene_win.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 <QAction>
#include <boost/python.hpp>
@@ -25,6 +24,7 @@
#include "sip_handler.hh"
+#include <QAction>
using namespace boost::python;
using namespace ost;
diff --git a/modules/gui/pymod/init_context_menu.py b/modules/gui/pymod/init_context_menu.py
index 0f8c82e7b..bddcda7fd 100644
--- a/modules/gui/pymod/init_context_menu.py
+++ b/modules/gui/pymod/init_context_menu.py
@@ -4,8 +4,6 @@ from PyQt4 import QtCore, QtGui
import sip
-from subprocess import CalledProcessError
-
from ost import geom, gfx, gui, seq
from ost import settings
from ost import LogError, mol
@@ -229,7 +227,7 @@ class SurfaceContextMenu(QtCore.QObject):
no_hetatoms=nohet,
no_waters=nowat)[0]
gfx.Scene().Add(gfx.Surface("%s_%s"%(entity.GetName(),name),s))
- except (RuntimeError, CalledProcessError):
+ except (RuntimeError, msms.MsmsProcessError):
LogError("WARNING: Surface could not be calculated")
return
except UserWarning:
diff --git a/modules/gui/pymod/scene/immutable_gradient_info_handler.py b/modules/gui/pymod/scene/immutable_gradient_info_handler.py
index ddf5de046..e1fbb49c3 100644
--- a/modules/gui/pymod/scene/immutable_gradient_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_gradient_info_handler.py
@@ -24,7 +24,7 @@ from ost import info
from PyQt4 import QtCore, QtGui
#Gradient Editor
-class ImmutableGradientInfoHandler():
+class ImmutableGradientInfoHandler:
def __init__(self, fileName):
self.FILE_NAME = fileName
@@ -79,4 +79,4 @@ class ImmutableGradientInfoHandler():
rel=s[0]
color=s[1]
gfx_gradient.SetColorAt(s[0], gfx.Color(s[1].redF(), s[1].greenF(), s[1].blueF()));
- return gfx_gradient;
\ No newline at end of file
+ return gfx_gradient;
diff --git a/modules/gui/pymod/scene/immutable_info_handler.py b/modules/gui/pymod/scene/immutable_info_handler.py
index 4c2c0332d..cbebc4586 100644
--- a/modules/gui/pymod/scene/immutable_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_info_handler.py
@@ -24,7 +24,7 @@ from ost import info
from PyQt4 import QtCore, QtGui
#Gradient Editor
-class ImmutableInfoHandler():
+class ImmutableInfoHandler:
def __init__(self, fileName):
self.FILE_NAME = fileName
diff --git a/modules/gui/pymod/scene/immutable_loader_info_handler.py b/modules/gui/pymod/scene/immutable_loader_info_handler.py
index 03ada4036..fc2198607 100644
--- a/modules/gui/pymod/scene/immutable_loader_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_loader_info_handler.py
@@ -25,7 +25,7 @@ from PyQt4 import QtCore, QtGui
from file_loader import GenericLoader
-class ImmutableLoaderInfoHandler():
+class ImmutableLoaderInfoHandler:
LOADERS_GROUP_NAME = "GenericLoaders"
LOADER_GROUP_NAME = "GenericLoader"
NAME_ATTRIBUTE_NAME = "Name"
diff --git a/modules/gui/pymod/scene/immutable_preset_info_handler.py b/modules/gui/pymod/scene/immutable_preset_info_handler.py
index 1ae6d34b5..131b0e1bc 100644
--- a/modules/gui/pymod/scene/immutable_preset_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_preset_info_handler.py
@@ -25,7 +25,7 @@ from PyQt4 import QtCore, QtGui
from ost.gui.scene.preset import Preset
#Gradient Editor
-class ImmutablePresetInfoHandler():
+class ImmutablePresetInfoHandler:
PRESETS_GROUP_NAME = "Presets"
PRESET_GROUP_NAME = "Preset"
NAME_ATTRIBUTE_NAME = "Name"
diff --git a/modules/gui/pymod/scene/preset.py b/modules/gui/pymod/scene/preset.py
index f46c3cd07..2b4f41ba0 100644
--- a/modules/gui/pymod/scene/preset.py
+++ b/modules/gui/pymod/scene/preset.py
@@ -25,7 +25,7 @@ from PyQt4 import QtGui
from ost.gfx import ColorOp
#Rendering Preset
-class Preset():
+class Preset:
NAME_ATTRIBUTE_NAME = "Name"
OP_GROUP_NAME = "Op"
CLASS_NAME_ATTRIBUTE_NAME = "ClassName"
diff --git a/modules/gui/pymod/scene/render_op.py b/modules/gui/pymod/scene/render_op.py
index 53a82b8f7..f161eff2f 100644
--- a/modules/gui/pymod/scene/render_op.py
+++ b/modules/gui/pymod/scene/render_op.py
@@ -22,7 +22,7 @@ from ost import info
from ost import gfx
from PyQt4 import QtGui
-class RenderOp():
+class RenderOp:
RENDERMODE_ATTRIBUTE_NAME = "RenderMode"
KEEP_ATTRIBUTE_NAME = "Keep"
FLAGS_ATTRIBUTE_NAME = "Flags"
diff --git a/modules/gui/pymod/scene/scene_selection_helper.py b/modules/gui/pymod/scene/scene_selection_helper.py
index 0dc43312c..96d9cc9ff 100644
--- a/modules/gui/pymod/scene/scene_selection_helper.py
+++ b/modules/gui/pymod/scene/scene_selection_helper.py
@@ -30,7 +30,7 @@ except ImportError:
_img_present=False
pass
-class SelHelper():
+class SelHelper:
__shared_state = {}
NO_SELECTION = 0
diff --git a/modules/gui/pymod/scene/visibility_op.py b/modules/gui/pymod/scene/visibility_op.py
index 82ba8a2e4..6a377b5fc 100644
--- a/modules/gui/pymod/scene/visibility_op.py
+++ b/modules/gui/pymod/scene/visibility_op.py
@@ -22,7 +22,7 @@ from ost import info
from ost import gfx
from PyQt4 import QtGui
-class VisibilityOp():
+class VisibilityOp:
VISIBLE_ATTRIBUTE_NAME = "Visible"
FLAGS_ATTRIBUTE_NAME = "Flags"
diff --git a/modules/gui/pymod/wrap_gui.cc b/modules/gui/pymod/wrap_gui.cc
index d0cd95bd2..09f24fe82 100644
--- a/modules/gui/pymod/wrap_gui.cc
+++ b/modules/gui/pymod/wrap_gui.cc
@@ -26,7 +26,6 @@ using namespace boost::python;
void export_AlignmentView();
void export_Tool();
-void export_Plot();
void export_GLWin();
void export_MessageWidget();
void export_Gosty();
@@ -109,7 +108,6 @@ BOOST_PYTHON_MODULE(_gui)
export_Gosty();
export_AlignmentView();
export_Tool();
- export_Plot();
export_MessageWidget();
export_GLWin();
export_MainArea();
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index 2119c8ace..1a5104a0a 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -130,10 +130,6 @@ plot_legend_panel.hh
plot_ticker.hh
plot_ticker_fw.hh
plot_types.hh
-plot_viewer.hh
-plot_viewer_panel.hh
-plot_viewer_proxy.hh
-plot_viewer_proxy_fw.hh
)
if (ENABLE_IMG)
@@ -265,30 +261,6 @@ tools/tool_options_widget.cc
tools/tool_bar.cc
tools/selection_tool.cc
tools/measure_tool.cc
-plot_viewer/plot_axis_base.cc
-plot_viewer/plot_axis_vertical.cc
-plot_viewer/plot_axis_horizontal.cc
-plot_viewer/plot_data_graphics_item.cc
-plot_viewer/plot_data_graphics_item_base.cc
-plot_viewer/plot_graphics_ellipse_item.cc
-plot_viewer/plot_graphics_rectangle_item.cc
-plot_viewer/plot_graphics_diagonal_cross_item.cc
-plot_viewer/plot_graphics_cross_item.cc
-plot_viewer/plot_data.cc
-plot_viewer/plot_data_base.cc
-plot_viewer/plot_data_info.cc
-plot_viewer/plot_function.cc
-plot_viewer/plot_function_graphics_item.cc
-plot_viewer/plot_function_info.cc
-plot_viewer/plot_info_base.cc
-plot_viewer/plot_group.cc
-plot_viewer/plot_group_info.cc
-plot_viewer/plot_group_graphics_item.cc
-plot_viewer/plot_ticker.cc
-plot_viewer/plot_viewer.cc
-plot_viewer/plot_viewer_proxy.cc
-plot_viewer/plot_viewer_panel.cc
-plot_viewer/plot_legend_panel.cc
python_shell/gutter.cc
python_shell/main_thread_runner.cc
python_shell/output_redirector.cc
@@ -369,12 +341,6 @@ sequence_viewer/title_row.hh
sequence_viewer/alignment_view_object.hh
sequence_viewer/base_view_object.hh
sequence_viewer/sequence_view_object.hh
-plot_viewer/plot_axis_base.hh
-plot_viewer/plot_data_graphics_item_base.hh
-plot_viewer/plot_function_info.hh
-plot_viewer/plot_info_base.hh
-plot_viewer/plot_viewer_panel.hh
-plot_viewer/plot_legend_panel.hh
python_shell/main_thread_runner.hh
python_shell/completer_base.hh
python_shell/gutter.hh
@@ -477,7 +443,6 @@ include(${QT_USE_FILE})
qt4_wrap_cpp(OST_GUI_MOCS "${HEADERS_TO_BE_MOCCED}")
module(NAME gui SOURCES ${OST_GUI_MOCS} ${OST_GUI_SOURCES}
HEADERS ${OST_GUI_TOOLS_HEADERS} IN_DIR tools
- ${OST_GUI_PLOT_VIEWER_HEADERS} IN_DIR plot_viewer
${OST_GUI_SEQUENCE_VIEWER_HEADERS} IN_DIR sequence_viewer
${OST_GUI_PYTHON_SHELL_HEADERS} IN_DIR python_shell
${OST_GUI_PANEL_BAR_HEADERS} IN_DIR panels
diff --git a/modules/gui/src/data_viewer/argand.cc b/modules/gui/src/data_viewer/argand.cc
index 7c536a360..e9d65dee8 100644
--- a/modules/gui/src/data_viewer/argand.cc
+++ b/modules/gui/src/data_viewer/argand.cc
@@ -22,13 +22,13 @@
Authors: Ansgar Philippsen, Andreas Schenk
*/
-#include <QPainter>
-#include <QResizeEvent>
#include <ost/base.hh>
#include "argand.hh"
+#include <QPainter>
+#include <QResizeEvent>
namespace ost { namespace img { namespace gui {
Argand::Argand(const Data& data, QWidget* p):
diff --git a/modules/gui/src/data_viewer/argand.hh b/modules/gui/src/data_viewer/argand.hh
index cc337c661..346cee3b0 100644
--- a/modules/gui/src/data_viewer/argand.hh
+++ b/modules/gui/src/data_viewer/argand.hh
@@ -25,8 +25,6 @@
#ifndef OST_GUI_ARGAND_H
#define OST_GUI_ARGAND_H
-#include <QWidget>
-#include <QPixmap>
#include <ost/base.hh>
#include <ost/img/data.hh>
@@ -35,6 +33,8 @@
#include <ost/gui/module_config.hh>
+#include <QWidget>
+#include <QPixmap>
namespace ost { namespace img { namespace gui {
class DLLEXPORT_OST_GUI Argand: public QWidget, public DataObserver
diff --git a/modules/gui/src/data_viewer/data_viewer.cc b/modules/gui/src/data_viewer/data_viewer.cc
index 4cb4cc3d8..11edbf9da 100644
--- a/modules/gui/src/data_viewer/data_viewer.cc
+++ b/modules/gui/src/data_viewer/data_viewer.cc
@@ -28,14 +28,6 @@
//#include <cstring>
//#include <sstream>
-#include <QLabel>
-#include <QStatusBar>
-#include <QMouseEvent>
-#include <QVariant>
-#include <QMenu>
-#include <QMenuBar>
-#include <QApplication>
-#include <QDesktopWidget>
//#include <ost/img/io/io_manager.hh>
#include <ost/message.hh>
@@ -48,6 +40,14 @@
#include "overlay_base.hh"
#include "overlay_manager.hh"
+#include <QLabel>
+#include <QStatusBar>
+#include <QMouseEvent>
+#include <QVariant>
+#include <QMenu>
+#include <QMenuBar>
+#include <QApplication>
+#include <QDesktopWidget>
namespace ost { namespace img { namespace gui {
namespace {
diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.cc b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
index 98b38d711..7a098921d 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel_base.cc
+++ b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
@@ -30,6 +30,9 @@
//#include "bitmaps/rotate.xpm"
//#include "bitmaps/arrowmove.xpm"
+#include "img2qt.hh"
+#include "data_viewer_panel_base.hh"
+
#include <QResizeEvent>
#include <QPainter>
#include <QColor>
@@ -37,8 +40,6 @@
#include <QPixmapCache>
#include <ost/message.hh>
-#include "img2qt.hh"
-#include "data_viewer_panel_base.hh"
#define USE_PIXMAP_CACHE
diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.hh b/modules/gui/src/data_viewer/data_viewer_panel_base.hh
index d3a6b01d0..16339e55f 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel_base.hh
+++ b/modules/gui/src/data_viewer/data_viewer_panel_base.hh
@@ -28,12 +28,6 @@
#include <map>
#include <boost/shared_ptr.hpp>
-#include <QWidget>
-#include <QCursor>
-#include <QMenu>
-#include <QPen>
-#include <QBrush>
-#include <QRubberBand>
#include <ost/base.hh>
@@ -46,6 +40,12 @@
#include <ost/img/normalizer_impl.hh>
+#include <QWidget>
+#include <QCursor>
+#include <QMenu>
+#include <QPen>
+#include <QBrush>
+#include <QRubberBand>
namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/data_viewer/drawing_functions.hh b/modules/gui/src/data_viewer/drawing_functions.hh
index c27e66345..b3374a12d 100644
--- a/modules/gui/src/data_viewer/drawing_functions.hh
+++ b/modules/gui/src/data_viewer/drawing_functions.hh
@@ -25,11 +25,11 @@
#ifndef IMG_GUI_DRAWING_FUNCTIONS_HH_
#define IMG_GUI_DRAWING_FUNCTIONS_HH_
+#include <ost/geom/geom.hh>
#include <QPainter>
#include <QPoint>
#include <QSize>
-#include <ost/geom/geom.hh>
namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/data_viewer/fft_panel.cc b/modules/gui/src/data_viewer/fft_panel.cc
index d764d5f9c..6b14752a0 100644
--- a/modules/gui/src/data_viewer/fft_panel.cc
+++ b/modules/gui/src/data_viewer/fft_panel.cc
@@ -22,11 +22,11 @@
Author: Andreas Schenk
*/
-#include <QInputDialog>
#include <ost/img/alg/fft.hh>
#include "fft_panel.hh"
+#include <QInputDialog>
namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/data_viewer/img2qt.cc b/modules/gui/src/data_viewer/img2qt.cc
index d89a24c46..9d0defcc4 100644
--- a/modules/gui/src/data_viewer/img2qt.cc
+++ b/modules/gui/src/data_viewer/img2qt.cc
@@ -17,7 +17,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 <QImage>
#include <ost/img/data.hh>
#include <ost/img/algorithm.hh>
@@ -25,6 +24,7 @@
#include <ost/stdint.hh>
#include "img2qt.hh"
+#include <QImage>
using namespace ost::img;
diff --git a/modules/gui/src/data_viewer/info_panel.cc b/modules/gui/src/data_viewer/info_panel.cc
index 7bdf2a514..4ebd0b53e 100644
--- a/modules/gui/src/data_viewer/info_panel.cc
+++ b/modules/gui/src/data_viewer/info_panel.cc
@@ -24,14 +24,14 @@
*/
#include <boost/format.hpp>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QGroupBox>
#include <ost/img/image.hh>
#include "info_panel.hh"
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QGroupBox>
namespace ost { namespace img { namespace gui {
InfoPanelLabel::InfoPanelLabel(const QString& t, QWidget* parent):
diff --git a/modules/gui/src/data_viewer/info_panel.hh b/modules/gui/src/data_viewer/info_panel.hh
index 388248dab..d22955506 100644
--- a/modules/gui/src/data_viewer/info_panel.hh
+++ b/modules/gui/src/data_viewer/info_panel.hh
@@ -25,9 +25,6 @@
#ifndef IMG_GUI_DATAVIEWER_INFO_PANEL_H_
#define IMG_GUI_DATAVIEWER_INFO_PANEL_H_
-#include <QWidget>
-#include <QLabel>
-#include <QMenu>
#include <ost/img/data_types.hh>
#include <ost/img/extent.hh>
@@ -35,6 +32,9 @@
#include <ost/gui/module_config.hh>
+#include <QWidget>
+#include <QLabel>
+#include <QMenu>
namespace ost { namespace img { namespace gui {
class DLLEXPORT_OST_GUI InfoPanelLabel: public QLabel
diff --git a/modules/gui/src/data_viewer/overlay_base.hh b/modules/gui/src/data_viewer/overlay_base.hh
index edef14985..05c3d6d08 100644
--- a/modules/gui/src/data_viewer/overlay_base.hh
+++ b/modules/gui/src/data_viewer/overlay_base.hh
@@ -25,18 +25,18 @@
#ifndef IMG_GUI_OVERLAY_BASE_H
#define IMG_GUI_OVERLAY_BASE_H
-#include <QObject>
-#include <QEvent>
-#include <QPainter>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QKeyEvent>
#include <ost/base.hh>
#include <ost/gui/module_config.hh>
#include "overlay_base_fw.hh"
+#include <QObject>
+#include <QEvent>
+#include <QPainter>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QKeyEvent>
namespace ost { namespace img { namespace gui {
// fw decl
diff --git a/modules/gui/src/data_viewer/overlay_manager.hh b/modules/gui/src/data_viewer/overlay_manager.hh
index 033d78663..cef91ac91 100644
--- a/modules/gui/src/data_viewer/overlay_manager.hh
+++ b/modules/gui/src/data_viewer/overlay_manager.hh
@@ -28,9 +28,6 @@
#include <vector>
#include <list>
-#include <QWidget>
-#include <QPainter>
-#include <QEvent>
#include <ost/base.hh>
@@ -41,6 +38,9 @@
#include "overlay_manager_fw.hh"
#include "overlay_manager_observer.hh"
+#include <QWidget>
+#include <QPainter>
+#include <QEvent>
namespace ost { namespace img { namespace gui {
class DataViewerPanel;
diff --git a/modules/gui/src/data_viewer/overlay_manager_gui.cc b/modules/gui/src/data_viewer/overlay_manager_gui.cc
index c947d50cd..1944c42f6 100644
--- a/modules/gui/src/data_viewer/overlay_manager_gui.cc
+++ b/modules/gui/src/data_viewer/overlay_manager_gui.cc
@@ -22,7 +22,6 @@
Authors: Ansgar Philippsen, Andreas Schenk
*/
-#include <QScrollArea>
#include <ost/message.hh>
@@ -30,6 +29,7 @@
#include "overlay_manager.hh"
#include "overlay.hh"
+#include <QScrollArea>
namespace ost { namespace img { namespace gui {
////////////////////////////
diff --git a/modules/gui/src/data_viewer/overlay_manager_gui.hh b/modules/gui/src/data_viewer/overlay_manager_gui.hh
index b12adca5a..a601832e0 100644
--- a/modules/gui/src/data_viewer/overlay_manager_gui.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_gui.hh
@@ -26,6 +26,11 @@
#ifndef IMG_OV_GUI_OVDIALOG_H
#define IMG_OV_GUI_OVDIALOG_H
+
+#include <vector>
+#include <map>
+#include "overlay_manager_observer.hh"
+
#include <QWidget>
#include <QRadioButton>
#include <QCheckBox>
@@ -34,11 +39,6 @@
#include <QLabel>
#include <QPushButton>
#include <QButtonGroup>
-
-#include <vector>
-#include <map>
-#include "overlay_manager_observer.hh"
-
namespace ost { namespace img { namespace gui {
class OverlayCustomActCheckBox: public QRadioButton
diff --git a/modules/gui/src/data_viewer/pointlist_overlay_base.cc b/modules/gui/src/data_viewer/pointlist_overlay_base.cc
index 65b0e3a32..13392d28d 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay_base.cc
+++ b/modules/gui/src/data_viewer/pointlist_overlay_base.cc
@@ -21,6 +21,9 @@
/*
Authors: Ansgar Philippsen, Andreas Schenk
*/
+#include "data_viewer_panel.hh"
+#include "pointlist_overlay_base.hh"
+#include "strategies.hh"
#include <QActionGroup>
#include <QGridLayout>
@@ -33,9 +36,6 @@
#include <QIcon>
#include <QColorDialog>
-#include "data_viewer_panel.hh"
-#include "pointlist_overlay_base.hh"
-#include "strategies.hh"
namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/data_viewer/pointlist_overlay_base.hh b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
index d80c1d879..3c0f709d8 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay_base.hh
+++ b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
@@ -26,13 +26,6 @@
#ifndef IMG_POINTLIST_OVERLAY_BASE_HH
#define IMG_POINTLIST_OVERLAY_BASE_HH
-#include <QColor>
-#include <QAction>
-#include <QDialog>
-#include <QLineEdit>
-#include <QColorDialog>
-#include <QPushButton>
-#include <QVBoxLayout>
#include <ost/img/point.hh>
@@ -43,6 +36,13 @@
#include "strategies_fw.hh"
+#include <QColor>
+#include <QAction>
+#include <QDialog>
+#include <QLineEdit>
+#include <QColorDialog>
+#include <QPushButton>
+#include <QVBoxLayout>
namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/data_viewer/strategies.hh b/modules/gui/src/data_viewer/strategies.hh
index a6abb3d38..0989492c8 100644
--- a/modules/gui/src/data_viewer/strategies.hh
+++ b/modules/gui/src/data_viewer/strategies.hh
@@ -25,16 +25,16 @@
#ifndef IMG_GUI_STRATEGIES_HH_
#define IMG_GUI_STRATEGIES_HH_
-#include <QPainter>
-#include <QPoint>
-#include <QColor>
-#include <QPen>
-#include <QBrush>
#include <ost/geom/geom.hh>
#include "strategies_fw.hh"
+#include <QPainter>
+#include <QPoint>
+#include <QColor>
+#include <QPen>
+#include <QBrush>
namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/dock_widget.hh b/modules/gui/src/dock_widget.hh
index eefecd21d..6668b50aa 100644
--- a/modules/gui/src/dock_widget.hh
+++ b/modules/gui/src/dock_widget.hh
@@ -25,10 +25,10 @@
#ifndef OST_GUI_DOCK_WIDGET_HH
#define OST_GUI_DOCK_WIDGET_HH
-#include <QDockWidget>
#include <ost/gui/module_config.hh>
+#include <QDockWidget>
namespace ost { namespace gui {
class DLLEXPORT_OST_GUI DockWidget: public QDockWidget
diff --git a/modules/gui/src/entity_explorer/entity_explorer_model.hh b/modules/gui/src/entity_explorer/entity_explorer_model.hh
index 515457942..8071a7c87 100644
--- a/modules/gui/src/entity_explorer/entity_explorer_model.hh
+++ b/modules/gui/src/entity_explorer/entity_explorer_model.hh
@@ -24,11 +24,11 @@
#include <ost/gfx/scene_observer.hh>
#include <ost/gfx/gfx_object.hh>
+#include <ost/gui/module_config.hh>
// Qt includes must come last
#include <QAbstractItemModel>
-#include <ost/gui/module_config.hh>
namespace ost { namespace gui {
diff --git a/modules/gui/src/file_browser.cc b/modules/gui/src/file_browser.cc
index 3510e95e5..ca7092684 100644
--- a/modules/gui/src/file_browser.cc
+++ b/modules/gui/src/file_browser.cc
@@ -16,14 +16,8 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QCoreApplication>
-#include <QCursor>
-#include <QVBoxLayout>
-#include <QDesktopServices>
-#include <QDir>
-#include <QFileInfo>
-#include <QUrl>
+#include <ost/gui/gosty_app.hh>
#include <ost/platform.hh>
#include <ost/config.hh>
#include <ost/mol/mol.hh>
@@ -35,7 +29,6 @@
#include <ost/gfx/entity.hh>
#include <ost/gfx/scene.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/perspective.hh>
#include <ost/gui/panels/panel_manager.hh>
#include <ost/gui/file_loader.hh>
@@ -52,6 +45,14 @@
#include "widget_registry.hh"
#include "file_browser.hh"
+#include <QCoreApplication>
+#include <QCursor>
+#include <QVBoxLayout>
+#include <QDesktopServices>
+#include <QDir>
+#include <QFileInfo>
+#include <QUrl>
+
namespace ost { namespace gui {
FileBrowser::FileBrowser(QWidget* parent):
diff --git a/modules/gui/src/file_browser.hh b/modules/gui/src/file_browser.hh
index fadaf69a9..902291746 100644
--- a/modules/gui/src/file_browser.hh
+++ b/modules/gui/src/file_browser.hh
@@ -19,14 +19,14 @@
#ifndef OST_GUI_FILE_BROWSER_HH
#define OST_GUI_FILE_BROWSER_HH
-#include <QDirModel>
-#include <QListView>
-#include <QComboBox>
#include <ost/gfx/gfx_object.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
+#include <QDirModel>
+#include <QListView>
+#include <QComboBox>
namespace ost { namespace gui {
diff --git a/modules/gui/src/file_loader.cc b/modules/gui/src/file_loader.cc
index d7061b3eb..6f56900d3 100644
--- a/modules/gui/src/file_loader.cc
+++ b/modules/gui/src/file_loader.cc
@@ -16,16 +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 "file_loader.hh"
-#include <QDir>
-#include <QAction>
-#include <QMenu>
-#include <QFileInfo>
-#include <QMessageBox>
-#include <QMenuBar>
-
-
#include <ost/config.hh>
#include <ost/mol/mol.hh>
#include <ost/mol/surface.hh>
@@ -45,7 +38,6 @@
#include <ost/gfx/surface.hh>
#include <ost/gfx/scene.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/perspective.hh>
#include <ost/gui/python_shell/python_interpreter.hh>
#include <ost/gui/main_area.hh>
@@ -58,6 +50,12 @@
#include <ost/img/extent.hh>
#endif
+#include <QDir>
+#include <QAction>
+#include <QMenu>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QMenuBar>
namespace ost { namespace gui {
LoaderManagerPtr FileLoader::loader_manager_ = LoaderManagerPtr();
diff --git a/modules/gui/src/file_loader.hh b/modules/gui/src/file_loader.hh
index 26d77cd49..c9f7fbc53 100644
--- a/modules/gui/src/file_loader.hh
+++ b/modules/gui/src/file_loader.hh
@@ -20,9 +20,6 @@
#define OST_GUI_FILE_LOADER_HH
#include <vector>
-#include <QString>
-#include <QList>
-#include <QMap>
#include <ost/gfx/gfx_object.hh>
@@ -38,6 +35,9 @@
#include <ost/io/map_io_handler.hh>
#endif
+#include <QString>
+#include <QList>
+#include <QMap>
namespace ost { namespace gui {
class DLLEXPORT_OST_GUI FileLoader {
diff --git a/modules/gui/src/file_type_dialog.cc b/modules/gui/src/file_type_dialog.cc
index 320e10186..caf11bc83 100644
--- a/modules/gui/src/file_type_dialog.cc
+++ b/modules/gui/src/file_type_dialog.cc
@@ -18,15 +18,15 @@
//------------------------------------------------------------------------------
#include "file_type_dialog.hh"
+
+#include <ost/io/io_manager.hh>
+#include <ost/io/io_exception.hh>
+
#include <QPushButton>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QTableWidgetItem>
#include <QHeaderView>
-
-#include <ost/io/io_manager.hh>
-#include <ost/io/io_exception.hh>
-
namespace ost { namespace gui {
FileTypeDialog::FileTypeDialog(const QString& file_name, QWidget* parent):
diff --git a/modules/gui/src/file_type_dialog.hh b/modules/gui/src/file_type_dialog.hh
index b0d6e4433..2ce157556 100644
--- a/modules/gui/src/file_type_dialog.hh
+++ b/modules/gui/src/file_type_dialog.hh
@@ -26,9 +26,6 @@
#include <ost/gui/module_config.hh>
-#include <QDialog>
-#include <QTableWidget>
-#include <QLabel>
#include <ost/io/entity_io_handler.hh>
#include <ost/io/sequence_io_handler.hh>
@@ -37,6 +34,10 @@
#include <ost/io/map_io_handler.hh>
#endif
+#include <QDialog>
+#include <QTableWidget>
+#include <QLabel>
+
namespace ost { namespace gui {
/// \brief dialog to select a file type
diff --git a/modules/gui/src/file_viewer.cc b/modules/gui/src/file_viewer.cc
index f9ba0153e..4d284702e 100644
--- a/modules/gui/src/file_viewer.cc
+++ b/modules/gui/src/file_viewer.cc
@@ -16,12 +16,12 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QtGui>
#include <ost/gui/python_shell/python_syntax_highlighter.hh>
#include "file_viewer.hh"
+#include <QtGui>
namespace ost { namespace gui {
FileViewer::FileViewer(const QString& path, QWidget* parent):
diff --git a/modules/gui/src/file_viewer.hh b/modules/gui/src/file_viewer.hh
index 2896d2b10..48f927a5c 100644
--- a/modules/gui/src/file_viewer.hh
+++ b/modules/gui/src/file_viewer.hh
@@ -19,12 +19,12 @@
#ifndef OST_GUI_FILE_VIEWER_HH
#define OST_GUI_FILE_VIEWER_HH
-#include <QMainWindow>
-#include <QSyntaxHighlighter>
-#include <QTextEdit>
#include <ost/gui/module_config.hh>
+#include <QMainWindow>
+#include <QSyntaxHighlighter>
+#include <QTextEdit>
namespace ost { namespace gui {
/// \brief a simplistic file viewer
diff --git a/modules/gui/src/gl_canvas.cc b/modules/gui/src/gl_canvas.cc
index 320cc3d0f..2b7d93f1f 100644
--- a/modules/gui/src/gl_canvas.cc
+++ b/modules/gui/src/gl_canvas.cc
@@ -20,26 +20,26 @@
#include <sys/time.h>
#endif
+#include <ost/gui/python_shell/python_interpreter.hh>
#include "gl_canvas.hh"
#include "gl_win.hh"
#include <ost/log.hh>
#include <ost/dyn_cast.hh>
#include <ost/mol/view_op.hh>
-#include <ost/gfx/scene.hh>
-#include <ost/gfx/entity.hh>
#include <ost/seq/alignment_handle.hh>
-#include <ost/gui/python_shell/python_interpreter.hh>
-#include "tools/tool_manager.hh"
+#include <ost/gfx/scene.hh>
+#include <ost/gfx/entity.hh>
#include <QTimer>
#include <QStatusBar>
#include <QApplication>
#include <QClipboard>
#include <QMenu>
+#include "tools/tool_manager.hh"
namespace ost { namespace gui {
diff --git a/modules/gui/src/gl_canvas.hh b/modules/gui/src/gl_canvas.hh
index 631aa624d..82e25436c 100644
--- a/modules/gui/src/gl_canvas.hh
+++ b/modules/gui/src/gl_canvas.hh
@@ -19,21 +19,21 @@
#ifndef OST_GUI_GL_CANVAS_HH
#define OST_GUI_GL_CANVAS_HH
-#include <ost/gfx/glwin_base.hh>
-#include <ost/gfx/input.hh>
// must come before QGLWidget
#include <ost/mol/mol.hh>
-#include <ost/gfx/gfx_object_fw.hh>
-#include <ost/gui/tools/tool.hh>
-#include <ost/gui/scene_menu.hh>
// Qt includes must come last
#include <QGLWidget>
#include <QTime>
#include <QBasicTimer>
#include <QMouseEvent>
+#include <ost/gui/tools/tool.hh>
+#include <ost/gui/scene_menu.hh>
+#include <ost/gfx/glwin_base.hh>
+#include <ost/gfx/input.hh>
+#include <ost/gfx/gfx_object_fw.hh>
class QMenu;
diff --git a/modules/gui/src/gl_win.cc b/modules/gui/src/gl_win.cc
index 693a9197a..15c892846 100644
--- a/modules/gui/src/gl_win.cc
+++ b/modules/gui/src/gl_win.cc
@@ -16,6 +16,7 @@
// 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/log.hh>
#include <ost/config.hh>
#include <ost/gfx/scene.hh>
@@ -25,7 +26,6 @@
#include <ost/gui/tools/selection_tool.hh>
#include <ost/gui/tools/manipulator.hh>
#include <ost/gui/tools/measure_tool.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/perspective.hh>
#if OST_IMG_ENABLED
diff --git a/modules/gui/src/gl_win.hh b/modules/gui/src/gl_win.hh
index c5d0efb2d..d634e37f4 100644
--- a/modules/gui/src/gl_win.hh
+++ b/modules/gui/src/gl_win.hh
@@ -19,11 +19,6 @@
#ifndef OST_GUI_GL_WIN_HH
#define OST_GUI_GL_WIN_HH
-#include <QMainWindow>
-#include <QAction>
-
-#include <QActionGroup>
-#include <QStatusBar>
#include <ost/gfx/scene_observer.hh>
@@ -34,6 +29,12 @@
#include <ost/gui/tools/tool.hh>
#include <ost/gui/tools/tool_bar.hh>
+#include <QMainWindow>
+#include <QAction>
+
+#include <QActionGroup>
+#include <QStatusBar>
+
/*
Authors: Ansgar Philippsen, Marco Biasini
*/
diff --git a/modules/gui/src/gosty.cc b/modules/gui/src/gosty.cc
index d8ce0bc86..8409eecd5 100644
--- a/modules/gui/src/gosty.cc
+++ b/modules/gui/src/gosty.cc
@@ -23,8 +23,6 @@
#include <sstream>
#include <ctime>
-#include <QDir>
-#include <QTimer>
#include <ost/gui/module_config.hh>
#include <ost/log.hh>
#include <ost/platform.hh>
@@ -39,6 +37,8 @@
#include <QApplication>
#include <QResource>
#include <QFileInfo>
+#include <QDir>
+#include <QTimer>
using namespace ost;
using namespace ost::gui;
diff --git a/modules/gui/src/gosty.hh b/modules/gui/src/gosty.hh
index 6f2b6bd56..fe1d881f9 100644
--- a/modules/gui/src/gosty.hh
+++ b/modules/gui/src/gosty.hh
@@ -19,10 +19,10 @@
#ifndef OST_GUI_GOSTY_HH
#define OST_GUI_GOSTY_HH
-#include <QObject>
#include <ost/gui/module_config.hh>
+#include <QObject>
namespace ost { namespace gui { namespace detail {
/// \brief helper class for delayed script execution
diff --git a/modules/gui/src/gosty_app.cc b/modules/gui/src/gosty_app.cc
index 4a05387b9..f162d57ff 100644
--- a/modules/gui/src/gosty_app.cc
+++ b/modules/gui/src/gosty_app.cc
@@ -16,13 +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 "gosty_app.hh"
#include <iostream>
-#include <QApplication>
-#include <QMainWindow>
-
-#include <QMenuBar>
-#include <QDesktopWidget>
#include <ost/gui/python_shell/python_shell.hh>
#include <ost/gui/gl_win.hh>
@@ -30,8 +26,12 @@
#include <ost/gui/perspective.hh>
#include <ost/gui/main_area.hh>
-#include "gosty_app.hh"
+#include <QApplication>
+#include <QMainWindow>
+
+#include <QMenuBar>
+#include <QDesktopWidget>
/*
Author: Marco Biasini, Andreas Schenk, Stefan Scheuber
*/
diff --git a/modules/gui/src/gosty_app.hh b/modules/gui/src/gosty_app.hh
index d3acd17af..fd9b9d223 100644
--- a/modules/gui/src/gosty_app.hh
+++ b/modules/gui/src/gosty_app.hh
@@ -23,9 +23,6 @@
Author: Marco Biasini, Andreas Schenk
*/
-#include <QObject>
-#include <QString>
-#include <QMap>
#include <ost/config.hh>
#include <ost/gui/module_config.hh>
@@ -40,6 +37,9 @@
#endif
+#include <QObject>
+#include <QString>
+#include <QMap>
class QMainWindow;
diff --git a/modules/gui/src/input/spnav_input.hh b/modules/gui/src/input/spnav_input.hh
index 776fd5de4..557934967 100644
--- a/modules/gui/src/input/spnav_input.hh
+++ b/modules/gui/src/input/spnav_input.hh
@@ -23,12 +23,12 @@
#ifndef OST_GUI_SPNAV_INPUT_HH
#define OST_GUI_SPNAV_INPUT_HH
-#include <QThread>
-#include <QMetaType>
#include <ost/geom/geom.hh>
#include <ost/gui/module_config.hh>
+#include <QThread>
+#include <QMetaType>
Q_DECLARE_METATYPE(geom::Mat4);
namespace ost { namespace gui {
diff --git a/modules/gui/src/loader_manager.cc b/modules/gui/src/loader_manager.cc
index 7ea2f661c..30a80a7a8 100644
--- a/modules/gui/src/loader_manager.cc
+++ b/modules/gui/src/loader_manager.cc
@@ -16,7 +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 <ost/gui/gosty_app.hh>
#include "loader_manager.hh"
+
+#include <ost/gui/perspective.hh>
#include <QDir>
#include <QAction>
#include <QMenu>
@@ -24,9 +27,6 @@
#include <QMessageBox>
#include <QMenuBar>
-#include <ost/gui/gosty_app.hh>
-#include <ost/gui/perspective.hh>
-
namespace ost { namespace gui {
diff --git a/modules/gui/src/main.cc b/modules/gui/src/main.cc
index 9e6df4405..ba2dc6f3c 100644
--- a/modules/gui/src/main.cc
+++ b/modules/gui/src/main.cc
@@ -16,10 +16,21 @@
// 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 "main.hh"
#include <sstream>
+
+#include <ost/log.hh>
+#include <ost/gui/python_shell/python_shell.hh>
+#include <ost/gui/file_loader.hh>
+
+#include "gl_win.hh"
+//#include "entity_explorer/entity_explorer.hh"
+#include "tools/tool_options_win.hh"
+
+
#include <QApplication>
#include <QDesktopWidget>
#include <QAction>
@@ -34,19 +45,6 @@
#include <QDragEnterEvent>
#include <QList>
#include <QUrl>
-
-#include <ost/log.hh>
-#include <ost/gui/python_shell/python_shell.hh>
-#include <ost/gui/gosty_app.hh>
-#include <ost/gui/file_loader.hh>
-
-#include "gl_win.hh"
-//#include "entity_explorer/entity_explorer.hh"
-#include "tools/tool_options_win.hh"
-#include "plot_viewer/plot_viewer_proxy.hh"
-#include "plot_viewer/plot_viewer.hh"
-
-
//#include "xpm/ost_small.xpm"
namespace ost { namespace gui {
diff --git a/modules/gui/src/main.hh b/modules/gui/src/main.hh
index 8d718cfe4..67f204518 100644
--- a/modules/gui/src/main.hh
+++ b/modules/gui/src/main.hh
@@ -27,7 +27,6 @@
#include "widget_state_saver.hh"
-#include "plot_viewer/plot_viewer_proxy_fw.hh"
// Qt headers must come last
#include <QMainWindow>
diff --git a/modules/gui/src/main_area.cc b/modules/gui/src/main_area.cc
index 38717e46d..82ced876c 100644
--- a/modules/gui/src/main_area.cc
+++ b/modules/gui/src/main_area.cc
@@ -17,12 +17,12 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
#include <cassert>
-#include <QMdiSubWindow>
-#include <QSettings>
#include <ost/gui/widget_geom_handler.hh>
#include "main_area.hh"
+#include <QMdiSubWindow>
+#include <QSettings>
/*
Author: Marco Biasini
*/
diff --git a/modules/gui/src/main_area.hh b/modules/gui/src/main_area.hh
index 9616340b0..535b7465d 100644
--- a/modules/gui/src/main_area.hh
+++ b/modules/gui/src/main_area.hh
@@ -19,10 +19,10 @@
#ifndef OST_GUI_MAIN_AREA_HH
#define OST_GUI_MAIN_AREA_HH
-#include <QMdiArea>
#include <ost/gui/module_config.hh>
+#include <QMdiArea>
/*
Author: Marco Biasini
*/
diff --git a/modules/gui/src/main_window.hh b/modules/gui/src/main_window.hh
index 3d34956b2..4f0796e29 100644
--- a/modules/gui/src/main_window.hh
+++ b/modules/gui/src/main_window.hh
@@ -27,13 +27,13 @@
#include <map>
-#include <QMainWindow>
-#include <QMenu>
#include <ost/base.hh>
#include <ost/gui/module_config.hh>
+#include <QMainWindow>
+#include <QMenu>
namespace ost { namespace gui {
diff --git a/modules/gui/src/messages/log_reader.hh b/modules/gui/src/messages/log_reader.hh
index cd16ca3b4..e64565117 100644
--- a/modules/gui/src/messages/log_reader.hh
+++ b/modules/gui/src/messages/log_reader.hh
@@ -19,14 +19,14 @@
#ifndef OST_GUI_MESSAGES_LOG_READER_HH
#define OST_GUI_MESSAGES_LOG_READER_HH
-#include <QObject>
-#include <QMap>
-#include <QMessageBox>
#include <ost/log_sink.hh>
#include <ost/gui/module_config.hh>
+#include <QObject>
+#include <QMap>
+#include <QMessageBox>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/messages/message_box_widget.cc b/modules/gui/src/messages/message_box_widget.cc
index 6d6f5b4e1..1be4b817c 100644
--- a/modules/gui/src/messages/message_box_widget.cc
+++ b/modules/gui/src/messages/message_box_widget.cc
@@ -19,14 +19,10 @@
/*
Author: Stefan Scheuber
*/
-#include <QDir>
-#include <QLabel>
-#include <QMenu>
-#include <QVBoxLayout>
+#include <ost/gui/gosty_app.hh>
#include <ost/platform.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/perspective.hh>
#include <ost/gui/widget_registry.hh>
@@ -35,6 +31,10 @@
#include "log_reader.hh"
#include "message_box_widget.hh"
+#include <QDir>
+#include <QLabel>
+#include <QMenu>
+#include <QVBoxLayout>
namespace ost {namespace gui {
MessageLevel::MessageLevel(QPixmap icon, QWidget* parent): QWidget(parent), message_count_(0), count_label_(new QLabel(QString::number(message_count_)+" ",this)){
diff --git a/modules/gui/src/messages/message_box_widget.hh b/modules/gui/src/messages/message_box_widget.hh
index fbd5c9545..5088397d0 100644
--- a/modules/gui/src/messages/message_box_widget.hh
+++ b/modules/gui/src/messages/message_box_widget.hh
@@ -19,12 +19,12 @@
#ifndef OST_GUI_MESSAGES_BOX_MESSAGE_WIDGET_HH
#define OST_GUI_MESSAGES_BOX_MESSAGE_WIDGET_HH
-#include <QWidget>
-#include <QMap>
-#include <QMessageBox>
#include <ost/gui/module_config.hh>
+#include <QWidget>
+#include <QMap>
+#include <QMessageBox>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/messages/message_widget.cc b/modules/gui/src/messages/message_widget.cc
index 5e4363397..8a87b06c7 100644
--- a/modules/gui/src/messages/message_widget.cc
+++ b/modules/gui/src/messages/message_widget.cc
@@ -19,19 +19,20 @@
/*
Author: Stefan Scheuber
*/
-#include <QApplication>
-#include <QDir>
-#include <QMenu>
-#include <QVBoxLayout>
+#include <ost/gui/gosty_app.hh>
#include <ost/platform.hh>
#include <ost/gui/widget_registry.hh>
-#include <ost/gui/gosty_app.hh>
#include "log_reader.hh"
#include "message_widget.hh"
+#include <QApplication>
+#include <QDir>
+#include <QMenu>
+#include <QVBoxLayout>
+
namespace ost {namespace gui {
class MessageWidgetFactory: public WidgetFactory {
diff --git a/modules/gui/src/messages/message_widget.hh b/modules/gui/src/messages/message_widget.hh
index 3aae2a378..f126e0929 100644
--- a/modules/gui/src/messages/message_widget.hh
+++ b/modules/gui/src/messages/message_widget.hh
@@ -19,13 +19,14 @@
#ifndef OST_GUI_MESSAGES_MESSAGE_WIDGET_HH
#define OST_GUI_MESSAGES_MESSAGE_WIDGET_HH
-#include <QListView>
-#include <QMessageBox>
-#include <QStandardItemModel>
#include <ost/gui/widget.hh>
#include <ost/gui/module_config.hh>
+#include <QListView>
+#include <QMessageBox>
+#include <QStandardItemModel>
+
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/panels/bottom_bar.cc b/modules/gui/src/panels/bottom_bar.cc
index e5bf3a423..f3b643aec 100644
--- a/modules/gui/src/panels/bottom_bar.cc
+++ b/modules/gui/src/panels/bottom_bar.cc
@@ -17,13 +17,13 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QAction>
#include "bottom_bar.hh"
#include "splitter_panel_bar.hh"
#include "tabbed_panel_bar.hh"
+#include <QAction>
namespace ost { namespace gui {
BottomBar::BottomBar(QWidget* parent):
diff --git a/modules/gui/src/panels/button_bar.hh b/modules/gui/src/panels/button_bar.hh
index 578769349..ab36d0570 100644
--- a/modules/gui/src/panels/button_bar.hh
+++ b/modules/gui/src/panels/button_bar.hh
@@ -19,10 +19,6 @@
#ifndef OST_GUI_BOTTOM_BAR_BUTTON_BAR
#define OST_GUI_BOTTOM_BAR_BUTTON_BAR
-#include <QWidget>
-#include <QString>
-#include <QHBoxLayout>
-#include <QList>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
@@ -30,6 +26,10 @@
#include "button_box.hh"
#include "event_button.hh"
+#include <QWidget>
+#include <QString>
+#include <QHBoxLayout>
+#include <QList>
namespace ost { namespace gui {
/// \brief button box
diff --git a/modules/gui/src/panels/button_box.hh b/modules/gui/src/panels/button_box.hh
index a04931aa6..f6525e609 100644
--- a/modules/gui/src/panels/button_box.hh
+++ b/modules/gui/src/panels/button_box.hh
@@ -19,17 +19,17 @@
#ifndef OST_GUI_BOTTOM_BAR_BUTTON_BOX
#define OST_GUI_BOTTOM_BAR_BUTTON_BOX
-#include <QWidget>
-#include <QString>
-#include <QGridLayout>
-#include <QList>
-#include <QLabel>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
#include "event_button.hh"
+#include <QWidget>
+#include <QString>
+#include <QGridLayout>
+#include <QList>
+#include <QLabel>
namespace ost { namespace gui {
/// \brief button box
diff --git a/modules/gui/src/panels/drop_box.cc b/modules/gui/src/panels/drop_box.cc
index a65dfa2c5..149e0a1a4 100644
--- a/modules/gui/src/panels/drop_box.cc
+++ b/modules/gui/src/panels/drop_box.cc
@@ -17,11 +17,11 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QHBoxLayout>
-#include <QLabel>
#include "drop_box.hh"
+#include <QHBoxLayout>
+#include <QLabel>
namespace ost { namespace gui {
DropBox::DropBox(QWidget* parent):
diff --git a/modules/gui/src/panels/event_button.hh b/modules/gui/src/panels/event_button.hh
index f1c6d034f..0063e5d11 100644
--- a/modules/gui/src/panels/event_button.hh
+++ b/modules/gui/src/panels/event_button.hh
@@ -19,16 +19,16 @@
#ifndef OST_GUI_BOTTOM_BAR_EVENT_BUTTON
#define OST_GUI_BOTTOM_BAR_EVENT_BUTTON
+
+#include <ost/gui/module_config.hh>
+#include <ost/gui/widget.hh>
+
#include <QToolButton>
#include <QMouseEvent>
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QWidget>
#include <QString>
-
-#include <ost/gui/module_config.hh>
-#include <ost/gui/widget.hh>
-
namespace ost { namespace gui {
/// \brief button box
diff --git a/modules/gui/src/panels/panel_bar.cc b/modules/gui/src/panels/panel_bar.cc
index d4e5145eb..291acc925 100644
--- a/modules/gui/src/panels/panel_bar.cc
+++ b/modules/gui/src/panels/panel_bar.cc
@@ -17,8 +17,6 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QSettings>
-#include <QVariant>
#include <ost/gui/gosty_app.hh>
#include <ost/gui/perspective.hh>
@@ -31,6 +29,8 @@
#include "splitter_panel_bar.hh"
#include "tabbed_panel_bar.hh"
+#include <QSettings>
+#include <QVariant>
namespace ost {
namespace gui {
diff --git a/modules/gui/src/panels/panel_bar.hh b/modules/gui/src/panels/panel_bar.hh
index 277d42078..ecf930b1c 100644
--- a/modules/gui/src/panels/panel_bar.hh
+++ b/modules/gui/src/panels/panel_bar.hh
@@ -19,11 +19,6 @@
#ifndef OST_GUI_PANEL_BAR_PANEL_BAR
#define OST_GUI_PANEL_BAR_PANEL_BAR
-#include <QStackedLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
-#include <QActionGroup>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget_pool.hh>
@@ -33,6 +28,11 @@
#include "button_box.hh"
+#include <QStackedLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
+#include <QActionGroup>
namespace ost { namespace gui {
class PanelWidgetContainer;
diff --git a/modules/gui/src/panels/panel_bar_widget_holder.cc b/modules/gui/src/panels/panel_bar_widget_holder.cc
index 523aba3ce..02fc9d181 100644
--- a/modules/gui/src/panels/panel_bar_widget_holder.cc
+++ b/modules/gui/src/panels/panel_bar_widget_holder.cc
@@ -18,6 +18,18 @@
//------------------------------------------------------------------------------
#include <cassert>
+
+#include <ost/gui/gosty_app.hh>
+#include <ost/platform.hh>
+
+#include <ost/gui/widget.hh>
+#include <ost/gui/widget_registry.hh>
+#include <ost/gui/perspective.hh>
+
+#include "panel_manager.hh"
+#include "panel_bar.hh"
+#include "panel_bar_widget_holder.hh"
+
#include <QApplication>
#include <QMenu>
#include <QHBoxLayout>
@@ -30,18 +42,6 @@
#include <QAction>
#include <QComboBox>
#include <QDebug>
-
-#include <ost/platform.hh>
-
-#include <ost/gui/widget.hh>
-#include <ost/gui/widget_registry.hh>
-#include <ost/gui/gosty_app.hh>
-#include <ost/gui/perspective.hh>
-
-#include "panel_manager.hh"
-#include "panel_bar.hh"
-#include "panel_bar_widget_holder.hh"
-
/*
Author: Marco Biasini, Stefan Scheuber
*/
diff --git a/modules/gui/src/panels/panel_bar_widget_holder.hh b/modules/gui/src/panels/panel_bar_widget_holder.hh
index e06d6ccec..0b3aca1e8 100644
--- a/modules/gui/src/panels/panel_bar_widget_holder.hh
+++ b/modules/gui/src/panels/panel_bar_widget_holder.hh
@@ -19,13 +19,13 @@
#ifndef OST_GUI_PANEL_BAR_WIDGET_HOLDER_HH
#define OST_GUI_PANEL_BAR_WIDGET_HOLDER_HH
-#include <QWidget>
-#include <QMouseEvent>
#include <ost/gui/module_config.hh>
#include "panel_bar.hh"
+#include <QWidget>
+#include <QMouseEvent>
class QToolBar;
class QAction;
diff --git a/modules/gui/src/panels/panel_manager.cc b/modules/gui/src/panels/panel_manager.cc
index 695890c28..5a5e3cf6c 100644
--- a/modules/gui/src/panels/panel_manager.cc
+++ b/modules/gui/src/panels/panel_manager.cc
@@ -17,9 +17,6 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QSettings>
-#include <QMenu>
-#include <QDebug>
#include <ost/gui/widget_registry.hh>
@@ -29,6 +26,9 @@
#include "tabbed_panel_bar.hh"
#include "splitter_panel_bar.hh"
+#include <QSettings>
+#include <QMenu>
+#include <QDebug>
namespace ost { namespace gui {
class ExternalWidgetFactory: public WidgetFactory {
diff --git a/modules/gui/src/panels/panel_manager.hh b/modules/gui/src/panels/panel_manager.hh
index 23edf3ecf..d4d505517 100644
--- a/modules/gui/src/panels/panel_manager.hh
+++ b/modules/gui/src/panels/panel_manager.hh
@@ -19,11 +19,6 @@
#ifndef OST_GUI_PANEL_BAR_PANEL_MANAGER
#define OST_GUI_PANEL_BAR_PANEL_MANAGER
-#include <QWidget>
-#include <QString>
-#include <QList>
-#include <QMenu>
-#include <QDragEnterEvent>
#include <ost/gui/widget.hh>
#include <ost/gui/widget_pool.hh>
@@ -32,6 +27,11 @@
#include "panel_widget_container.hh"
#include "button_box.hh"
+#include <QWidget>
+#include <QString>
+#include <QList>
+#include <QMenu>
+#include <QDragEnterEvent>
namespace ost { namespace gui {
enum PanelPosition
diff --git a/modules/gui/src/panels/panel_widget_container.hh b/modules/gui/src/panels/panel_widget_container.hh
index ead27c6eb..e46ae5044 100644
--- a/modules/gui/src/panels/panel_widget_container.hh
+++ b/modules/gui/src/panels/panel_widget_container.hh
@@ -19,17 +19,17 @@
#ifndef OST_GUI_PANEL_BAR_PANEL_WIDGET_CONTAINER
#define OST_GUI_PANEL_BAR_PANEL_WIDGET_CONTAINER
-#include <QHBoxLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
-#include <QMap>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
#include "panel_bar.hh"
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
+#include <QMap>
namespace ost { namespace gui {
/// \brief A PanelWidgetContainer can display various widgets
diff --git a/modules/gui/src/panels/side_bar.cc b/modules/gui/src/panels/side_bar.cc
index 425a8bb37..460e8a564 100644
--- a/modules/gui/src/panels/side_bar.cc
+++ b/modules/gui/src/panels/side_bar.cc
@@ -17,13 +17,13 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QAction>
#include "side_bar.hh"
#include "splitter_panel_bar.hh"
#include "tabbed_panel_bar.hh"
+#include <QAction>
namespace ost { namespace gui {
SideBar::SideBar(QWidget* parent):
diff --git a/modules/gui/src/panels/splitter_panel_bar.cc b/modules/gui/src/panels/splitter_panel_bar.cc
index 480d9780e..bfd59c594 100644
--- a/modules/gui/src/panels/splitter_panel_bar.cc
+++ b/modules/gui/src/panels/splitter_panel_bar.cc
@@ -17,14 +17,14 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QSettings>
-
-#include <QPalette>
#include <ost/gui/widget_registry.hh>
#include "panel_widget_container.hh"
#include "splitter_panel_bar.hh"
+#include <QSettings>
+
+#include <QPalette>
namespace ost { namespace gui {
SplitterPanelBar::SplitterPanelBar(PanelBar* parent,Qt::Orientation orientation):
diff --git a/modules/gui/src/panels/splitter_panel_bar.hh b/modules/gui/src/panels/splitter_panel_bar.hh
index e8d6ae256..b283c9cbf 100644
--- a/modules/gui/src/panels/splitter_panel_bar.hh
+++ b/modules/gui/src/panels/splitter_panel_bar.hh
@@ -19,10 +19,6 @@
#ifndef OST_GUI_SPLITTER_PANEL_BAR
#define OST_GUI_SPLITTER_PANEL_BAR
-#include <QHBoxLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget_pool.hh>
@@ -32,6 +28,10 @@
#include "panel_widget_container.hh"
#include "panel_bar_widget_holder.hh"
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
namespace ost { namespace gui {
/// \brief bottom Bar
diff --git a/modules/gui/src/panels/tabbed_panel_bar.cc b/modules/gui/src/panels/tabbed_panel_bar.cc
index 3535372e0..36ec6e2bc 100644
--- a/modules/gui/src/panels/tabbed_panel_bar.cc
+++ b/modules/gui/src/panels/tabbed_panel_bar.cc
@@ -17,9 +17,6 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QApplication>
-#include <QSettings>
-#include <QDir>
#include <ost/gui/gosty_app.hh>
#include <ost/gui/perspective.hh>
@@ -27,6 +24,9 @@
#include "tabbed_panel_bar.hh"
+#include <QApplication>
+#include <QSettings>
+#include <QDir>
namespace ost { namespace gui {
TabbedPanelBar::TabbedPanelBar(PanelBar* parent):
diff --git a/modules/gui/src/panels/tabbed_panel_bar.hh b/modules/gui/src/panels/tabbed_panel_bar.hh
index 167b4d4a3..78fb2ab40 100644
--- a/modules/gui/src/panels/tabbed_panel_bar.hh
+++ b/modules/gui/src/panels/tabbed_panel_bar.hh
@@ -19,13 +19,6 @@
#ifndef OST_GUI_TABBED_PANEL_BAR
#define OST_GUI_TABBED_PANEL_BAR
-#include <QHBoxLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
-#include <QTabBar>
-#include <QTabWidget>
-#include <QToolBar>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget_pool.hh>
@@ -34,6 +27,13 @@
#include "panel_widget_container.hh"
#include "button_box.hh"
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
+#include <QTabBar>
+#include <QTabWidget>
+#include <QToolBar>
namespace ost { namespace gui {
/// \brief tabbed drag widget
diff --git a/modules/gui/src/perspective.cc b/modules/gui/src/perspective.cc
index 6d047e353..6af76c480 100644
--- a/modules/gui/src/perspective.cc
+++ b/modules/gui/src/perspective.cc
@@ -16,6 +16,15 @@
// 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/platform.hh>
+
+#include <ost/gui/widget_registry.hh>
+#include <ost/gui/perspective.hh>
+#include <ost/gui/file_browser.hh>
+#include <ost/gui/main_area.hh>
+#include <ost/gui/messages/message_box_widget.hh>
+
#include <QTextEdit>
#include <QSizeGrip>
#include <QMainWindow>
@@ -28,15 +37,6 @@
#include <QKeySequence>
#include <QStatusBar>
#include <QPushButton>
-
-#include <ost/platform.hh>
-
-#include <ost/gui/widget_registry.hh>
-#include <ost/gui/perspective.hh>
-#include <ost/gui/file_browser.hh>
-#include <ost/gui/main_area.hh>
-#include <ost/gui/messages/message_box_widget.hh>
-
/*
Author: Marco Biasini
*/
diff --git a/modules/gui/src/perspective.hh b/modules/gui/src/perspective.hh
index d5aa97f97..b52a7c8f0 100644
--- a/modules/gui/src/perspective.hh
+++ b/modules/gui/src/perspective.hh
@@ -19,12 +19,6 @@
#ifndef OST_GUI_PERSPECTIVE_HH
#define OST_GUI_PERSPECTIVE_HH
-#include <QObject>
-#include <QMenuBar>
-#include <QMap>
-#include <QString>
-#include <QMenu>
-#include <QStatusBar>
class QMainWindow;
class QTextEdit;
@@ -34,6 +28,12 @@ class QTextEdit;
#include <ost/gui/panels/panel_bar.hh>
#include <ost/gui/module_config.hh>
+#include <QObject>
+#include <QMenuBar>
+#include <QMap>
+#include <QString>
+#include <QMenu>
+#include <QStatusBar>
/*
Author: Marco Biasini, Stefan Scheuber
*/
diff --git a/modules/gui/src/plot_viewer/plot_axis_base.cc b/modules/gui/src/plot_viewer/plot_axis_base.cc
index 95a75cdb5..5bee2b908 100644
--- a/modules/gui/src/plot_viewer/plot_axis_base.cc
+++ b/modules/gui/src/plot_viewer/plot_axis_base.cc
@@ -20,10 +20,10 @@
Author: Andreas Schenk
*/
-#include <QWheelEvent>
-#include <QMouseEvent>
#include "plot_axis_base.hh"
+#include <QWheelEvent>
+#include <QMouseEvent>
namespace ost{namespace gui{
PlotAxisBase::PlotAxisBase(QWidget * parent):
diff --git a/modules/gui/src/plot_viewer/plot_axis_base.hh b/modules/gui/src/plot_viewer/plot_axis_base.hh
index f16b703d1..61d621219 100644
--- a/modules/gui/src/plot_viewer/plot_axis_base.hh
+++ b/modules/gui/src/plot_viewer/plot_axis_base.hh
@@ -23,9 +23,9 @@
Author: Andreas Schenk
*/
+#include "plot_ticker.hh"
#include <QWidget>
-#include "plot_ticker.hh"
namespace ost { namespace gui {
diff --git a/modules/gui/src/plot_viewer/plot_axis_horizontal.cc b/modules/gui/src/plot_viewer/plot_axis_horizontal.cc
index 05b13f551..327922138 100644
--- a/modules/gui/src/plot_viewer/plot_axis_horizontal.cc
+++ b/modules/gui/src/plot_viewer/plot_axis_horizontal.cc
@@ -19,11 +19,11 @@
/*
Author: Andreas Schenk
*/
-#include <QPainter>
-#include <QMouseEvent>
#include "plot_axis_horizontal.hh"
+#include <QPainter>
+#include <QMouseEvent>
namespace ost{namespace gui{
PlotAxisHorizontal::PlotAxisHorizontal(QWidget * parent):
diff --git a/modules/gui/src/plot_viewer/plot_axis_vertical.cc b/modules/gui/src/plot_viewer/plot_axis_vertical.cc
index f6bf01a2c..f276953dd 100644
--- a/modules/gui/src/plot_viewer/plot_axis_vertical.cc
+++ b/modules/gui/src/plot_viewer/plot_axis_vertical.cc
@@ -20,11 +20,11 @@
Author: Andreas Schenk
*/
-#include <QMouseEvent>
-#include <QPainter>
#include "plot_axis_vertical.hh"
+#include <QMouseEvent>
+#include <QPainter>
namespace ost{namespace gui{
PlotAxisVertical::PlotAxisVertical(QWidget * parent):
diff --git a/modules/gui/src/plot_viewer/plot_data_entry.hh b/modules/gui/src/plot_viewer/plot_data_entry.hh
index f6d443eae..5fed0c683 100644
--- a/modules/gui/src/plot_viewer/plot_data_entry.hh
+++ b/modules/gui/src/plot_viewer/plot_data_entry.hh
@@ -24,8 +24,8 @@
Author: Andreas Schenk
*/
-#include <QString>
#include <ost/gui/module_config.hh>
+#include <QString>
namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_data_graphics_item.cc b/modules/gui/src/plot_viewer/plot_data_graphics_item.cc
index 81a0b78c7..098f06bca 100644
--- a/modules/gui/src/plot_viewer/plot_data_graphics_item.cc
+++ b/modules/gui/src/plot_viewer/plot_data_graphics_item.cc
@@ -20,10 +20,9 @@
Author: Andreas Schenk
*/
-#include <QtAlgorithms>
-#include <ost/dyn_cast.hh>
#include <ost/gui/python_shell/python_interpreter.hh>
+#include <ost/dyn_cast.hh>
#include "plot_data_info.hh"
#include "plot_graphics_ellipse_item.hh"
#include "plot_graphics_rectangle_item.hh"
@@ -31,6 +30,7 @@
#include "plot_graphics_diagonal_cross_item.hh"
#include "plot_data_graphics_item.hh"
+#include <QtAlgorithms>
namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh b/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh
index 050bcca2f..0a08efb05 100644
--- a/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh
+++ b/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh
@@ -23,12 +23,12 @@
Author: Andreas Schenk
*/
-#include <QGraphicsItem>
-#include <QObject>
#include <ost/gui/module_config.hh>
#include "plot_info_base.hh"
+#include <QGraphicsItem>
+#include <QObject>
namespace ost{namespace gui{
class DLLEXPORT_OST_GUI PlotDataGraphicsItemBase: public QObject, public QGraphicsItem
diff --git a/modules/gui/src/plot_viewer/plot_data_info.hh b/modules/gui/src/plot_viewer/plot_data_info.hh
index d1babc2f9..5e5f4767a 100644
--- a/modules/gui/src/plot_viewer/plot_data_info.hh
+++ b/modules/gui/src/plot_viewer/plot_data_info.hh
@@ -24,9 +24,9 @@
Author: Andreas Schenk
*/
+#include <boost/python.hpp>
#include <ost/gui/module_config.hh>
#include <ost/gui/plot_viewer/plot_data_info_fw.hh>
-#include <boost/python.hpp>
#include <vector>
#include "plot_info_base.hh"
diff --git a/modules/gui/src/plot_viewer/plot_function_graphics_item.hh b/modules/gui/src/plot_viewer/plot_function_graphics_item.hh
index 2c43be23b..84da4314b 100644
--- a/modules/gui/src/plot_viewer/plot_function_graphics_item.hh
+++ b/modules/gui/src/plot_viewer/plot_function_graphics_item.hh
@@ -23,11 +23,11 @@
Author: Andreas Schenk
*/
-#include <QGraphicsItem>
#include "plot_data_graphics_item_base.hh"
#include "plot_function.hh"
#include "plot_function_info.hh"
+#include <QGraphicsItem>
namespace ost{namespace gui{
class DLLEXPORT_OST_GUI PlotFunctionGraphicsItem: public PlotDataGraphicsItemBase
diff --git a/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc b/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc
index 23ebd6cbc..52f70067a 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc
@@ -20,11 +20,11 @@
Author: Andreas Schenk
*/
-#include <QCursor>
-#include <QToolTip>
#include "plot_data_info.hh"
#include "plot_data_graphics_item.hh"
#include "plot_graphics_cross_item.hh"
+#include <QCursor>
+#include <QToolTip>
namespace ost {namespace gui {
diff --git a/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh b/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh
index d423d1339..ce89659df 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh
@@ -23,10 +23,10 @@
Author: Andreas Schenk
*/
-#include <QGraphicsItem>
-#include <QGraphicsSceneHoverEvent>
#include "plot_data_entry.hh"
#include "plot_data_info_fw.hh"
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
namespace ost {namespace gui {
diff --git a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc
index 88e92852e..a60ded4ce 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc
@@ -19,11 +19,11 @@
/*
Author: Andreas Schenk
*/
-#include <QCursor>
-#include <QToolTip>
#include "plot_data_info.hh"
#include "plot_data_graphics_item.hh"
#include "plot_graphics_diagonal_cross_item.hh"
+#include <QCursor>
+#include <QToolTip>
namespace ost {namespace gui {
diff --git a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh
index 01cf3b564..4b185b837 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh
@@ -23,10 +23,10 @@
Author: Andreas Schenk
*/
-#include <QGraphicsItem>
-#include <QGraphicsSceneHoverEvent>
#include "plot_data_entry.hh"
#include "plot_data_info_fw.hh"
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
namespace ost {namespace gui {
diff --git a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc
index a176d07ff..abf995841 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc
@@ -20,11 +20,11 @@
Author: Andreas Schenk
*/
-#include <QCursor>
-#include <QToolTip>
#include "plot_data_info.hh"
#include "plot_data_graphics_item.hh"
#include "plot_graphics_ellipse_item.hh"
+#include <QCursor>
+#include <QToolTip>
namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh
index f9f21c052..9aa908072 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh
@@ -23,10 +23,10 @@
Author: Andreas Schenk
*/
-#include <QGraphicsItem>
-#include <QGraphicsSceneHoverEvent>
#include "plot_data_entry.hh"
#include "plot_data_info_fw.hh"
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc
index dd61a1b22..60d1f8f5e 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc
@@ -20,11 +20,11 @@
Author: Andreas Schenk
*/
-#include <QCursor>
-#include <QToolTip>
#include "plot_data_info.hh"
#include "plot_data_graphics_item.hh"
#include "plot_graphics_rectangle_item.hh"
+#include <QCursor>
+#include <QToolTip>
namespace ost {namespace gui {
diff --git a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh
index 5d099c692..b0b08eb61 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh
@@ -23,10 +23,10 @@
Author: Andreas Schenk
*/
-#include <QGraphicsRectItem>
-#include <QGraphicsSceneHoverEvent>
#include "plot_data_entry.hh"
#include "plot_data_info_fw.hh"
+#include <QGraphicsRectItem>
+#include <QGraphicsSceneHoverEvent>
namespace ost {namespace gui {
diff --git a/modules/gui/src/plot_viewer/plot_group_info.hh b/modules/gui/src/plot_viewer/plot_group_info.hh
index e7668633a..f99c8d5e1 100644
--- a/modules/gui/src/plot_viewer/plot_group_info.hh
+++ b/modules/gui/src/plot_viewer/plot_group_info.hh
@@ -19,9 +19,9 @@
#ifndef PLOT_GROUP_INFO_HH_
#define PLOT_GROUP_INFO_HH_
+#include <boost/python.hpp>
#include "plot_info_base.hh"
#include <vector>
-#include <boost/python.hpp>
#include <boost/shared_ptr.hpp>
namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_info_base.hh b/modules/gui/src/plot_viewer/plot_info_base.hh
index 46b21b085..9b40d6ab4 100644
--- a/modules/gui/src/plot_viewer/plot_info_base.hh
+++ b/modules/gui/src/plot_viewer/plot_info_base.hh
@@ -24,13 +24,13 @@
*/
#include <boost/shared_ptr.hpp>
+
+#include <ost/gui/module_config.hh>
+
#include <QObject>
#include <QColor>
#include <QPen>
#include <QBrush>
-
-#include <ost/gui/module_config.hh>
-
namespace ost{namespace gui{
//fw decl
diff --git a/modules/gui/src/plot_viewer/plot_legend_panel.cc b/modules/gui/src/plot_viewer/plot_legend_panel.cc
index 44decfbc9..e02ae5dce 100644
--- a/modules/gui/src/plot_viewer/plot_legend_panel.cc
+++ b/modules/gui/src/plot_viewer/plot_legend_panel.cc
@@ -21,9 +21,9 @@
*/
#include <ost/dyn_cast.hh>
-#include <QMetaType>
#include "plot_legend_panel.hh"
+#include <QMetaType>
Q_DECLARE_METATYPE(ost::gui::PlotInfoBasePtr)
diff --git a/modules/gui/src/plot_viewer/plot_legend_panel.hh b/modules/gui/src/plot_viewer/plot_legend_panel.hh
index 29a547d5b..09c595018 100644
--- a/modules/gui/src/plot_viewer/plot_legend_panel.hh
+++ b/modules/gui/src/plot_viewer/plot_legend_panel.hh
@@ -23,12 +23,12 @@
Author: Andreas Schenk
*/
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
#include "plot_data_info.hh"
#include "plot_group_info.hh"
#include "plot_function_info.hh"
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
namespace ost{namespace gui{
class DLLEXPORT_OST_GUI PlotLegendPanel:public QTreeWidget
diff --git a/modules/gui/src/plot_viewer/plot_viewer.cc b/modules/gui/src/plot_viewer/plot_viewer.cc
index 4ee454836..c0d1889df 100644
--- a/modules/gui/src/plot_viewer/plot_viewer.cc
+++ b/modules/gui/src/plot_viewer/plot_viewer.cc
@@ -21,8 +21,6 @@
*/
#include <limits>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
#include "plot_viewer.hh"
#include "plot_viewer_panel.hh"
@@ -32,6 +30,8 @@
#include "plot_function_graphics_item.hh"
#include "plot_group_graphics_item.hh"
+#include <QHBoxLayout>
+#include <QVBoxLayout>
namespace ost { namespace gui {
PlotViewer::PlotViewer(QWidget* parent,const QString& name):
diff --git a/modules/gui/src/plot_viewer/plot_viewer.hh b/modules/gui/src/plot_viewer/plot_viewer.hh
index f5a6a4a58..15c2b2569 100644
--- a/modules/gui/src/plot_viewer/plot_viewer.hh
+++ b/modules/gui/src/plot_viewer/plot_viewer.hh
@@ -23,18 +23,18 @@
Author: Andreas Schenk
*/
+
+
#include <QStandardItemModel>
#include <QGraphicsScene>
#include <QWidget>
#include <QString>
-
#include "plot_data.hh"
+#include "plot_data_info_fw.hh"
+#include "plot_group_info.hh"
#include "plot_function.hh"
#include "plot_group.hh"
#include "plot_function_info.hh"
-#include "plot_data_info_fw.hh"
-#include "plot_group_info.hh"
-
namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_viewer_panel.cc b/modules/gui/src/plot_viewer/plot_viewer_panel.cc
index a440c0680..3fec69dc2 100644
--- a/modules/gui/src/plot_viewer/plot_viewer_panel.cc
+++ b/modules/gui/src/plot_viewer/plot_viewer_panel.cc
@@ -20,10 +20,10 @@
Author: Andreas Schenk
*/
-#include <QtGui>
#include "plot_viewer_panel.hh"
#include "plot_types.hh"
#include "plot_function.hh"
+#include <QtGui>
namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_viewer_panel.hh b/modules/gui/src/plot_viewer/plot_viewer_panel.hh
index 535b27534..41753163c 100644
--- a/modules/gui/src/plot_viewer/plot_viewer_panel.hh
+++ b/modules/gui/src/plot_viewer/plot_viewer_panel.hh
@@ -24,12 +24,12 @@
Author: Andreas Schenk
*/
+#include "plot_axis_horizontal.hh"
+#include "plot_axis_vertical.hh"
#include <QWidget>
#include <QHash>
#include <QPair>
#include <QGraphicsView>
-#include "plot_axis_horizontal.hh"
-#include "plot_axis_vertical.hh"
namespace ost{namespace gui{
diff --git a/modules/gui/src/python_shell/completer_base.cc b/modules/gui/src/python_shell/completer_base.cc
index 3194eb53c..a63d3b0ba 100644
--- a/modules/gui/src/python_shell/completer_base.cc
+++ b/modules/gui/src/python_shell/completer_base.cc
@@ -20,6 +20,7 @@
Authors: Marco Biasini, Andreas Schenk
*/
+#include "completer_base.hh"
#include <QStringList>
#include <QScrollBar>
@@ -27,7 +28,6 @@
#include <QKeyEvent>
#include <QApplication>
-#include "completer_base.hh"
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/main_thread_runner.hh b/modules/gui/src/python_shell/main_thread_runner.hh
index 056dd6165..399fd8c03 100644
--- a/modules/gui/src/python_shell/main_thread_runner.hh
+++ b/modules/gui/src/python_shell/main_thread_runner.hh
@@ -25,9 +25,9 @@
Author: Andreas Schenk
*/
-#include <QObject>
#include <ost/gui/module_config.hh>
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/output_redirector.cc b/modules/gui/src/python_shell/output_redirector.cc
index dcbcd49f7..e86879a82 100644
--- a/modules/gui/src/python_shell/output_redirector.cc
+++ b/modules/gui/src/python_shell/output_redirector.cc
@@ -22,8 +22,8 @@
Author: Andreas Schenk
*/
-#include <QTimer>
#include "output_redirector.hh"
+#include <QTimer>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/output_redirector.hh b/modules/gui/src/python_shell/output_redirector.hh
index aec845cbc..2d13948a2 100644
--- a/modules/gui/src/python_shell/output_redirector.hh
+++ b/modules/gui/src/python_shell/output_redirector.hh
@@ -26,10 +26,10 @@
Author: Andreas Schenk
*/
+#include <ost/gui/module_config.hh>
#include <QTime>
#include <QString>
#include <QObject>
-#include <ost/gui/module_config.hh>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/python_completer.cc b/modules/gui/src/python_shell/python_completer.cc
index 4618fb745..d03463972 100644
--- a/modules/gui/src/python_shell/python_completer.cc
+++ b/modules/gui/src/python_shell/python_completer.cc
@@ -22,9 +22,9 @@
#include <iostream>
-#include <QStringList>
#include "python_completer.hh"
#include "python_namespace_tree_model.hh"
+#include <QStringList>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/python_interpreter.cc b/modules/gui/src/python_shell/python_interpreter.cc
index 059d69ce6..975c6ff41 100644
--- a/modules/gui/src/python_shell/python_interpreter.cc
+++ b/modules/gui/src/python_shell/python_interpreter.cc
@@ -30,12 +30,12 @@
#include <fstream>
#include <boost/filesystem/convenience.hpp>
+#include <ost/log.hh>
#include <QFile>
#include <QDebug>
#include <QFile>
#include <QStringList>
-#include <ost/log.hh>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/python_interpreter.hh b/modules/gui/src/python_shell/python_interpreter.hh
index 01b3e3273..ec6639bbb 100644
--- a/modules/gui/src/python_shell/python_interpreter.hh
+++ b/modules/gui/src/python_shell/python_interpreter.hh
@@ -29,10 +29,6 @@
#include <vector>
-#include <QQueue>
-#include <QMetaType>
-
-
#include <ost/gui/module_config.hh>
#include <ost/gui/module_config.hh>
@@ -40,6 +36,9 @@
#include "output_redirector.hh"
#include "main_thread_runner.hh"
+#include <QQueue>
+#include <QMetaType>
+
namespace ost { namespace gui {
namespace bp = boost::python;
diff --git a/modules/gui/src/python_shell/python_interpreter_worker.hh b/modules/gui/src/python_shell/python_interpreter_worker.hh
index 5093c61b9..77295ca86 100644
--- a/modules/gui/src/python_shell/python_interpreter_worker.hh
+++ b/modules/gui/src/python_shell/python_interpreter_worker.hh
@@ -3,11 +3,11 @@
#include <csignal>
#include <utility>
-#include <QObject>
-#include <QQueue>
#include <boost/python.hpp>
#include <boost/shared_ptr.hpp>
#include "output_redirector.hh"
+#include <QObject>
+#include <QQueue>
namespace ost { namespace gui {
namespace bp = boost::python;
diff --git a/modules/gui/src/python_shell/python_shell.cc b/modules/gui/src/python_shell/python_shell.cc
index 6999bb35c..6cfdc94aa 100644
--- a/modules/gui/src/python_shell/python_shell.cc
+++ b/modules/gui/src/python_shell/python_shell.cc
@@ -20,14 +20,14 @@
/*
Author: Marco Biasini
*/
-#include <QVBoxLayout>
-#include <ost/gui/widget_registry.hh>
#include <ost/gui/gosty_app.hh>
+#include <ost/gui/widget_registry.hh>
#include "python_shell.hh"
#include "python_shell_widget.hh"
+#include <QVBoxLayout>
namespace ost { namespace gui {
class PythonShellFactory: public WidgetFactory {
diff --git a/modules/gui/src/python_shell/python_shell_widget.cc b/modules/gui/src/python_shell/python_shell_widget.cc
index 707079428..16d1d4ac2 100644
--- a/modules/gui/src/python_shell/python_shell_widget.cc
+++ b/modules/gui/src/python_shell/python_shell_widget.cc
@@ -22,13 +22,6 @@
#include <iostream>
-#include <QApplication>
-#include <QFontMetrics>
-#include <QClipboard>
-#include <QPainter>
-#include <QScrollBar>
-#include <QDirModel>
-#include <QStringList>
#include "python_shell_widget.hh"
@@ -42,6 +35,13 @@
#include "path_completer.hh"
#include "transition.hh"
+#include <QApplication>
+#include <QFontMetrics>
+#include <QClipboard>
+#include <QPainter>
+#include <QScrollBar>
+#include <QDirModel>
+#include <QStringList>
/*
diff --git a/modules/gui/src/python_shell/python_shell_widget.hh b/modules/gui/src/python_shell/python_shell_widget.hh
index 364e60bb7..9ab34b259 100644
--- a/modules/gui/src/python_shell/python_shell_widget.hh
+++ b/modules/gui/src/python_shell/python_shell_widget.hh
@@ -26,8 +26,6 @@
#include <ost/gui/module_config.hh>
-#include <QPlainTextEdit>
-#include <QHash>
#include "python_interpreter.hh"
#include "shell_history.hh"
#include "python_shell_fw.hh"
@@ -35,6 +33,8 @@
#include "state_machine.hh"
#include "state.hh"
+#include <QPlainTextEdit>
+#include <QHash>
namespace ost { namespace gui {
// fw decl
diff --git a/modules/gui/src/python_shell/python_syntax_highlighter.cc b/modules/gui/src/python_shell/python_syntax_highlighter.cc
index ba60ac94d..f37eb4d61 100644
--- a/modules/gui/src/python_shell/python_syntax_highlighter.cc
+++ b/modules/gui/src/python_shell/python_syntax_highlighter.cc
@@ -21,8 +21,6 @@
*/
#include <iostream>
-#include <QDebug>
-#include <QTextCursor>
#include "python_shell.hh"
#include "string_literal_positions.hh"
@@ -31,6 +29,8 @@
#include "python_context_parser.hh"
+#include <QDebug>
+#include <QTextCursor>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/python_syntax_highlighter.hh b/modules/gui/src/python_shell/python_syntax_highlighter.hh
index dea21746b..e31413678 100644
--- a/modules/gui/src/python_shell/python_syntax_highlighter.hh
+++ b/modules/gui/src/python_shell/python_syntax_highlighter.hh
@@ -22,12 +22,12 @@
Authors: Marco Biasini, Andreas Schenk
*/
-#include <QSyntaxHighlighter>
-#include <QTextDocument>
#include "python_shell_fw.hh"
#include "python_tokenizer.hh"
+#include <QSyntaxHighlighter>
+#include <QTextDocument>
namespace ost { namespace gui {
/**
diff --git a/modules/gui/src/python_shell/shell_history.hh b/modules/gui/src/python_shell/shell_history.hh
index a04bd8469..a39d74129 100644
--- a/modules/gui/src/python_shell/shell_history.hh
+++ b/modules/gui/src/python_shell/shell_history.hh
@@ -23,8 +23,8 @@
*/
#include <vector>
-#include <QString>
#include "python_shell_fw.hh"
+#include <QString>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/state.cc b/modules/gui/src/python_shell/state.cc
index 2d0c8e51c..381fffff4 100644
--- a/modules/gui/src/python_shell/state.cc
+++ b/modules/gui/src/python_shell/state.cc
@@ -1,7 +1,7 @@
#include <cassert>
-#include "state_machine.hh"
#include "transition.hh"
#include "state.hh"
+#include "state_machine.hh"
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/transition.cc b/modules/gui/src/python_shell/transition.cc
index 0803e185b..35501292c 100644
--- a/modules/gui/src/python_shell/transition.cc
+++ b/modules/gui/src/python_shell/transition.cc
@@ -1,9 +1,9 @@
#include <cassert>
-#include <QKeyEvent>
-#include <QMouseEvent>
#include "python_shell_widget.hh"
-#include "state.hh"
#include "transition.hh"
+#include "state.hh"
+#include <QKeyEvent>
+#include <QMouseEvent>
namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/transition.hh b/modules/gui/src/python_shell/transition.hh
index 9b832e1af..5c8514cbf 100644
--- a/modules/gui/src/python_shell/transition.hh
+++ b/modules/gui/src/python_shell/transition.hh
@@ -2,11 +2,11 @@
#define PYTHON_SHELL_TRANSITION_HH
#include <utility>
+#include <ost/gui/python_shell/python_interpreter.hh>
+
#include <QObject>
#include <QEvent>
-#include <ost/gui/python_shell/python_interpreter.hh>
#include "transition_guard.hh"
-
//fw decl
class QKeyEvent;
class QMouseEvent;
diff --git a/modules/gui/src/python_shell/transition_guard.hh b/modules/gui/src/python_shell/transition_guard.hh
index e9534326d..5a2906481 100644
--- a/modules/gui/src/python_shell/transition_guard.hh
+++ b/modules/gui/src/python_shell/transition_guard.hh
@@ -1,9 +1,9 @@
#ifndef TRANSITION_GUARD_HH
#define TRANSITION_GUARD_HH
-#include <QObject>
#include "python_shell_fw.hh"
#include "python_interpreter.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/remote_loader.cc b/modules/gui/src/remote_loader.cc
index 42342e3d5..2e07f9ab5 100644
--- a/modules/gui/src/remote_loader.cc
+++ b/modules/gui/src/remote_loader.cc
@@ -18,11 +18,6 @@
//------------------------------------------------------------------------------
#include <vector>
-#include <QString>
-#include <QSettings>
-#include <QNetworkReply>
-#include <QHBoxLayout>
-#include <QDir>
#include <ost/platform.hh>
#include <ost/gui/file_loader.hh>
@@ -31,6 +26,11 @@
#include "widget_registry.hh"
#include "remote_loader.hh"
+#include <QString>
+#include <QSettings>
+#include <QNetworkReply>
+#include <QHBoxLayout>
+#include <QDir>
namespace ost { namespace gui {
RemoteLoader::RemoteLoader(QWidget* parent):
diff --git a/modules/gui/src/remote_loader.hh b/modules/gui/src/remote_loader.hh
index 36d399164..92c5aa9f8 100644
--- a/modules/gui/src/remote_loader.hh
+++ b/modules/gui/src/remote_loader.hh
@@ -19,16 +19,16 @@
#ifndef OST_GUI_REMOTE_LOADER_HH
#define OST_GUI_REMOTE_LOADER_HH
-#include <QToolButton>
-#include <QLineEdit>
-#include <QKeyEvent>
-#include <QProgressBar>
-#include <QActionGroup>
#include <ost/gfx/gfx_object.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
+#include <QToolButton>
+#include <QLineEdit>
+#include <QKeyEvent>
+#include <QProgressBar>
+#include <QActionGroup>
namespace ost { namespace gui {
diff --git a/modules/gui/src/remote_site_loader.hh b/modules/gui/src/remote_site_loader.hh
index 648850fd5..b00823af7 100644
--- a/modules/gui/src/remote_site_loader.hh
+++ b/modules/gui/src/remote_site_loader.hh
@@ -24,11 +24,11 @@
#ifndef OST_GUI_REMOTE_SITE_LOADER_HH
#define OST_GUI_REMOTE_SITE_LOADER_HH
+#include <ost/gui/module_config.hh>
+
#include <QObject>
#include <QMenu>
#include <QNetworkReply>
-#include <ost/gui/module_config.hh>
-
namespace ost { namespace gui {
class DLLEXPORT_OST_GUI RemoteSiteLoader{
diff --git a/modules/gui/src/scene_menu.hh b/modules/gui/src/scene_menu.hh
index 8b8d1f402..9472a6245 100644
--- a/modules/gui/src/scene_menu.hh
+++ b/modules/gui/src/scene_menu.hh
@@ -19,15 +19,14 @@
#ifndef OST_GUI_SCENE_MENU_HH
#define OST_GUI_SCENE_MENU_HH
-#include <QObject>
-#include <QPoint>
-#include <QMenu>
-#include <QString>
#include <ost/mol/mol.hh>
#include <ost/gfx/gfx_object_fw.hh>
-#include <ost/gui/scene_menu.hh>
+#include <QObject>
+#include <QPoint>
+#include <QMenu>
+#include <QString>
namespace ost { namespace gui {
class SceneMenu : public QObject{
diff --git a/modules/gui/src/scene_selection.cc b/modules/gui/src/scene_selection.cc
index 17486e36f..1ef2ee7ce 100644
--- a/modules/gui/src/scene_selection.cc
+++ b/modules/gui/src/scene_selection.cc
@@ -16,6 +16,7 @@
// 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/geom/vec3.hh>
@@ -35,7 +36,6 @@
#endif
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/scene_win/scene_win.hh>
#include "scene_selection.hh"
diff --git a/modules/gui/src/scene_selection.hh b/modules/gui/src/scene_selection.hh
index 292a59e4a..ebc2bbfdb 100644
--- a/modules/gui/src/scene_selection.hh
+++ b/modules/gui/src/scene_selection.hh
@@ -19,9 +19,6 @@
#ifndef OST_GUI_SCENE_SELECTION_HH
#define OST_GUI_SCENE_SELECTION_HH
-#include <QObject>
-#include <QMenu>
-#include <QPoint>
#include <ost/mol/query_view_wrapper.hh>
@@ -29,6 +26,9 @@
#include <ost/gfx/gfx_node_fw.hh>
#include <ost/gui/module_config.hh>
+#include <QObject>
+#include <QMenu>
+#include <QPoint>
namespace ost { namespace gui {
class DLLEXPORT_OST_GUI SceneSelection : public QObject {
diff --git a/modules/gui/src/scene_win/context_menu.cc b/modules/gui/src/scene_win/context_menu.cc
index c73c0223d..52b71d38b 100644
--- a/modules/gui/src/scene_win/context_menu.cc
+++ b/modules/gui/src/scene_win/context_menu.cc
@@ -21,10 +21,6 @@
*/
#include <boost/pointer_cast.hpp>
-#include <QAction>
-#include <QMenu>
-#include <QItemSelection>
-#include <QItemSelectionModel>
#include <ost/dyn_cast.hh>
@@ -43,6 +39,10 @@
#include "context_menu.hh"
+#include <QAction>
+#include <QMenu>
+#include <QItemSelection>
+#include <QItemSelectionModel>
namespace ost { namespace gui {
ContextMenu::ContextMenu(QTreeView* view, SceneWinModel* model):
diff --git a/modules/gui/src/scene_win/context_menu.hh b/modules/gui/src/scene_win/context_menu.hh
index 486f9b8bd..03007fc6f 100644
--- a/modules/gui/src/scene_win/context_menu.hh
+++ b/modules/gui/src/scene_win/context_menu.hh
@@ -23,14 +23,14 @@
Author: Stefan Scheuber
*/
-#include <QFlags>
-#include <QMap>
-#include <QAbstractItemModel>
-#include <QTreeView>
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/scene_win_model.hh>
+#include <QFlags>
+#include <QMap>
+#include <QAbstractItemModel>
+#include <QTreeView>
namespace ost { namespace gui {
enum ContextActionType
diff --git a/modules/gui/src/scene_win/current_selection_node.cc b/modules/gui/src/scene_win/current_selection_node.cc
index c8b0eb03c..9de4397a4 100644
--- a/modules/gui/src/scene_win/current_selection_node.cc
+++ b/modules/gui/src/scene_win/current_selection_node.cc
@@ -16,18 +16,18 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QFont>
+#include <ost/gui/gosty_app.hh>
#include <ost/mol/query_view_wrapper.hh>
#include <ost/gfx/scene.hh>
#include <ost/gfx/gfx_node.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/scene_win/scene_win.hh>
#include "current_selection_node.hh"
+#include <QFont>
namespace ost { namespace gui {
CurrentSelectionNode::CurrentSelectionNode(gfx::EntityP entity, SceneNode* parent):EntityPartNode("Current Selection",entity,mol::QueryViewWrapper(entity->GetSelection()),parent),wrapper_(mol::QueryViewWrapper(entity->GetSelection())){
diff --git a/modules/gui/src/scene_win/current_selection_node.hh b/modules/gui/src/scene_win/current_selection_node.hh
index baedc3604..9a63219d9 100644
--- a/modules/gui/src/scene_win/current_selection_node.hh
+++ b/modules/gui/src/scene_win/current_selection_node.hh
@@ -19,9 +19,6 @@
#ifndef OST_GUI_SCENE_WIN_CURRENT_SELECTION_NODE_HH
#define OST_GUI_SCENE_WIN_CURRENT_SELECTION_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
#include <ost/mol/entity_view.hh>
#include <ost/mol/query_view_wrapper.hh>
@@ -32,6 +29,9 @@
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/entity_part_node.hh>
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/custom_part_node.cc b/modules/gui/src/scene_win/custom_part_node.cc
index f8e5f79db..18c9d9972 100644
--- a/modules/gui/src/scene_win/custom_part_node.cc
+++ b/modules/gui/src/scene_win/custom_part_node.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 <QFont>
#include "custom_part_node.hh"
@@ -25,6 +24,7 @@
#include <ost/gfx/entity.hh>
#include <ost/gfx/gfx_node.hh>
+#include <QFont>
namespace ost { namespace gui {
CustomPartNode::CustomPartNode(QString name, gfx::EntityP entity, mol::QueryViewWrapper part, SceneNode* parent):EntityPartNode(name,entity,part,parent){
diff --git a/modules/gui/src/scene_win/custom_part_node.hh b/modules/gui/src/scene_win/custom_part_node.hh
index b585af4e0..9c9eba9f4 100644
--- a/modules/gui/src/scene_win/custom_part_node.hh
+++ b/modules/gui/src/scene_win/custom_part_node.hh
@@ -19,9 +19,6 @@
#ifndef OST_GUI_SCENE_WIN_CUSTOM_PART_NODE_HH
#define OST_GUI_SCENE_WIN_CUSTOM_PART_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
#include <ost/mol/query_view_wrapper.hh>
@@ -31,6 +28,9 @@
#include <ost/gui/scene_win/scene_node.hh>
#include "entity_part_node.hh"
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/entity_node.cc b/modules/gui/src/scene_win/entity_node.cc
index 0b618ea1e..3aa51c81c 100644
--- a/modules/gui/src/scene_win/entity_node.cc
+++ b/modules/gui/src/scene_win/entity_node.cc
@@ -16,16 +16,14 @@
// 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 <boost/pointer_cast.hpp>
-#include <QFont>
-#include <QString>
#include <ost/mol/query.hh>
#include <ost/mol/query_view_wrapper.hh>
#include <ost/mol/view_type_fw.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/scene_win/scene_win.hh>
#include "current_selection_node.hh"
@@ -35,6 +33,8 @@
#include "entity_node.hh"
+#include <QFont>
+#include <QString>
namespace ost { namespace gui {
diff --git a/modules/gui/src/scene_win/entity_part_node.cc b/modules/gui/src/scene_win/entity_part_node.cc
index dd56f2484..da8867d8b 100644
--- a/modules/gui/src/scene_win/entity_part_node.cc
+++ b/modules/gui/src/scene_win/entity_part_node.cc
@@ -16,13 +16,13 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QFont>
#include "entity_part_node.hh"
#include <ost/gfx/entity.hh>
#include <ost/gfx/gfx_node.hh>
+#include <QFont>
namespace ost { namespace gui {
EntityPartNode::EntityPartNode(QString name, gfx::EntityP entity, mol::QueryViewWrapper part, SceneNode* parent):SceneNode(parent),name_(name),entity_(entity),query_view_(part),visible_(true){
diff --git a/modules/gui/src/scene_win/entity_part_node.hh b/modules/gui/src/scene_win/entity_part_node.hh
index 7f7d36297..2eb308cbe 100644
--- a/modules/gui/src/scene_win/entity_part_node.hh
+++ b/modules/gui/src/scene_win/entity_part_node.hh
@@ -19,9 +19,6 @@
#ifndef OST_GUI_SCENE_WIN_ENTITY_PART_NODE_HH
#define OST_GUI_SCENE_WIN_ENTITY_PART_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
#include <ost/mol/query_view_wrapper.hh>
@@ -30,6 +27,9 @@
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/scene_node.hh>
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/gfx_scene_node.cc b/modules/gui/src/scene_win/gfx_scene_node.cc
index f8632e901..191007aee 100644
--- a/modules/gui/src/scene_win/gfx_scene_node.cc
+++ b/modules/gui/src/scene_win/gfx_scene_node.cc
@@ -16,13 +16,13 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QFont>
#include "gfx_scene_node.hh"
#include <ost/gfx/scene.hh>
#include <ost/gfx/gfx_node.hh>
+#include <QFont>
namespace ost { namespace gui {
GfxSceneNode::GfxSceneNode(gfx::GfxNodeP gfx_node, SceneNode* parent):SceneNode(parent),gfx_node_(gfx_node){}
diff --git a/modules/gui/src/scene_win/gfx_scene_node.hh b/modules/gui/src/scene_win/gfx_scene_node.hh
index fb9540815..03100392f 100644
--- a/modules/gui/src/scene_win/gfx_scene_node.hh
+++ b/modules/gui/src/scene_win/gfx_scene_node.hh
@@ -19,15 +19,15 @@
#ifndef OST_GUI_SCENE_WIN_GFX_SCENE_NODE_HH
#define OST_GUI_SCENE_WIN_GFX_SCENE_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
#include <ost/gfx/gfx_node_fw.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/scene_node.hh>
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/label_node.cc b/modules/gui/src/scene_win/label_node.cc
index 5cf9b2d95..8a01e6aec 100644
--- a/modules/gui/src/scene_win/label_node.cc
+++ b/modules/gui/src/scene_win/label_node.cc
@@ -16,13 +16,13 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QFont>
#include "label_node.hh"
#include <ost/gfx/entity.hh>
#include <ost/gfx/gfx_node.hh>
+#include <QFont>
namespace ost { namespace gui {
LabelNode::LabelNode(QString name, SceneNode* parent):SceneNode(parent),name_(name){
diff --git a/modules/gui/src/scene_win/label_node.hh b/modules/gui/src/scene_win/label_node.hh
index 50d471be0..4a9722f7f 100644
--- a/modules/gui/src/scene_win/label_node.hh
+++ b/modules/gui/src/scene_win/label_node.hh
@@ -19,13 +19,13 @@
#ifndef OST_GUI_SCENE_WIN_LABEL_NODE_HH
#define OST_GUI_SCENE_WIN_LABEL_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/scene_node.hh>
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/render_mode_node.cc b/modules/gui/src/scene_win/render_mode_node.cc
index 52836c043..88e67dea8 100644
--- a/modules/gui/src/scene_win/render_mode_node.cc
+++ b/modules/gui/src/scene_win/render_mode_node.cc
@@ -16,12 +16,12 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QFont>
#include <ost/mol/query_view_wrapper.hh>
#include "render_mode_node.hh"
+#include <QFont>
namespace ost { namespace gui {
RenderModeNode::RenderModeNode(gfx::EntityP entity, gfx::RenderMode::Type render_mode, SceneNode* parent):EntityPartNode(entity->GetRenderModeName(render_mode).c_str(),entity,mol::QueryViewWrapper(entity->GetRenderView(render_mode)),parent),
diff --git a/modules/gui/src/scene_win/render_mode_node.hh b/modules/gui/src/scene_win/render_mode_node.hh
index f5de2d084..fb7304379 100644
--- a/modules/gui/src/scene_win/render_mode_node.hh
+++ b/modules/gui/src/scene_win/render_mode_node.hh
@@ -19,9 +19,6 @@
#ifndef OST_GUI_SCENE_WIN_RENDER_MODE_NODE_HH
#define OST_GUI_SCENE_WIN_RENDER_MODE_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
#include <ost/mol/entity_view.hh>
#include <ost/mol/query_view_wrapper.hh>
@@ -36,6 +33,9 @@
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/entity_part_node.hh>
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/render_modes_node.cc b/modules/gui/src/scene_win/render_modes_node.cc
index 4c551f6b7..a343490b8 100644
--- a/modules/gui/src/scene_win/render_modes_node.cc
+++ b/modules/gui/src/scene_win/render_modes_node.cc
@@ -16,18 +16,18 @@
// 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 <boost/pointer_cast.hpp>
-#include <QFont>
#include <ost/gfx/scene.hh>
#include <ost/gfx/gfx_node.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/scene_win/scene_win.hh>
#include "render_modes_node.hh"
#include "render_mode_node.hh"
+#include <QFont>
namespace ost { namespace gui {
diff --git a/modules/gui/src/scene_win/render_modes_node.hh b/modules/gui/src/scene_win/render_modes_node.hh
index 231bf41bf..dbb5c1c2b 100644
--- a/modules/gui/src/scene_win/render_modes_node.hh
+++ b/modules/gui/src/scene_win/render_modes_node.hh
@@ -19,9 +19,6 @@
#ifndef OST_GUI_SCENE_WIN_RENDER_MODES_NODE_HH
#define OST_GUI_SCENE_WIN_RENDER_MODES_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QSet>
#include <ost/gfx/entity.hh>
#include <ost/gfx/entity_fw.hh>
@@ -36,6 +33,9 @@
#include "render_mode_node.hh"
+#include <QObject>
+#include <QVariant>
+#include <QSet>
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/root_node.cc b/modules/gui/src/scene_win/root_node.cc
index e883f4b69..98fc34dc9 100644
--- a/modules/gui/src/scene_win/root_node.cc
+++ b/modules/gui/src/scene_win/root_node.cc
@@ -16,12 +16,12 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QFont>
#include "root_node.hh"
#include <ost/gfx/scene.hh>
#include <ost/gfx/gfx_node.hh>
+#include <QFont>
namespace ost { namespace gui {
diff --git a/modules/gui/src/scene_win/root_node.hh b/modules/gui/src/scene_win/root_node.hh
index 2738a90f5..4775e6246 100644
--- a/modules/gui/src/scene_win/root_node.hh
+++ b/modules/gui/src/scene_win/root_node.hh
@@ -19,12 +19,12 @@
#ifndef OST_GUI_SCENE_WIN_ROOT_NODE_HH
#define OST_GUI_SCENE_WIN_ROOT_NODE_HH
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/scene_node.hh>
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
/*
Author: Stefan Scheuber
diff --git a/modules/gui/src/scene_win/scene_node.hh b/modules/gui/src/scene_win/scene_node.hh
index 926c16f75..9fbdd7cda 100644
--- a/modules/gui/src/scene_win/scene_node.hh
+++ b/modules/gui/src/scene_win/scene_node.hh
@@ -19,12 +19,12 @@
#ifndef OST_GUI_SCENE_WIN_SCENE_NODE_HH
#define OST_GUI_SCENE_WIN_SCENE_NODE_HH
+#include <ost/gui/module_config.hh>
+
#include <QObject>
#include <QVariant>
#include <QModelIndex>
-#include <ost/gui/module_config.hh>
-
/*
Author: Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/scene_win.cc b/modules/gui/src/scene_win/scene_win.cc
index 27ef02c87..ba685c3f6 100644
--- a/modules/gui/src/scene_win/scene_win.cc
+++ b/modules/gui/src/scene_win/scene_win.cc
@@ -19,15 +19,15 @@
/*
Authors: Marco Biasini, Ansgar Philippsen, Stefan Scheuber
*/
-#include <QVBoxLayout>
-#include <QHeaderView>
-#include <ost/gui/widget_registry.hh>
#include <ost/gui/gosty_app.hh>
+#include <ost/gui/widget_registry.hh>
#include <ost/gui/scene_selection.hh>
#include "scene_win.hh"
+#include <QVBoxLayout>
+#include <QHeaderView>
namespace ost { namespace gui {
class SceneWinFactory: public WidgetFactory {
diff --git a/modules/gui/src/scene_win/scene_win.hh b/modules/gui/src/scene_win/scene_win.hh
index 9761bb1f1..612198db6 100644
--- a/modules/gui/src/scene_win/scene_win.hh
+++ b/modules/gui/src/scene_win/scene_win.hh
@@ -19,8 +19,6 @@
#ifndef OST_GUI_SCENE_WIN_SCENE_WIN_HH
#define OST_GUI_SCENE_WIN_SCENE_WIN_HH
-#include <QTreeView>
-#include <QItemSelection>
#include <ost/mol/query_view_wrapper.hh>
@@ -31,6 +29,8 @@
#include <ost/gui/scene_win/scene_win_model.hh>
#include <ost/gui/scene_win/context_menu.hh>
+#include <QTreeView>
+#include <QItemSelection>
/*
Authors: Marco Biasini, Ansgar Philippsen, Stefan Scheuber
*/
diff --git a/modules/gui/src/scene_win/scene_win_model.hh b/modules/gui/src/scene_win/scene_win_model.hh
index c65af6677..060b14881 100644
--- a/modules/gui/src/scene_win/scene_win_model.hh
+++ b/modules/gui/src/scene_win/scene_win_model.hh
@@ -23,10 +23,6 @@
Author: Stefan Scheuber, Marco Biasini, Ansgar Philippsen
*/
-#include <QStringList>
-#include <QMimeData>
-#include <QMap>
-#include <QAbstractItemModel>
#include <ost/mol/view_type_fw.hh>
#include <ost/mol/query_view_wrapper.hh>
@@ -38,6 +34,10 @@
#include <ost/gui/scene_win/scene_node.hh>
#include <ost/gui/scene_win/render_modes_node.hh>
+#include <QStringList>
+#include <QMimeData>
+#include <QMap>
+#include <QAbstractItemModel>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/align_properties_painter.cc b/modules/gui/src/sequence_viewer/align_properties_painter.cc
index e51c0536a..0dd51f36d 100644
--- a/modules/gui/src/sequence_viewer/align_properties_painter.cc
+++ b/modules/gui/src/sequence_viewer/align_properties_painter.cc
@@ -22,10 +22,10 @@
*/
-#include <QtGui>
#include "align_properties_painter.hh"
+#include <QtGui>
namespace ost { namespace gui {
namespace {
diff --git a/modules/gui/src/sequence_viewer/align_properties_painter.hh b/modules/gui/src/sequence_viewer/align_properties_painter.hh
index d33331cc6..13bda8bab 100644
--- a/modules/gui/src/sequence_viewer/align_properties_painter.hh
+++ b/modules/gui/src/sequence_viewer/align_properties_painter.hh
@@ -23,9 +23,9 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include "painter.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/alignment_view_object.cc b/modules/gui/src/sequence_viewer/alignment_view_object.cc
index 9aa233194..f5a08689b 100644
--- a/modules/gui/src/sequence_viewer/alignment_view_object.cc
+++ b/modules/gui/src/sequence_viewer/alignment_view_object.cc
@@ -22,7 +22,6 @@
*/
-#include <QtGui>
#include <ost/mol/mol.hh>
#include <ost/mol/view_op.hh>
@@ -41,6 +40,7 @@
#include "alignment_view_object.hh"
+#include <QtGui>
namespace ost { namespace gui {
namespace {
diff --git a/modules/gui/src/sequence_viewer/background_painter.cc b/modules/gui/src/sequence_viewer/background_painter.cc
index 25cf4c650..7e45f62bd 100644
--- a/modules/gui/src/sequence_viewer/background_painter.cc
+++ b/modules/gui/src/sequence_viewer/background_painter.cc
@@ -22,10 +22,10 @@
*/
-#include <QtGui>
#include "background_painter.hh"
+#include <QtGui>
namespace ost { namespace gui {
BackgroundPainter::BackgroundPainter(QObject* parent)
diff --git a/modules/gui/src/sequence_viewer/background_painter.hh b/modules/gui/src/sequence_viewer/background_painter.hh
index 942e1dde5..dc97901d4 100644
--- a/modules/gui/src/sequence_viewer/background_painter.hh
+++ b/modules/gui/src/sequence_viewer/background_painter.hh
@@ -23,9 +23,9 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include "painter.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/base_row.cc b/modules/gui/src/sequence_viewer/base_row.cc
index 16dfb0af3..2491b765d 100644
--- a/modules/gui/src/sequence_viewer/base_row.cc
+++ b/modules/gui/src/sequence_viewer/base_row.cc
@@ -22,10 +22,10 @@
*/
-#include <QtGui>
#include "base_row.hh"
+#include <QtGui>
namespace ost { namespace gui {
BaseRow::BaseRow(QObject *parent) : QObject(parent)
diff --git a/modules/gui/src/sequence_viewer/base_row.hh b/modules/gui/src/sequence_viewer/base_row.hh
index 6f20d872b..12b86caeb 100644
--- a/modules/gui/src/sequence_viewer/base_row.hh
+++ b/modules/gui/src/sequence_viewer/base_row.hh
@@ -23,12 +23,12 @@
Author: Stefan Scheuber
*/
-#include <QObject>
-#include <QModelIndex>
-#include <QList>
#include "painter.hh"
+#include <QObject>
+#include <QModelIndex>
+#include <QList>
namespace ost { namespace gui {
class BaseRow : public QObject
diff --git a/modules/gui/src/sequence_viewer/base_view_object.cc b/modules/gui/src/sequence_viewer/base_view_object.cc
index 72953aa3e..716cdb8d8 100644
--- a/modules/gui/src/sequence_viewer/base_view_object.cc
+++ b/modules/gui/src/sequence_viewer/base_view_object.cc
@@ -22,10 +22,10 @@
*/
-#include <QtGui>
#include "base_view_object.hh"
+#include <QtGui>
namespace ost { namespace gui {
BaseViewObject::BaseViewObject(QObject* parent): QObject(parent)
diff --git a/modules/gui/src/sequence_viewer/base_view_object.hh b/modules/gui/src/sequence_viewer/base_view_object.hh
index 90526bfa3..fc843813d 100644
--- a/modules/gui/src/sequence_viewer/base_view_object.hh
+++ b/modules/gui/src/sequence_viewer/base_view_object.hh
@@ -23,11 +23,11 @@
Author: Stefan Scheuber
*/
-#include <QObject>
-#include <QList>
#include "base_row.hh"
+#include <QObject>
+#include <QList>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/conservation_painter.cc b/modules/gui/src/sequence_viewer/conservation_painter.cc
index 7bab56edc..b5e708548 100644
--- a/modules/gui/src/sequence_viewer/conservation_painter.cc
+++ b/modules/gui/src/sequence_viewer/conservation_painter.cc
@@ -22,10 +22,10 @@
*/
-#include <QtGui>
#include "conservation_painter.hh"
+#include <QtGui>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/conservation_painter.hh b/modules/gui/src/sequence_viewer/conservation_painter.hh
index c6549f661..f6cea3159 100644
--- a/modules/gui/src/sequence_viewer/conservation_painter.hh
+++ b/modules/gui/src/sequence_viewer/conservation_painter.hh
@@ -23,10 +23,10 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include "painter.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/painter.hh b/modules/gui/src/sequence_viewer/painter.hh
index 75e601cda..971c0b1f8 100644
--- a/modules/gui/src/sequence_viewer/painter.hh
+++ b/modules/gui/src/sequence_viewer/painter.hh
@@ -23,15 +23,15 @@
Author: Stefan Scheuber
*/
+
+#include <ost/mol/alg/sec_structure_segments.hh>
+
#include <QObject>
#include <QPainter>
#include <QStyleOptionViewItem>
#include <QModelIndex>
#include <QVarLengthArray>
#include <QList>
-
-#include <ost/mol/alg/sec_structure_segments.hh>
-
namespace ost { namespace gui {
class Painter : public QObject
diff --git a/modules/gui/src/sequence_viewer/secstr_row.cc b/modules/gui/src/sequence_viewer/secstr_row.cc
index 180a47469..2610fc1a2 100644
--- a/modules/gui/src/sequence_viewer/secstr_row.cc
+++ b/modules/gui/src/sequence_viewer/secstr_row.cc
@@ -22,7 +22,6 @@
*/
-#include <QtGui>
#include <ost/mol/mol.hh>
#include <ost/mol/view_op.hh>
@@ -31,6 +30,7 @@
#include "secstr_row.hh"
+#include <QtGui>
namespace ost { namespace gui {
SecStrRow::SecStrRow(const QString& name, mol::ChainView& chain, SequenceViewObject* parent) : SequenceRow(name,parent)
diff --git a/modules/gui/src/sequence_viewer/secstr_row.hh b/modules/gui/src/sequence_viewer/secstr_row.hh
index 4b6bd2762..7a9d7991d 100644
--- a/modules/gui/src/sequence_viewer/secstr_row.hh
+++ b/modules/gui/src/sequence_viewer/secstr_row.hh
@@ -23,14 +23,14 @@
Author: Stefan Scheuber
*/
-#include <QObject>
-#include <QVarLengthArray>
#include <ost/mol/chain_view.hh>
#include <ost/mol/alg/sec_structure_segments.hh>
#include "sequence_row.hh"
+#include <QObject>
+#include <QVarLengthArray>
namespace ost { namespace gui {
class SecStrRow : public SequenceRow
diff --git a/modules/gui/src/sequence_viewer/seq_secstr_painter.cc b/modules/gui/src/sequence_viewer/seq_secstr_painter.cc
index 0929a9527..df3a284d8 100644
--- a/modules/gui/src/sequence_viewer/seq_secstr_painter.cc
+++ b/modules/gui/src/sequence_viewer/seq_secstr_painter.cc
@@ -22,10 +22,10 @@
*/
-#include <QtGui>
#include "seq_secstr_painter.hh"
+#include <QtGui>
namespace ost { namespace gui {
SeqSecStrPainter::SeqSecStrPainter(QObject* parent)
diff --git a/modules/gui/src/sequence_viewer/seq_secstr_painter.hh b/modules/gui/src/sequence_viewer/seq_secstr_painter.hh
index a00ebdfd3..3dc5fdcb4 100644
--- a/modules/gui/src/sequence_viewer/seq_secstr_painter.hh
+++ b/modules/gui/src/sequence_viewer/seq_secstr_painter.hh
@@ -23,10 +23,10 @@
Author: Stefan Scheuber
*/
-#include <QObject>
-#include <QVarLengthArray>
#include "painter.hh"
+#include <QObject>
+#include <QVarLengthArray>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/seq_selection_painter.cc b/modules/gui/src/sequence_viewer/seq_selection_painter.cc
index 847317196..4cff32d95 100644
--- a/modules/gui/src/sequence_viewer/seq_selection_painter.cc
+++ b/modules/gui/src/sequence_viewer/seq_selection_painter.cc
@@ -22,9 +22,9 @@
*/
-#include <QtGui>
#include "seq_selection_painter.hh"
+#include <QtGui>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/seq_selection_painter.hh b/modules/gui/src/sequence_viewer/seq_selection_painter.hh
index a98d5afb6..68174501a 100644
--- a/modules/gui/src/sequence_viewer/seq_selection_painter.hh
+++ b/modules/gui/src/sequence_viewer/seq_selection_painter.hh
@@ -23,9 +23,9 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include "painter.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/seq_text_painter.cc b/modules/gui/src/sequence_viewer/seq_text_painter.cc
index 50334bf39..ea1599e9e 100644
--- a/modules/gui/src/sequence_viewer/seq_text_painter.cc
+++ b/modules/gui/src/sequence_viewer/seq_text_painter.cc
@@ -22,10 +22,10 @@
*/
-#include <QtGui>
#include "seq_text_painter.hh"
+#include <QtGui>
namespace ost { namespace gui {
SeqTextPainter::SeqTextPainter(QObject* parent)
diff --git a/modules/gui/src/sequence_viewer/seq_text_painter.hh b/modules/gui/src/sequence_viewer/seq_text_painter.hh
index 429394cb4..89d319080 100644
--- a/modules/gui/src/sequence_viewer/seq_text_painter.hh
+++ b/modules/gui/src/sequence_viewer/seq_text_painter.hh
@@ -23,9 +23,9 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include "painter.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_delegate.cc b/modules/gui/src/sequence_viewer/sequence_delegate.cc
index 6bb36cac4..ba2598b85 100644
--- a/modules/gui/src/sequence_viewer/sequence_delegate.cc
+++ b/modules/gui/src/sequence_viewer/sequence_delegate.cc
@@ -22,8 +22,8 @@
*/
-#include <QtGui>
#include "sequence_delegate.hh"
+#include <QtGui>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_delegate.hh b/modules/gui/src/sequence_viewer/sequence_delegate.hh
index 3c74fcf54..4396faafa 100644
--- a/modules/gui/src/sequence_viewer/sequence_delegate.hh
+++ b/modules/gui/src/sequence_viewer/sequence_delegate.hh
@@ -23,10 +23,10 @@
Author: Stefan Scheuber
*/
-#include <QItemDelegate>
-#include <QModelIndex>
#include "sequence_model.hh"
+#include <QItemDelegate>
+#include <QModelIndex>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_model.cc b/modules/gui/src/sequence_viewer/sequence_model.cc
index 293ffe2d6..342a04e1f 100644
--- a/modules/gui/src/sequence_viewer/sequence_model.cc
+++ b/modules/gui/src/sequence_viewer/sequence_model.cc
@@ -21,10 +21,6 @@
Author: Stefan Scheuber
*/
-#include <QMap>
-#include <QMapIterator>
-
-#include <QtGui>
#include "title_row.hh"
@@ -33,6 +29,10 @@
#include "sequence_model.hh"
+#include <QMap>
+#include <QMapIterator>
+
+#include <QtGui>
namespace ost { namespace gui {
SequenceModel::SequenceModel(QObject *parent)
diff --git a/modules/gui/src/sequence_viewer/sequence_model.hh b/modules/gui/src/sequence_viewer/sequence_model.hh
index f05241df0..5a105c66f 100644
--- a/modules/gui/src/sequence_viewer/sequence_model.hh
+++ b/modules/gui/src/sequence_viewer/sequence_model.hh
@@ -23,8 +23,6 @@
Author: Stefan Scheuber
*/
-#include <QAbstractTableModel>
-#include <QItemSelection>
#include <ost/mol/chain_view.hh>
@@ -37,6 +35,8 @@
#include "alignment_view_object.hh"
#include "sequence_view_object.hh"
+#include <QAbstractTableModel>
+#include <QItemSelection>
namespace ost { namespace gui {
class SequenceModel : public QAbstractTableModel
diff --git a/modules/gui/src/sequence_viewer/sequence_row.cc b/modules/gui/src/sequence_viewer/sequence_row.cc
index f614799f1..5537b9f82 100644
--- a/modules/gui/src/sequence_viewer/sequence_row.cc
+++ b/modules/gui/src/sequence_viewer/sequence_row.cc
@@ -22,7 +22,6 @@
*/
-#include <QtGui>
#include <ost/mol/mol.hh>
#include <ost/mol/view_op.hh>
@@ -32,6 +31,7 @@
#include "sequence_view_object.hh"
#include "sequence_row.hh"
+#include <QtGui>
namespace ost { namespace gui {
SequenceRow::SequenceRow(const QString& name, seq::SequenceHandle& sequence, SequenceViewObject* parent) : BaseRow(QFont("Courier",11),parent), name_(name), name_font_(QFont("Courier",11)), sequence_(sequence)
diff --git a/modules/gui/src/sequence_viewer/sequence_row.hh b/modules/gui/src/sequence_viewer/sequence_row.hh
index 51979f330..1665366ba 100644
--- a/modules/gui/src/sequence_viewer/sequence_row.hh
+++ b/modules/gui/src/sequence_viewer/sequence_row.hh
@@ -23,11 +23,11 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include <ost/seq/sequence_handle.hh>
#include "base_row.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_table_view.cc b/modules/gui/src/sequence_viewer/sequence_table_view.cc
index baa69d825..a4998dcf3 100644
--- a/modules/gui/src/sequence_viewer/sequence_table_view.cc
+++ b/modules/gui/src/sequence_viewer/sequence_table_view.cc
@@ -21,14 +21,14 @@
Author: Stefan Scheuber
*/
+
+#include "sequence_table_view.hh"
+#include "sequence_model.hh"
#include <QHeaderView>
#include <QScrollBar>
#include <QTableWidgetItem>
#include <QMouseEvent>
-#include "sequence_table_view.hh"
-#include "sequence_model.hh"
-
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/sequence_table_view.hh b/modules/gui/src/sequence_viewer/sequence_table_view.hh
index e138d07ea..3114a8f6e 100644
--- a/modules/gui/src/sequence_viewer/sequence_table_view.hh
+++ b/modules/gui/src/sequence_viewer/sequence_table_view.hh
@@ -23,13 +23,13 @@
Author: Stefan Scheuber
*/
-#include <QTableView>
-#include <QWheelEvent>
#include <ost/gui/module_config.hh>
#include "sequence_delegate.hh"
+#include <QTableView>
+#include <QWheelEvent>
namespace ost { namespace gui {
/// \brief QTableView with first column not moving
diff --git a/modules/gui/src/sequence_viewer/sequence_view_object.cc b/modules/gui/src/sequence_viewer/sequence_view_object.cc
index fdc227d2e..40a46a519 100644
--- a/modules/gui/src/sequence_viewer/sequence_view_object.cc
+++ b/modules/gui/src/sequence_viewer/sequence_view_object.cc
@@ -22,7 +22,6 @@
*/
-#include <QtGui>
#include <ost/mol/mol.hh>
#include <ost/mol/view_op.hh>
@@ -32,6 +31,7 @@
#include "sequence_view_object.hh"
+#include <QtGui>
namespace ost { namespace gui {
const QString SequenceViewObject::properties_mode = "Highlight properties";
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.cc b/modules/gui/src/sequence_viewer/sequence_viewer.cc
index 2d38f5e69..79c13057f 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.cc
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.cc
@@ -20,18 +20,9 @@
/*
Author: Stefan Scheuber
*/
+#include <ost/gui/gosty_app.hh>
#include <boost/pointer_cast.hpp>
-#include <QAbstractItemView>
-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
-#include <QHeaderView>
-#include <QMenu>
-#include <QPushButton>
-#include <QShortcut>
-#include <QVBoxLayout>
-#include <QVarLengthArray>
#include <ost/platform.hh>
#include <ost/mol/chain_view.hh>
@@ -44,11 +35,20 @@
#include <ost/gfx/gfx_node_visitor.hh>
#include <ost/gui/widget_registry.hh>
-#include <ost/gui/gosty_app.hh>
#include "sequence_model.hh"
#include "sequence_viewer.hh"
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+#include <QHeaderView>
+#include <QMenu>
+#include <QPushButton>
+#include <QShortcut>
+#include <QVBoxLayout>
+#include <QVarLengthArray>
namespace ost { namespace gui {
class SequenceViewerFactory: public WidgetFactory {
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.hh b/modules/gui/src/sequence_viewer/sequence_viewer.hh
index 1939eddb1..6a3c49efc 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.hh
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.hh
@@ -23,9 +23,6 @@
Author: Stefan Scheuber
*/
-#include <QWidget>
-#include <QActionGroup>
-#include <QToolBar>
#include <ost/seq/alignment_handle.hh>
@@ -40,6 +37,9 @@
#include "sequence_model.hh"
#include "sequence_table_view.hh"
+#include <QWidget>
+#include <QActionGroup>
+#include <QToolBar>
namespace ost { namespace gui {
/// \brief QTableView with first column not moving
diff --git a/modules/gui/src/sequence_viewer/tick_painter.hh b/modules/gui/src/sequence_viewer/tick_painter.hh
index d5c6c4fff..11ff679bb 100644
--- a/modules/gui/src/sequence_viewer/tick_painter.hh
+++ b/modules/gui/src/sequence_viewer/tick_painter.hh
@@ -23,9 +23,9 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include "painter.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/sequence_viewer/title_row.cc b/modules/gui/src/sequence_viewer/title_row.cc
index 727aa0239..b8b05fbca 100644
--- a/modules/gui/src/sequence_viewer/title_row.cc
+++ b/modules/gui/src/sequence_viewer/title_row.cc
@@ -22,11 +22,11 @@
*/
-#include <QtGui>
#include "sequence_model.hh"
#include "title_row.hh"
+#include <QtGui>
namespace ost { namespace gui {
TitleRow::TitleRow(QObject* parent) : BaseRow(QFont("Courier",10),parent), font_("Verdana",9), small_font_("Verdana",7)
diff --git a/modules/gui/src/sequence_viewer/title_row.hh b/modules/gui/src/sequence_viewer/title_row.hh
index 6274d3c13..409d62e50 100644
--- a/modules/gui/src/sequence_viewer/title_row.hh
+++ b/modules/gui/src/sequence_viewer/title_row.hh
@@ -23,9 +23,9 @@
Author: Stefan Scheuber
*/
-#include <QObject>
#include "base_row.hh"
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/thin_splitter.cc b/modules/gui/src/thin_splitter.cc
index 94455343f..aed72b937 100644
--- a/modules/gui/src/thin_splitter.cc
+++ b/modules/gui/src/thin_splitter.cc
@@ -16,6 +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 "thin_splitter.hh"
+
#include <QRegion>
#include <QPainter>
#include <QResizeEvent>
@@ -23,9 +26,6 @@
#include <QSplitterHandle>
#include <QApplication>
#include <QPalette>
-
-#include "thin_splitter.hh"
-
/*
Author: Marco Biasini
*/
diff --git a/modules/gui/src/tools/manipulator.cc b/modules/gui/src/tools/manipulator.cc
index ac50e4dd2..29fe8b703 100644
--- a/modules/gui/src/tools/manipulator.cc
+++ b/modules/gui/src/tools/manipulator.cc
@@ -16,7 +16,7 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QDir>
+#include <ost/gui/gosty_app.hh>
#include <ost/platform.hh>
@@ -24,11 +24,11 @@
#include <ost/gfx/gfx_object.hh>
#include <ost/gfx/gfx_node.hh>
-#include <ost/gui/gosty_app.hh>
#include <ost/gui/scene_selection.hh>
#include "manipulator.hh"
+#include <QDir>
namespace ost { namespace gui {
Manipulator::Manipulator():
diff --git a/modules/gui/src/tools/manipulator.hh b/modules/gui/src/tools/manipulator.hh
index 2fb4cbbe4..2affc6628 100644
--- a/modules/gui/src/tools/manipulator.hh
+++ b/modules/gui/src/tools/manipulator.hh
@@ -22,13 +22,14 @@
/*
Author: Marco Biasini
*/
-#include <QList>
#include <ost/gui/module_config.hh>
#include <ost/gfx/input.hh>
#include <ost/gui/tools/tool.hh>
+#include <QList>
+
namespace ost { namespace gui {
class Manipulator;
diff --git a/modules/gui/src/tools/map_tool.cc b/modules/gui/src/tools/map_tool.cc
index 58b67d3e7..ef2a78441 100644
--- a/modules/gui/src/tools/map_tool.cc
+++ b/modules/gui/src/tools/map_tool.cc
@@ -16,17 +16,17 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QDir>
+#include <ost/gui/gosty_app.hh>
#include <ost/platform.hh>
#include <ost/gfx/map_iso.hh>
#include <ost/gfx/map_slab.hh>
#include <ost/gfx/scene.hh>
#include <ost/gui/scene_selection.hh>
-#include <ost/gui/gosty_app.hh>
#include "map_tool.hh"
+#include <QDir>
namespace ost { namespace gui {
MapTool::MapTool():
diff --git a/modules/gui/src/tools/map_tool.hh b/modules/gui/src/tools/map_tool.hh
index 2d1257cb8..35547b515 100644
--- a/modules/gui/src/tools/map_tool.hh
+++ b/modules/gui/src/tools/map_tool.hh
@@ -22,10 +22,10 @@
/*
Author: Ansgar Philippsen
*/
-#include <QList>
#include <ost/gui/tools/tool.hh>
+#include <QList>
namespace ost { namespace gui {
class DLLEXPORT_OST_GUI MapTool : public Tool {
diff --git a/modules/gui/src/tools/measure_tool.cc b/modules/gui/src/tools/measure_tool.cc
index ac8c29514..4247e2f83 100644
--- a/modules/gui/src/tools/measure_tool.cc
+++ b/modules/gui/src/tools/measure_tool.cc
@@ -27,7 +27,6 @@
#include <iostream>
#include <sstream>
-#include <QDir>
#include <ost/platform.hh>
#include <ost/gfx/scene.hh>
@@ -36,6 +35,7 @@
#include <ost/geom/vec3.hh>
+#include <QDir>
namespace ost { namespace gui {
MeasureTool::MeasureTool()
diff --git a/modules/gui/src/tools/measure_tool.hh b/modules/gui/src/tools/measure_tool.hh
index 77b5f627f..d1eedcef7 100644
--- a/modules/gui/src/tools/measure_tool.hh
+++ b/modules/gui/src/tools/measure_tool.hh
@@ -22,12 +22,12 @@
/*
Author: Tobias Schmidt
*/
-#include <QList>
#include <ost/gui/tools/tool.hh>
#include <ost/mol/atom_handle.hh>
#include <ost/gfx/color.hh>
+#include <QList>
namespace ost { namespace gui {
class DLLEXPORT_OST_GUI Measurement {
diff --git a/modules/gui/src/tools/selection_tool.cc b/modules/gui/src/tools/selection_tool.cc
index 047577a62..dfc45ca8f 100644
--- a/modules/gui/src/tools/selection_tool.cc
+++ b/modules/gui/src/tools/selection_tool.cc
@@ -21,13 +21,13 @@
*/
#include "selection_tool.hh"
-#include <QDir>
#include <ost/platform.hh>
#include <ost/gfx/scene.hh>
#include <ost/gui/gl_canvas.hh>
+#include <QDir>
namespace ost { namespace gui {
SelectionTool::SelectionTool()
diff --git a/modules/gui/src/tools/selection_tool.hh b/modules/gui/src/tools/selection_tool.hh
index d805ced22..a02102fdb 100644
--- a/modules/gui/src/tools/selection_tool.hh
+++ b/modules/gui/src/tools/selection_tool.hh
@@ -22,10 +22,10 @@
/*
Author: Marco Biasini
*/
-#include <QList>
#include <ost/gui/tools/tool.hh>
+#include <QList>
namespace ost { namespace gui {
diff --git a/modules/gui/src/tools/tool.hh b/modules/gui/src/tools/tool.hh
index 24f453690..0be85bc7d 100644
--- a/modules/gui/src/tools/tool.hh
+++ b/modules/gui/src/tools/tool.hh
@@ -24,13 +24,14 @@
*/
#include <vector>
-#include <QIcon>
#include <ost/gui/module_config.hh>
#include <ost/gfx/gfx_node.hh>
#include <ost/gui/tools/mouse_event.hh>
#include <ost/gui/tools/tool_options.hh>
+#include <QIcon>
+
namespace ost { namespace gui {
class ToolOptions;
diff --git a/modules/gui/src/tools/tool_bar.cc b/modules/gui/src/tools/tool_bar.cc
index 11621af0f..e4babc0ed 100644
--- a/modules/gui/src/tools/tool_bar.cc
+++ b/modules/gui/src/tools/tool_bar.cc
@@ -16,15 +16,15 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QAction>
-#include <QDebug>
-#include <QActionGroup>
+#include <ost/gui/gosty_app.hh>
#include <ost/mol/query_view_wrapper.hh>
#include <ost/gui/tools/tool_manager.hh>
-#include <ost/gui/gosty_app.hh>
#include "tool_bar.hh"
+#include <QAction>
+#include <QDebug>
+#include <QActionGroup>
namespace ost { namespace gui {
ToolBar::ToolBar(QWidget* parent):
diff --git a/modules/gui/src/tools/tool_bar.hh b/modules/gui/src/tools/tool_bar.hh
index 1e95d5bbf..f58594cc5 100644
--- a/modules/gui/src/tools/tool_bar.hh
+++ b/modules/gui/src/tools/tool_bar.hh
@@ -23,13 +23,13 @@
Author: Marco Biasini
*/
-#include <QToolBar>
-#include <QList>
#include <ost/gfx/gfx_node.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/tools/tool.hh>
+#include <QToolBar>
+#include <QList>
class QActionGroup;
diff --git a/modules/gui/src/tools/tool_manager.hh b/modules/gui/src/tools/tool_manager.hh
index 5fa48b05e..d571f0015 100644
--- a/modules/gui/src/tools/tool_manager.hh
+++ b/modules/gui/src/tools/tool_manager.hh
@@ -20,10 +20,10 @@
#define OST_GUI_TOOL_MANAGER_HH
#include <ost/gui/module_config.hh>
-#include <QObject>
#include <ost/gui/tools/tool.hh>
+#include <QObject>
/*
Author: Marco Biasini
*/
diff --git a/modules/gui/src/tools/tool_option.hh b/modules/gui/src/tools/tool_option.hh
index 793974be0..ff08fad0d 100644
--- a/modules/gui/src/tools/tool_option.hh
+++ b/modules/gui/src/tools/tool_option.hh
@@ -26,9 +26,10 @@
#include <limits>
#include <vector>
-#include <QObject>
#include <ost/gui/module_config.hh>
+#include <QObject>
+
namespace ost { namespace gui {
diff --git a/modules/gui/src/tools/tool_option_group.hh b/modules/gui/src/tools/tool_option_group.hh
index 6b47d0ed6..ead9a57e3 100644
--- a/modules/gui/src/tools/tool_option_group.hh
+++ b/modules/gui/src/tools/tool_option_group.hh
@@ -23,11 +23,11 @@
Author: Marco Biasini
*/
-#include <QObject>
#include <ost/gui/module_config.hh>
#include <ost/gui/tools/tool_option.hh>
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/tools/tool_options.hh b/modules/gui/src/tools/tool_options.hh
index fd7d20d2c..f4c9adeda 100644
--- a/modules/gui/src/tools/tool_options.hh
+++ b/modules/gui/src/tools/tool_options.hh
@@ -23,11 +23,11 @@
Author: Marco Biasini
*/
-#include <QObject>
#include <ost/gui/module_config.hh>
#include <ost/gui/tools/tool_option_group.hh>
+#include <QObject>
namespace ost { namespace gui {
diff --git a/modules/gui/src/tools/tool_options_win.cc b/modules/gui/src/tools/tool_options_win.cc
index ecc1c1e40..56b2f551d 100644
--- a/modules/gui/src/tools/tool_options_win.cc
+++ b/modules/gui/src/tools/tool_options_win.cc
@@ -16,14 +16,14 @@
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
-#include <QVBoxLayout>
+#include <ost/gui/gosty_app.hh>
#include <ost/gui/tools/tool_options_win.hh>
#include <ost/gui/widget_registry.hh>
#include <ost/gui/tools/tool_options_widget.hh>
#include <ost/gui/tools/tool_manager.hh>
-#include <ost/gui/gosty_app.hh>
+#include <QVBoxLayout>
namespace ost { namespace gui {
diff --git a/modules/gui/src/tools/tool_options_win.hh b/modules/gui/src/tools/tool_options_win.hh
index 08347ac99..9c1d7900c 100644
--- a/modules/gui/src/tools/tool_options_win.hh
+++ b/modules/gui/src/tools/tool_options_win.hh
@@ -21,13 +21,13 @@
#include <map>
-#include <QStackedWidget>
#include <ost/gui/module_config.hh>
#include <ost/gui/tools/tool.hh>
#include <ost/gui/widget.hh>
+#include <QStackedWidget>
/*
Author: Marco Biasini
diff --git a/modules/gui/src/widget.hh b/modules/gui/src/widget.hh
index 9aeb1bbfa..45252b047 100644
--- a/modules/gui/src/widget.hh
+++ b/modules/gui/src/widget.hh
@@ -19,11 +19,11 @@
#ifndef OST_GUI_WIDGET_HH
#define OST_GUI_WIDGET_HH
-#include <QWidget>
-#include <QMetaType>
#include <ost/gui/module_config.hh>
+#include <QWidget>
+#include <QMetaType>
/*
Author: Marco Biasini
*/
diff --git a/modules/gui/src/widget_geom_handler.cc b/modules/gui/src/widget_geom_handler.cc
index 6b9914157..aa2acd8d9 100644
--- a/modules/gui/src/widget_geom_handler.cc
+++ b/modules/gui/src/widget_geom_handler.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 <QSettings>
#include <iostream>
#include "widget_geom_handler.hh"
+#include <QSettings>
namespace ost { namespace gui {
WidgetGeomHandler::WidgetGeomHandler(const QString& name, QWidget* widget, QWidget* parent)
diff --git a/modules/gui/src/widget_geom_handler.hh b/modules/gui/src/widget_geom_handler.hh
index 070a7ae7f..164719ba4 100644
--- a/modules/gui/src/widget_geom_handler.hh
+++ b/modules/gui/src/widget_geom_handler.hh
@@ -19,10 +19,10 @@
#ifndef OST_GUI_WIDGET_GEOM_HANDLER_HH
#define OST_GUI_WIDGET_GEOM_HANDLER_HH
-#include <QWidget>
#include <ost/gui/module_config.hh>
+#include <QWidget>
namespace ost { namespace gui {
class DLLEXPORT_OST_GUI WidgetGeomHandler: public QObject{
diff --git a/modules/gui/src/widget_pool.hh b/modules/gui/src/widget_pool.hh
index 7555a2116..8a938c635 100644
--- a/modules/gui/src/widget_pool.hh
+++ b/modules/gui/src/widget_pool.hh
@@ -19,8 +19,8 @@
#ifndef OST_GUI_WIDGET_POOL_HH
#define OST_GUI_WIDGET_POOL_HH
-#include <QSettings>
#include <ost/gui/widget.hh>
+#include <QSettings>
/*
Author: Marco Biasini, Stefan Scheuber
*/
diff --git a/modules/gui/src/widget_registry.cc b/modules/gui/src/widget_registry.cc
index d528f701d..965545f12 100644
--- a/modules/gui/src/widget_registry.cc
+++ b/modules/gui/src/widget_registry.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 <QDebug>
#include "widget_registry.hh"
+#include <QDebug>
namespace ost { namespace gui {
--
GitLab