reduce number of includes (II). this time mainly in the gui module

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>

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;
 

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 {
 

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 {
 
 

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 {
 
 

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

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):

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

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

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 {
 

modules/gui/src/gl_win.cc

@@ -42,6 +42,7 @@
 #include <QLabel>
 #include <QStatusBar>
 #include <QVBoxLayout>
+#include <QStatusBar>
 
 /*
   Authors: Ansgar Philippsen, Marco Biasini

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

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()
 {

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 {
 

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
  */

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; 

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>
 

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)

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:

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"