fix for BOOST_JOIN parse error during moccing for boost 1.56

patch by Mark Livingstone

modules/gfx/src/gfx_object.hh

@@ -26,6 +26,7 @@
 #ifdef check
 #undef check
 #endif
+#ifndef Q_MOC_RUN
 #include <boost/ptr_container/ptr_vector.hpp>
 
 #include <vector>
@@ -41,7 +42,7 @@
 #include "vertex_array.hh"
 #include "input.hh"
 #include "exporter_fw.hh"
-
+#endif
 namespace ost { namespace gfx {
 
 class Scene; // fw decl

modules/gui/src/scene_win/entity_node.hh

@@ -19,6 +19,8 @@
 #ifndef OST_GUI_SCENE_WIN_ENTITY_NODE_HH
 #define OST_GUI_SCENE_WIN_ENTITY_NODE_HH
 
+#ifndef Q_MOC_RUN
+
 #include <ost/gfx/gfx_node_fw.hh>
 #include <ost/gfx/gfx_node.hh>
 
@@ -27,6 +29,7 @@
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/gfx_scene_node.hh>
+#endif
 
 /*
   Author: Stefan Scheuber

modules/gui/src/sequence_viewer/alignment_view_object.hh

@@ -23,11 +23,14 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
+
 #include <ost/seq/alignment_handle.hh>
 
 #include <ost/gfx/gradient.hh>
 
 #include "sequence_view_object.hh"
+#endif
 
 namespace ost { namespace gui {
 

modules/gui/src/sequence_viewer/sequence_delegate.hh

@@ -23,10 +23,12 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include "sequence_model.hh"
 #include <QItemDelegate>
 #include <QModelIndex>
+#endif
 
 namespace ost { namespace gui {
 

modules/gui/src/sequence_viewer/sequence_model.hh

@@ -23,6 +23,7 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include <ost/mol/chain_view.hh>
 
@@ -37,6 +38,8 @@
 
 #include <QAbstractTableModel>
 #include <QItemSelection>
+#endif
+
 namespace ost { namespace gui {
 
 class SequenceModel : public QAbstractTableModel

modules/gui/src/sequence_viewer/sequence_view_object.hh

@@ -23,6 +23,7 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include <ost/mol/entity_handle.hh>
 
@@ -38,7 +39,7 @@
 #include "seq_text_painter.hh"
 
 #include "base_view_object.hh"
-
+#endif
 
 namespace ost { namespace gui {
 

modules/gui/src/sequence_viewer/sequence_viewer.hh

@@ -23,6 +23,7 @@
   Author: Stefan Scheuber
  */
 
+#ifndef Q_MOC_RUN
 
 #include <ost/seq/alignment_handle.hh>
 
@@ -39,6 +40,7 @@
 #include <QToolBar>
 #include <QModelIndex>
 #include <QItemSelection>
+#endif
 
 namespace ost {