From ee0c22d9161470619613fdccabb9e9677bd2abd4 Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Wed, 2 Mar 2011 08:57:28 +0100
Subject: [PATCH] reduce number of includes (II). this time mainly in the gui
module
---
modules/gui/pymod/export_perspective.cc | 1 +
modules/gui/pymod/export_scene_selection.cc | 3 ++-
modules/gui/src/file_browser.cc | 3 +++
modules/gui/src/file_browser.hh | 10 +++++++---
modules/gui/src/file_type_dialog.cc | 3 +++
modules/gui/src/file_type_dialog.hh | 5 +++--
modules/gui/src/file_viewer.cc | 4 ++++
modules/gui/src/file_viewer.hh | 9 ++++++---
modules/gui/src/gl_canvas.cc | 3 +++
modules/gui/src/gl_canvas.hh | 11 ++++++-----
modules/gui/src/gl_win.cc | 1 +
modules/gui/src/gl_win.hh | 5 +++--
modules/gui/src/main.cc | 13 +++++--------
modules/gui/src/main.hh | 9 ++++-----
modules/gui/src/perspective.cc | 5 +++++
modules/gui/src/perspective.hh | 6 ------
modules/gui/src/scene_selection.hh | 2 +-
modules/gui/src/scene_win/current_selection_node.cc | 7 ++++++-
modules/gui/src/scene_win/current_selection_node.hh | 3 +--
modules/gui/src/scene_win/render_mode_node.cc | 2 ++
modules/gui/src/scene_win/render_mode_node.hh | 7 ++-----
modules/gui/src/scene_win/render_modes_node.cc | 5 +++--
modules/gui/src/scene_win/render_modes_node.hh | 6 ------
modules/gui/src/scene_win/scene_win.hh | 2 +-
24 files changed, 72 insertions(+), 53 deletions(-)
diff --git a/modules/gui/pymod/export_perspective.cc b/modules/gui/pymod/export_perspective.cc
index 5c24dd607..9e234279a 100644
--- a/modules/gui/pymod/export_perspective.cc
+++ b/modules/gui/pymod/export_perspective.cc
@@ -19,6 +19,7 @@
#include <boost/python.hpp>
#include <QMdiArea>
+#include <QMenuBar>
#include <ost/gui/perspective.hh>
#include <ost/gui/main_area.hh>
diff --git a/modules/gui/pymod/export_scene_selection.cc b/modules/gui/pymod/export_scene_selection.cc
index 28a283fe7..7b05d2bf8 100644
--- a/modules/gui/pymod/export_scene_selection.cc
+++ b/modules/gui/pymod/export_scene_selection.cc
@@ -21,7 +21,8 @@ using namespace boost::python;
#include <ost/gui/scene_selection.hh>
#include <ost/gfx/gfx_node.hh>
-
+#include <ost/gfx/entity.hh>
+#include <ost/gfx/gfx_object.hh>
using namespace ost;
using namespace ost::gui;
diff --git a/modules/gui/src/file_browser.cc b/modules/gui/src/file_browser.cc
index 905d7e93a..a6bf49fb3 100644
--- a/modules/gui/src/file_browser.cc
+++ b/modules/gui/src/file_browser.cc
@@ -52,6 +52,9 @@
#include <QDir>
#include <QFileInfo>
#include <QUrl>
+#include <QDirModel>
+#include <QListView>
+#include <QComboBox>
namespace ost { namespace gui {
diff --git a/modules/gui/src/file_browser.hh b/modules/gui/src/file_browser.hh
index b8d067a9b..b68b837fe 100644
--- a/modules/gui/src/file_browser.hh
+++ b/modules/gui/src/file_browser.hh
@@ -24,9 +24,13 @@
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
-#include <QDirModel>
-#include <QListView>
-#include <QComboBox>
+#include <QModelIndex>
+#include <QDir>
+
+class QDirModel;
+class QListView;
+class QComboBox;
+
namespace ost { namespace gui {
diff --git a/modules/gui/src/file_type_dialog.cc b/modules/gui/src/file_type_dialog.cc
index 5c1a28923..ed226aba8 100644
--- a/modules/gui/src/file_type_dialog.cc
+++ b/modules/gui/src/file_type_dialog.cc
@@ -22,11 +22,14 @@
#include <ost/io/io_manager.hh>
#include <ost/io/io_exception.hh>
+
#include <QPushButton>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QTableWidgetItem>
#include <QHeaderView>
+#include <QTableWidget>
+#include <QLabel>
namespace ost { namespace gui {
diff --git a/modules/gui/src/file_type_dialog.hh b/modules/gui/src/file_type_dialog.hh
index e3babdc42..4cd7746af 100644
--- a/modules/gui/src/file_type_dialog.hh
+++ b/modules/gui/src/file_type_dialog.hh
@@ -35,9 +35,10 @@
#endif
#include <QDialog>
-#include <QTableWidget>
-#include <QLabel>
+#include <QMetaType>
+class QTableWidget;
+class 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 1b3ac7a52..a5c5d7271 100644
--- a/modules/gui/src/file_viewer.cc
+++ b/modules/gui/src/file_viewer.cc
@@ -21,7 +21,11 @@
#include "file_viewer.hh"
+#include <QMainWindow>
+#include <QSyntaxHighlighter>
+#include <QTextEdit>
#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 a245423f9..d82217ccd 100644
--- a/modules/gui/src/file_viewer.hh
+++ b/modules/gui/src/file_viewer.hh
@@ -22,9 +22,12 @@
#include <ost/gui/module_config.hh>
-#include <QMainWindow>
-#include <QSyntaxHighlighter>
-#include <QTextEdit>
+
+#include <QWidget>
+
+class QTextEdit;
+class QSyntaxHighlighter;
+
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 4b677a2cc..2d631931b 100644
--- a/modules/gui/src/gl_canvas.cc
+++ b/modules/gui/src/gl_canvas.cc
@@ -38,6 +38,9 @@
#include <QStatusBar>
#include <QApplication>
#include <QClipboard>
+#include <QTime>
+#include <QBasicTimer>
+#include <QMouseEvent>
#include <QMenu>
#if QT_VERSION >= 0x040600
diff --git a/modules/gui/src/gl_canvas.hh b/modules/gui/src/gl_canvas.hh
index ad84d2b5c..dbc879e91 100644
--- a/modules/gui/src/gl_canvas.hh
+++ b/modules/gui/src/gl_canvas.hh
@@ -20,18 +20,19 @@
#define OST_GUI_GL_CANVAS_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>
+
+// Qt includes must come last
+#include <QGLWidget>
+#include <QBasicTimer>
class QMenu;
+class QMouseEvent;
namespace ost { namespace gui {
diff --git a/modules/gui/src/gl_win.cc b/modules/gui/src/gl_win.cc
index f5b8ea561..cfaade7ea 100644
--- a/modules/gui/src/gl_win.cc
+++ b/modules/gui/src/gl_win.cc
@@ -42,6 +42,7 @@
#include <QLabel>
#include <QStatusBar>
#include <QVBoxLayout>
+#include <QStatusBar>
/*
Authors: Ansgar Philippsen, Marco Biasini
diff --git a/modules/gui/src/gl_win.hh b/modules/gui/src/gl_win.hh
index d808d03ff..3e32df5c2 100644
--- a/modules/gui/src/gl_win.hh
+++ b/modules/gui/src/gl_win.hh
@@ -25,10 +25,11 @@
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
-#include <QAction>
#include <QGLFormat>
#include <QActionGroup>
-#include <QStatusBar>
+
+class QStatusBar;
+class QAction;
/*
Authors: Ansgar Philippsen, Marco Biasini
diff --git a/modules/gui/src/main.cc b/modules/gui/src/main.cc
index 2b43e1371..61d6b05d8 100644
--- a/modules/gui/src/main.cc
+++ b/modules/gui/src/main.cc
@@ -45,16 +45,13 @@
#include <QDragEnterEvent>
#include <QList>
#include <QUrl>
-//#include "xpm/ost_small.xpm"
+#include <QMdiArea>
+#include <QAction>
+#include <QFile>
+#include <QDragEnterEvent>
+#include <QDropEvent>
namespace ost { namespace gui {
-#if 0
-namespace {
-
-static QString ost_about_str("The OpenStructure Project\n\nCodename OST\n\nLead Design and Programming\n Ansgar Philippsen\n Marco Biasini\n\nTeam\n Pascal Benkert\n Jurgen Haas\n Valerio Mariani\n Andreas Schenk\n Tobias Schmidt\n Torsten Schwede\n\n\n www.openstructure.org ");
-
-}
-#endif
QSize GostyMainWindow::GetDefaultSize()
{
diff --git a/modules/gui/src/main.hh b/modules/gui/src/main.hh
index 57d5a46a1..deee07972 100644
--- a/modules/gui/src/main.hh
+++ b/modules/gui/src/main.hh
@@ -30,11 +30,10 @@
// Qt headers must come last
#include <QMainWindow>
-#include <QMdiArea>
-#include <QAction>
-#include <QFile>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+
+class QDropEvent;
+class QDragEnterEvent;
+class QCloseEvent;
namespace ost { namespace gui {
diff --git a/modules/gui/src/perspective.cc b/modules/gui/src/perspective.cc
index f3ac9850a..b95b6f5ef 100644
--- a/modules/gui/src/perspective.cc
+++ b/modules/gui/src/perspective.cc
@@ -41,6 +41,11 @@
#include <QKeySequence>
#include <QStatusBar>
#include <QPushButton>
+#include <QMenuBar>
+#include <QMap>
+#include <QString>
+#include <QStatusBar>
+
/*
Author: Marco Biasini
*/
diff --git a/modules/gui/src/perspective.hh b/modules/gui/src/perspective.hh
index e0ad2c496..19500cfd3 100644
--- a/modules/gui/src/perspective.hh
+++ b/modules/gui/src/perspective.hh
@@ -27,12 +27,6 @@
#include <ost/gui/module_config.hh>
#include <QObject>
-#include <QMenuBar>
-#include <QMap>
-#include <QString>
-#include <QMenu>
-#include <QStatusBar>
-
class QMenu;
class QMenuBar;
diff --git a/modules/gui/src/scene_selection.hh b/modules/gui/src/scene_selection.hh
index 61b8c9391..53419a3ae 100644
--- a/modules/gui/src/scene_selection.hh
+++ b/modules/gui/src/scene_selection.hh
@@ -22,7 +22,7 @@
#include <ost/mol/query_view_wrapper.hh>
-#include <ost/gfx/entity.hh>
+#include <ost/gfx/entity_fw.hh>
#include <ost/gfx/gfx_node_fw.hh>
#include <ost/gui/module_config.hh>
diff --git a/modules/gui/src/scene_win/current_selection_node.cc b/modules/gui/src/scene_win/current_selection_node.cc
index 6f7eeddaa..d10da3813 100644
--- a/modules/gui/src/scene_win/current_selection_node.cc
+++ b/modules/gui/src/scene_win/current_selection_node.cc
@@ -22,6 +22,7 @@
#include <ost/gui/scene_win/scene_win_model.hh>
#include <ost/gfx/scene.hh>
#include <ost/gfx/gfx_node.hh>
+#include <ost/gfx/entity.hh>
#include <ost/gui/scene_win/scene_win.hh>
@@ -30,7 +31,11 @@
#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())){
+CurrentSelectionNode::CurrentSelectionNode(gfx::EntityP entity,
+ SceneNode* parent):
+ EntityPartNode("Current Selection", entity,
+ mol::QueryViewWrapper(entity->GetSelection()),parent),
+ wrapper_(mol::QueryViewWrapper(entity->GetSelection())){
}
void CurrentSelectionNode::SetQueryView(mol::QueryViewWrapper part)
diff --git a/modules/gui/src/scene_win/current_selection_node.hh b/modules/gui/src/scene_win/current_selection_node.hh
index 9a63219d9..45d97225c 100644
--- a/modules/gui/src/scene_win/current_selection_node.hh
+++ b/modules/gui/src/scene_win/current_selection_node.hh
@@ -23,7 +23,6 @@
#include <ost/mol/entity_view.hh>
#include <ost/mol/query_view_wrapper.hh>
-#include <ost/gfx/entity.hh>
#include <ost/gfx/entity_fw.hh>
#include <ost/gui/module_config.hh>
@@ -37,7 +36,7 @@
*/
namespace ost { namespace gui {
-
+
class DLLEXPORT_OST_GUI CurrentSelectionNode : public EntityPartNode {
Q_OBJECT
public:
diff --git a/modules/gui/src/scene_win/render_mode_node.cc b/modules/gui/src/scene_win/render_mode_node.cc
index de6bc6fe6..bba7f59ab 100644
--- a/modules/gui/src/scene_win/render_mode_node.cc
+++ b/modules/gui/src/scene_win/render_mode_node.cc
@@ -18,6 +18,8 @@
//------------------------------------------------------------------------------
#include <ost/mol/query_view_wrapper.hh>
+#include <ost/gfx/entity.hh>
+
#include <ost/gui/scene_win/scene_win_model.hh>
#include "render_mode_node.hh"
diff --git a/modules/gui/src/scene_win/render_mode_node.hh b/modules/gui/src/scene_win/render_mode_node.hh
index fb7304379..45984b7ce 100644
--- a/modules/gui/src/scene_win/render_mode_node.hh
+++ b/modules/gui/src/scene_win/render_mode_node.hh
@@ -23,12 +23,8 @@
#include <ost/mol/entity_view.hh>
#include <ost/mol/query_view_wrapper.hh>
-#include <ost/gfx/entity.hh>
#include <ost/gfx/entity_fw.hh>
#include <ost/gfx/render_mode.hh>
-#include <ost/gfx/scene_observer.hh>
-#include <ost/gfx/gfx_object.hh>
-#include <ost/gfx/gfx_object_fw.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/entity_part_node.hh>
@@ -45,7 +41,8 @@ namespace ost { namespace gui {
class DLLEXPORT_OST_GUI RenderModeNode : public EntityPartNode {
Q_OBJECT
public:
- RenderModeNode(gfx::EntityP entity, gfx::RenderMode::Type render_mode, SceneNode* node_parent );
+ RenderModeNode(gfx::EntityP entity, gfx::RenderMode::Type render_mode,
+ SceneNode* node_parent);
virtual QVariant GetData(int column, int role);
virtual bool SetData(int column, const QVariant& value, int role);
diff --git a/modules/gui/src/scene_win/render_modes_node.cc b/modules/gui/src/scene_win/render_modes_node.cc
index 611cc3561..68661b097 100644
--- a/modules/gui/src/scene_win/render_modes_node.cc
+++ b/modules/gui/src/scene_win/render_modes_node.cc
@@ -22,7 +22,7 @@
#include <ost/gfx/scene.hh>
#include <ost/gfx/gfx_node.hh>
-
+#include <ost/gfx/entity.hh>
#include <ost/gui/scene_win/scene_win.hh>
#include <ost/gui/scene_win/scene_win_model.hh>
#include "render_modes_node.hh"
@@ -31,7 +31,8 @@
namespace ost { namespace gui {
-RenderModesNode::RenderModesNode(gfx::EntityP entity, SceneNode* parent):LabelNode("Render Modes",parent),node_(entity){
+RenderModesNode::RenderModesNode(gfx::EntityP entity, SceneNode* parent):
+ LabelNode("Render Modes",parent),node_(entity) {
SceneWinModel* model = GostyApp::Instance()->GetSceneWin()->GetModel();
model->AddNode(parent, this);
diff --git a/modules/gui/src/scene_win/render_modes_node.hh b/modules/gui/src/scene_win/render_modes_node.hh
index dbb5c1c2b..024d45f8e 100644
--- a/modules/gui/src/scene_win/render_modes_node.hh
+++ b/modules/gui/src/scene_win/render_modes_node.hh
@@ -19,14 +19,8 @@
#ifndef OST_GUI_SCENE_WIN_RENDER_MODES_NODE_HH
#define OST_GUI_SCENE_WIN_RENDER_MODES_NODE_HH
-
-#include <ost/gfx/entity.hh>
#include <ost/gfx/entity_fw.hh>
-#include <ost/gfx/gfx_node.hh>
#include <ost/gfx/gfx_node_fw.hh>
-#include <ost/gfx/scene_observer.hh>
-#include <ost/gfx/gfx_object.hh>
-#include <ost/gfx/gfx_object_fw.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/label_node.hh>
diff --git a/modules/gui/src/scene_win/scene_win.hh b/modules/gui/src/scene_win/scene_win.hh
index 08309508f..d84669079 100644
--- a/modules/gui/src/scene_win/scene_win.hh
+++ b/modules/gui/src/scene_win/scene_win.hh
@@ -23,7 +23,7 @@
#include <ost/mol/query_view_wrapper.hh>
#include <ost/gfx/gfx_node_fw.hh>
-#include <ost/gfx/entity.hh>
+#include <ost/gfx/entity_fw.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/widget.hh>
--
GitLab