diff -Nru openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/changelog openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/changelog --- openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/changelog 2014-03-21 17:04:24.000000000 +0000 +++ openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/changelog 2015-09-15 21:42:59.000000000 +0000 @@ -1,3 +1,9 @@ +openwalnut (1.4.0~rc1+hg3a3147463ee2-1+rpi1) stretch-staging; urgency=medium + + * Apply patch from Michael Terry to fix build with gcc 5 (Closes: 778050) + + -- Peter Michael Green Tue, 15 Sep 2015 21:42:26 +0000 + openwalnut (1.4.0~rc1+hg3a3147463ee2-1) unstable; urgency=low * Major functionality and stability improvements. diff -Nru openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/gcc5.patch openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/gcc5.patch --- openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/gcc5.patch 1970-01-01 00:00:00.000000000 +0000 +++ openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/gcc5.patch 2015-09-15 21:48:43.000000000 +0000 @@ -0,0 +1,3860 @@ +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WIconManager.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/WIconManager.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WIconManager.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WMainWindow.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/WMainWindow.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WMainWindow.h +@@ -29,8 +29,16 @@ + #include + #include + ++#ifndef Q_MOC_RUN ++#ifndef Q_MOC_RUN + #include ++#endif ++#endif ++#ifndef Q_MOC_RUN ++#ifndef Q_MOC_RUN + #include ++#endif ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WQt4Gui.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/WQt4Gui.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WQt4Gui.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WQtGLScreenCapture.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/WQtGLScreenCapture.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WQtGLScreenCapture.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WQtGLWidget.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/WQtGLWidget.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/WQtGLWidget.h +@@ -27,8 +27,16 @@ + + #include + ++#ifndef Q_MOC_RUN ++#ifndef Q_MOC_RUN + #include ++#endif ++#endif ++#ifndef Q_MOC_RUN ++#ifndef Q_MOC_RUN + #include ++#endif ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/controlPanel/WPropertyWidget.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/controlPanel/WPropertyWidget.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/controlPanel/WPropertyWidget.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/controlPanel/WQtColormapper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/controlPanel/WQtColormapper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/controlPanel/WQtColormapper.h +@@ -26,8 +26,16 @@ + #define WQTCOLORMAPPER_H + + #include ++#ifndef Q_MOC_RUN ++#ifndef Q_MOC_RUN + #include ++#endif ++#endif ++#ifndef Q_MOC_RUN ++#ifndef Q_MOC_RUN + #include ++#endif ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/controlPanel/WQtTreeItem.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/controlPanel/WQtTreeItem.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/controlPanel/WQtTreeItem.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WLoadFinishedEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WLoadFinishedEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WLoadFinishedEvent.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleAssocEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WModuleAssocEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleAssocEvent.h +@@ -25,7 +25,9 @@ + #ifndef WMODULEASSOCEVENT_H + #define WMODULEASSOCEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleConnectEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WModuleConnectEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleConnectEvent.h +@@ -25,7 +25,9 @@ + #ifndef WMODULECONNECTEVENT_H + #define WMODULECONNECTEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleConnectorEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WModuleConnectorEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleConnectorEvent.h +@@ -25,7 +25,9 @@ + #ifndef WMODULECONNECTOREVENT_H + #define WMODULECONNECTOREVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleCrashEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WModuleCrashEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleCrashEvent.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleDisconnectEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WModuleDisconnectEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleDisconnectEvent.h +@@ -25,7 +25,9 @@ + #ifndef WMODULEDISCONNECTEVENT_H + #define WMODULEDISCONNECTEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleReadyEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WModuleReadyEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleReadyEvent.h +@@ -25,7 +25,9 @@ + #ifndef WMODULEREADYEVENT_H + #define WMODULEREADYEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleRemovedEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WModuleRemovedEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WModuleRemovedEvent.h +@@ -25,7 +25,9 @@ + #ifndef WMODULEREMOVEDEVENT_H + #define WMODULEREMOVEDEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WPropertyChangedEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WPropertyChangedEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WPropertyChangedEvent.h +@@ -25,7 +25,9 @@ + #ifndef WPROPERTYCHANGEDEVENT_H + #define WPROPERTYCHANGEDEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRenderedFrameEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WRenderedFrameEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRenderedFrameEvent.h +@@ -25,7 +25,9 @@ + #ifndef WRENDEREDFRAMEEVENT_H + #define WRENDEREDFRAMEEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRoiAssocEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WRoiAssocEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRoiAssocEvent.h +@@ -25,7 +25,9 @@ + #ifndef WROIASSOCEVENT_H + #define WROIASSOCEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRoiRemoveEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WRoiRemoveEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRoiRemoveEvent.h +@@ -25,7 +25,9 @@ + #ifndef WROIREMOVEEVENT_H + #define WROIREMOVEEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRoiSortEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/events/WRoiSortEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/events/WRoiSortEvent.h +@@ -25,7 +25,9 @@ + #ifndef WROISORTEVENT_H + #define WROISORTEVENT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/guiElements/WQtModuleOneToOneCombinerAction.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/guiElements/WQtModuleOneToOneCombinerAction.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/guiElements/WQtModuleOneToOneCombinerAction.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkArrow.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/networkEditor/WQtNetworkArrow.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkArrow.h +@@ -33,7 +33,9 @@ + #include + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/kernel/WModuleConnector.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkEditor.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/networkEditor/WQtNetworkEditor.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkEditor.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkItemActivator.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/networkEditor/WQtNetworkItemActivator.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkItemActivator.h +@@ -25,7 +25,9 @@ + #ifndef WQTNETWORKITEMACTIVATOR_H + #define WQTNETWORKITEMACTIVATOR_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkItemGrid.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/networkEditor/WQtNetworkItemGrid.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkItemGrid.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkSceneLayout.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/qt4gui/networkEditor/WQtNetworkSceneLayout.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/qt4gui/networkEditor/WQtNetworkSceneLayout.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WSharedAssociativeContainer.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WCondition.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WCondition.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WCondition.h +@@ -25,10 +25,18 @@ + #ifndef WCONDITION_H + #define WCONDITION_H + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WConditionOneShot.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WConditionOneShot.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WConditionOneShot.h +@@ -25,7 +25,9 @@ + #ifndef WCONDITIONONESHOT_H + #define WCONDITIONONESHOT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WConditionSet.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WConditionSet.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WConditionSet.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WFlag.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WFlag.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WFlag.h +@@ -25,7 +25,9 @@ + #ifndef WFLAG_H + #define WFLAG_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WFlagForwarder.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WFlagForwarder.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WFlagForwarder.h +@@ -25,8 +25,12 @@ + #ifndef WFLAGFORWARDER_H + #define WFLAGFORWARDER_H + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WFlag.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHierarchicalTree.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WHierarchicalTree.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHierarchicalTree.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WColor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHierarchicalTreeFibers.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WHierarchicalTreeFibers.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHierarchicalTreeFibers.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WColor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHierarchicalTreeVoxels.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WHierarchicalTreeVoxels.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHierarchicalTreeVoxels.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WColor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHistogram2D.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WHistogram2D.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHistogram2D.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHistogramND.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WHistogramND.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WHistogramND.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + /** + * This template should handly arbitrary N-dimensional histograms. +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WIOTools.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WIOTools.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WIOTools.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WDefines.h" + #include "WAssert.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelection.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WItemSelection.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelection.h +@@ -29,10 +29,18 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WSharedSequenceContainer.h" + #include "WItemSelectionItem.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelectionItem.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WItemSelectionItem.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelectionItem.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + /** + * Class for keeping a single named item in a WItemSelection. +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelectionItemTyped.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WItemSelectionItemTyped.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelectionItemTyped.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WItemSelectionItem.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelector.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WItemSelector.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WItemSelector.h +@@ -30,8 +30,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WItemSelection.h" + #include "WItemSelectionItem.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WLimits.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WLimits.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WLimits.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include // isnan, isinf ++#endif + + /** + * Project wide limits for different quantities. +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WLogStream.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WLogStream.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WLogStream.h +@@ -27,7 +27,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WLogEntry.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WLogger.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WLogger.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WLogger.h +@@ -30,8 +30,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WLogEntry.h" + #include "WLogStream.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WObjectNDIP.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WObjectNDIP.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WObjectNDIP.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WProperties.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPathHelper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPathHelper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPathHelper.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + /** + * Singleton class helping to find files and paths. It is a useful to to search for resources and the central place to "hardcode" relative paths. +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPredicateHelper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPredicateHelper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPredicateHelper.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + /** + * This namespace contains some useful helper classes which use some common class methods as predicate. This is especially useful and handy if +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProgress.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WProgress.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProgress.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + + /** +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProgressCombiner.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WProgressCombiner.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProgressCombiner.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WProgress.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProjectFileIO.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WProjectFileIO.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProjectFileIO.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WProperties.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProperties_Fwd.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WProperties_Fwd.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WProperties_Fwd.h +@@ -25,7 +25,9 @@ + #ifndef WPROPERTIES_FWD_H + #define WPROPERTIES_FWD_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + // This class contains forward declarations for every thing which is needed to use WPropertyGroup in all their variations. Simply include this file + // in your headers if your somehow need properties or related classes. +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyBase.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyBase.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyBase.h +@@ -27,11 +27,19 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WProperties_Fwd.h" + #include "WCondition.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyGroupBase.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyGroupBase.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyGroupBase.h +@@ -29,10 +29,18 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WConditionSet.h" + #include "WPropertyBase.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyHelper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyHelper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyHelper.h +@@ -25,7 +25,9 @@ + #ifndef WPROPERTYHELPER_H + #define WPROPERTYHELPER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WPropertyVariable.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyList.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyList.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyList.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WPropertyGroupBase.h" + #include "WPropertyTypes.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyObserver.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyObserver.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyObserver.h +@@ -29,8 +29,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + #include "WProperties.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyStruct.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyStruct.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyStruct.h +@@ -28,14 +28,28 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WStringUtils.h" + #include "WCondition.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyTypes.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyTypes.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyTypes.h +@@ -31,7 +31,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WStringUtils.h" + #include "math/linearAlgebra/WMatrixFixed.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyVariable.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPropertyVariable.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPropertyVariable.h +@@ -31,8 +31,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "constraints/WPropertyConstraintIsDirectory.h" + #include "constraints/WPropertyConstraintMax.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPrototyped.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WPrototyped.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WPrototyped.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WRealtimeTimer.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WRealtimeTimer.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WRealtimeTimer.h +@@ -25,7 +25,9 @@ + #ifndef WREALTIMETIMER_H + #define WREALTIMETIMER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedAssociativeContainer.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WSharedAssociativeContainer.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedAssociativeContainer.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WSharedObject.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedLib.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WSharedLib.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedLib.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObject.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WSharedObject.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObject.h +@@ -25,7 +25,9 @@ + #ifndef WSHAREDOBJECT_H + #define WSHAREDOBJECT_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + #include "WSharedObjectTicket.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObjectTicket.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WSharedObjectTicket.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObjectTicket.h +@@ -25,7 +25,9 @@ + #ifndef WSHAREDOBJECTTICKET_H + #define WSHAREDOBJECTTICKET_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObjectTicketRead.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WSharedObjectTicketRead.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObjectTicketRead.h +@@ -25,7 +25,9 @@ + #ifndef WSHAREDOBJECTTICKETREAD_H + #define WSHAREDOBJECTTICKETREAD_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + #include "WSharedObjectTicket.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObjectTicketWrite.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WSharedObjectTicketWrite.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedObjectTicketWrite.h +@@ -25,7 +25,9 @@ + #ifndef WSHAREDOBJECTTICKETWRITE_H + #define WSHAREDOBJECTTICKETWRITE_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WCondition.h" + #include "WSharedObjectTicket.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedSequenceContainer.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WSharedSequenceContainer.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WSharedSequenceContainer.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WSharedObject.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WStrategyHelper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WStrategyHelper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WStrategyHelper.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WLogger.h" + #include "WItemSelection.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WStructuredTextParser.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WStructuredTextParser.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WStructuredTextParser.h +@@ -32,17 +32,39 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WStringUtils.h" + #include "exceptions/WTypeMismatch.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedFunction.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WThreadedFunction.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedFunction.h +@@ -30,7 +30,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WAssert.h" + #include "WWorkerThread.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedJobs.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WThreadedJobs.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedJobs.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WException.h" + #include "WFlag.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedRunner.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WThreadedRunner.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedRunner.h +@@ -29,11 +29,19 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WFlag.h" + #include "WThreadedRunnerSignals.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedRunnerSignals.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WThreadedRunnerSignals.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WThreadedRunnerSignals.h +@@ -25,8 +25,12 @@ + #ifndef WTHREADEDRUNNERSIGNALS_H + #define WTHREADEDRUNNERSIGNALS_H + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + class WException; + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WTimer.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WTimer.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WTimer.h +@@ -25,7 +25,9 @@ + #ifndef WTIMER_H + #define WTIMER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WWorkerThread.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/WWorkerThread.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/WWorkerThread.h +@@ -28,8 +28,12 @@ + #include // because of std::size_t + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WAssert.h" + #include "WException.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/datastructures/WDendrogram.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/datastructures/WDendrogram.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/datastructures/WDendrogram.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WTransferable.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/datastructures/WUnionFind.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/datastructures/WUnionFind.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/datastructures/WUnionFind.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + + /** +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WInterval.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WInterval.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WInterval.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WTypeTraits.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WMath.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WMath.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WMath.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WLine.h" + #include "WPlane.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WMatrixSym.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WMatrixSym.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WMatrixSym.h +@@ -32,7 +32,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../exceptions/WOutOfBounds.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WOSSIMHelper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WOSSIMHelper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WOSSIMHelper.h +@@ -32,7 +32,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WMatrix.h" + #include "WValue.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WPlane.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WPlane.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WPlane.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../dataHandler/WGridRegular3D.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WSymmetricSphericalHarmonic.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WSymmetricSphericalHarmonic.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WSymmetricSphericalHarmonic.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WLogger.h" + #include "core/common/math/WGeometryFunctions.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorBase.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WTensorBase.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorBase.h +@@ -29,8 +29,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WAssert.h" + #include "WCompileTimeFunctions.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorFunctions.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WTensorFunctions.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorFunctions.h +@@ -32,7 +32,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorMeta.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WTensorMeta.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorMeta.h +@@ -27,7 +27,9 @@ + + #include // for size_t + ++#ifndef Q_MOC_RUN + #include ++#endif + + // forward declaration + template< typename Data_T, std::size_t k, std::size_t n, std::size_t N, std::size_t m > +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorSym.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/WTensorSym.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/WTensorSym.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WTensorMeta.h" + #include "WTensorBase.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/linearAlgebra/WMatrixFixed.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/linearAlgebra/WMatrixFixed.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/linearAlgebra/WMatrixFixed.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + // Needed for conversion: OSG Types + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/linearAlgebra/test/WMatrixFixed_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/linearAlgebra/test/WMatrixFixed_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/linearAlgebra/test/WMatrixFixed_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WMatrixFixed.h" + #include "../WVectorFixed.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/test/WSymmetricSphericalHarmonic_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/math/test/WSymmetricSphericalHarmonic_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/math/test/WSymmetricSphericalHarmonic_test.h +@@ -28,13 +28,27 @@ + #include + + // the following block is only for the last termporarly test ++#ifndef Q_MOC_RUN + // #include ++#endif ++#ifndef Q_MOC_RUN + // #include ++#endif ++#ifndef Q_MOC_RUN + // #include ++#endif ++#ifndef Q_MOC_RUN + // #include ++#endif ++#ifndef Q_MOC_RUN + // #include ++#endif ++#ifndef Q_MOC_RUN + // #include ++#endif ++#ifndef Q_MOC_RUN + // #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WConditionOneShot_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/test/WConditionOneShot_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WConditionOneShot_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../WConditionOneShot.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WConditionSet_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/test/WConditionSet_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WConditionSet_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../WConditionSet.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WCondition_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/test/WCondition_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WCondition_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../WCondition.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WException_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/test/WException_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WException_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../WException.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WFlag_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/test/WFlag_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WFlag_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../WFlag.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WProgressCombiner_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/test/WProgressCombiner_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WProgressCombiner_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WTerminalColor_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/common/test/WTerminalColor_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/common/test/WTerminalColor_test.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../WTerminalColor.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataHandler.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataHandler.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataHandler.h +@@ -28,9 +28,15 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WSharedObject.h" + #include "../common/WSharedSequenceContainer.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSet.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSet.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSet.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetDTI.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetDTI.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetDTI.h +@@ -25,7 +25,9 @@ + #ifndef WDATASETDTI_H + #define WDATASETDTI_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/WTensorSym.h" + #include "WDataSetSingle.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetDipoles.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetDipoles.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetDipoles.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WDataSet.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetFiberClustering.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetFiberClustering.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetFiberClustering.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "datastructures/WFiberCluster.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetFiberVector.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetFiberVector.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetFiberVector.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/datastructures/WFiber.h" + #include "WDataSet.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetFibers.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetFibers.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetFibers.h +@@ -29,8 +29,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/linearAlgebra/WPosition.h" + #include "../common/WBoundingBox.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetHierarchicalClustering.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetHierarchicalClustering.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetHierarchicalClustering.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/exceptions/WInvalidID.h" + #include "../common/WTransferable.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetPoints.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetPoints.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetPoints.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WBoundingBox.h" + #include "WDataSet.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetScalar.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetScalar.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetScalar.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "datastructures/WValueSetHistogram.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetSegmentation.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetSegmentation.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetSegmentation.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WDataSet.h" + #include "WDataSetScalar.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetSingle.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetSingle.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetSingle.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WDataSet.h" + #include "WGrid.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetTimeSeries.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataSetTimeSeries.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataSetTimeSeries.h +@@ -30,8 +30,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WLimits.h" + #include "../common/WProperties.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataTexture3D.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WDataTexture3D.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WDataTexture3D.h +@@ -29,8 +29,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../graphicsEngine/WGETexture.h" + #include "../graphicsEngine/WGETypeTraits.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WEEG2.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WEEG2.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WEEG2.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "io/WPagerEEG.h" + #include "WEEGChannelInfo.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WEEG2Segment.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WEEG2Segment.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WEEG2Segment.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "io/WPagerEEG.h" + #include "WEEGValueMatrix.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WEEGChannelInfo.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WEEGChannelInfo.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WEEGChannelInfo.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/linearAlgebra/WPosition.h" + #include "WEEGPositionsLibrary.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WFiberAccumulator.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WFiberAccumulator.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WFiberAccumulator.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/linearAlgebra/WVectorFixed.h" + #include "WDataSetFiberVector.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WGrid.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WGrid.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WGrid.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WBoundingBox.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WGridRegular3D.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WGridRegular3D.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WGridRegular3D.h +@@ -30,8 +30,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WITKImageConversion.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WITKImageConversion.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WITKImageConversion.h +@@ -31,7 +31,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WDataSetScalar.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WPersonalInformation.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WPersonalInformation.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WPersonalInformation.h +@@ -28,7 +28,9 @@ + #include + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + + /** +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WSubject.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WSubject.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WSubject.h +@@ -27,7 +27,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WConditionSet.h" + #include "../common/WSharedObject.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WThreadedPerVoxelOperation.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WThreadedPerVoxelOperation.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WThreadedPerVoxelOperation.h +@@ -28,9 +28,15 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WException.h" + #include "../common/WThreadedJobs.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WThreadedTrackingFunction.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WThreadedTrackingFunction.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WThreadedTrackingFunction.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/linearAlgebra/WVectorFixed.h" + #include "../common/WSharedObject.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WTractAdapter.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WTractAdapter.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WTractAdapter.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/linearAlgebra/WPosition.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WTractData.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WTractData.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WTractData.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + /** + * Stores the data of deterministic fiber tractograms. Derived or optional data as tangents, FA, +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WValueSet.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WValueSet.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WValueSet.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/linearAlgebra/WVectorFixed.h" + #include "../common/math/WValue.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WValueSetBase.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/WValueSetBase.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/WValueSetBase.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/WValue.h" + #include "WDataHandlerEnums.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WFiberCluster.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/datastructures/WFiberCluster.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WFiberCluster.h +@@ -29,8 +29,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WColor.h" + #include "../../common/WTransferable.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WJoinContourTree.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/datastructures/WJoinContourTree.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WJoinContourTree.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WTransferable.h" + #include "../WDataSetSingle.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WTreeNode.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/datastructures/WTreeNode.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WTreeNode.h +@@ -29,8 +29,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + #include "../../common/datastructures/WDendrogram.h" + + /** +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WValueSetHistogram.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/datastructures/WValueSetHistogram.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/datastructures/WValueSetHistogram.h +@@ -29,9 +29,15 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WHistogram.h" + #include "../WValueSet.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WPagerEEG.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/io/WPagerEEG.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WPagerEEG.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WEEGValueMatrix.h" + #include "../../common/WDefines.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WReaderMatrixSymVTK.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/io/WReaderMatrixSymVTK.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WReaderMatrixSymVTK.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WReader.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WWriterDendrogram.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/io/WWriterDendrogram.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WWriterDendrogram.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + + #include "WWriter.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WWriterFiberVTK.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/io/WWriterFiberVTK.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WWriterFiberVTK.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WDataSetFiberVector.h" + #include "../WDataSetFibers.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WWriterMatrixSymVTK.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/io/WWriterMatrixSymVTK.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/io/WWriterMatrixSymVTK.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + + #include "WWriter.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataHandler_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WDataHandler_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataHandler_test.h +@@ -25,7 +25,9 @@ + #ifndef WDATAHANDLER_TEST_H + #define WDATAHANDLER_TEST_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSetFiberVector_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WDataSetFiberVector_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSetFiberVector_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../WDataSetFiberVector.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSetTimeSeries_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WDataSetTimeSeries_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSetTimeSeries_test.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "../../common/WLimits.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSetVector_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WDataSetVector_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSetVector_test.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSet_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WDataSet_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WDataSet_test.h +@@ -25,7 +25,9 @@ + #ifndef WDATASET_TEST_H + #define WDATASET_TEST_H + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + #include "../WDataSet.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WEEG_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WEEG_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WEEG_test.h +@@ -25,7 +25,9 @@ + #ifndef WEEG_TEST_H + #define WEEG_TEST_H + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + #include "../WEEG.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WGridRegular3D_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WGridRegular3D_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WGridRegular3D_test.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WGridTransformOrtho_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WGridTransformOrtho_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WGridTransformOrtho_test.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WITKImageConversion_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/dataHandler/test/WITKImageConversion_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/dataHandler/test/WITKImageConversion_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WFiberDrawable.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WFiberDrawable.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WFiberDrawable.h +@@ -27,9 +27,15 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEColormapping.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGEColormapping.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEColormapping.h +@@ -31,8 +31,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEGraphicsWindow.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGEGraphicsWindow.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEGraphicsWindow.h +@@ -25,7 +25,9 @@ + #ifndef WGEGRAPHICSWINDOW_H + #define WGEGRAPHICSWINDOW_H + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "WGraphicsEngineMode.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEGroupNode.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGEGroupNode.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEGroupNode.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEManagedGroupNode.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGEManagedGroupNode.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEManagedGroupNode.h +@@ -25,7 +25,9 @@ + #ifndef WGEMANAGEDGROUPNODE_H + #define WGEMANAGEDGROUPNODE_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WGEGroupNode.h" + #include "../common/WFlag.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEScreenCapture.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGEScreenCapture.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEScreenCapture.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGESignals.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGESignals.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGESignals.h +@@ -25,8 +25,12 @@ + #ifndef WGESIGNALS_H + #define WGESIGNALS_H + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + /** + * Enum of all possible signals WGraphicsEngine instances can emit. +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGETexture.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGETexture.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGETexture.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGETextureHud.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGETextureHud.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGETextureHud.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEViewer.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGEViewer.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGEViewer.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGraphicsEngine.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WGraphicsEngine.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WGraphicsEngine.h +@@ -28,9 +28,15 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WPickHandler.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WPickHandler.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WPickHandler.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROI.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WROI.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROI.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROIArbitrary.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WROIArbitrary.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROIArbitrary.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/WMatrix.h" + #include "../common/WColor.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROIBox.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WROIBox.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROIBox.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROISphere.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/WROISphere.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/WROISphere.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/math/linearAlgebra/WPosition.h" + #include "WPickHandler.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/animation/WGEAnimationFrameTimer.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/animation/WGEAnimationFrameTimer.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/animation/WGEAnimationFrameTimer.h +@@ -25,7 +25,9 @@ + #ifndef WGEANIMATIONFRAMETIMER_H + #define WGEANIMATIONFRAMETIMER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WTimer.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/callbacks/WGEFunctorCallback.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/callbacks/WGEFunctorCallback.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/callbacks/WGEFunctorCallback.h +@@ -25,7 +25,9 @@ + #ifndef WGEFUNCTORCALLBACK_H + #define WGEFUNCTORCALLBACK_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/callbacks/WGENodeMaskCallback.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/callbacks/WGENodeMaskCallback.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/callbacks/WGENodeMaskCallback.h +@@ -25,7 +25,9 @@ + #ifndef WGENODEMASKCALLBACK_H + #define WGENODEMASKCALLBACK_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/callbacks/WGEShaderAnimationCallback.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/callbacks/WGEShaderAnimationCallback.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/callbacks/WGEShaderAnimationCallback.h +@@ -27,7 +27,9 @@ + + #include "stdint.h" + ++#ifndef Q_MOC_RUN + #include "boost/date_time/posix_time/posix_time.hpp" ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessor.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/postprocessing/WGEPostprocessor.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessor.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorCelShading.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/postprocessing/WGEPostprocessorCelShading.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorCelShading.h +@@ -25,7 +25,9 @@ + #ifndef WGEPOSTPROCESSORCELSHADING_H + #define WGEPOSTPROCESSORCELSHADING_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WGEPostprocessor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorEdgeEnhance.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/postprocessing/WGEPostprocessorEdgeEnhance.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorEdgeEnhance.h +@@ -25,7 +25,9 @@ + #ifndef WGEPOSTPROCESSOREDGEENHANCE_H + #define WGEPOSTPROCESSOREDGEENHANCE_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WGEPostprocessor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorGauss.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/postprocessing/WGEPostprocessorGauss.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorGauss.h +@@ -25,7 +25,9 @@ + #ifndef WGEPOSTPROCESSORGAUSS_H + #define WGEPOSTPROCESSORGAUSS_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorLineAO.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/postprocessing/WGEPostprocessorLineAO.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorLineAO.h +@@ -25,7 +25,9 @@ + #ifndef WGEPOSTPROCESSORLINEAO_H + #define WGEPOSTPROCESSORLINEAO_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WGEPostprocessor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorMergeOp.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/postprocessing/WGEPostprocessorMergeOp.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorMergeOp.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorSSAO.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/postprocessing/WGEPostprocessorSSAO.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/postprocessing/WGEPostprocessorSSAO.h +@@ -25,7 +25,9 @@ + #ifndef WGEPOSTPROCESSORSSAO_H + #define WGEPOSTPROCESSORSSAO_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WGEPostprocessor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShader.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/shaders/WGEShader.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShader.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderDefine.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/shaders/WGEShaderDefine.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderDefine.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WStringUtils.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderDefineOptions.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/shaders/WGEShaderDefineOptions.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderDefineOptions.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WGEShaderPreprocessor.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderPreprocessor.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/shaders/WGEShaderPreprocessor.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderPreprocessor.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WCondition.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderPropertyDefine.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/shaders/WGEShaderPropertyDefine.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderPropertyDefine.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WPropertyTypes.h" + #include "../../common/WPropertyVariable.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderPropertyDefineOptions.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/graphicsEngine/shaders/WGEShaderPropertyDefineOptions.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/graphicsEngine/shaders/WGEShaderPropertyDefineOptions.h +@@ -28,9 +28,15 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include "boost/tuple/tuple.hpp" ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WProperties.h" + #include "../../common/WPropertyTypes.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WBatchLoader.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WBatchLoader.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WBatchLoader.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WThreadedRunner.h" + #include "../common/WSharedSequenceContainer.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WCrosshair.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WCrosshair.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WCrosshair.h +@@ -25,7 +25,9 @@ + #ifndef WCROSSHAIR_H + #define WCROSSHAIR_H + ++#ifndef Q_MOC_RUN + #include ++#endif + #include "../common/math/linearAlgebra/WPosition.h" + + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WDataModule.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WDataModule.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WDataModule.h +@@ -25,7 +25,9 @@ + #ifndef WDATAMODULE_H + #define WDATAMODULE_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WModule.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WKernel.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WKernel.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WKernel.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WTimer.h" + #include "../scripting/WScriptEngine.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModule.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModule.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModule.h +@@ -29,12 +29,24 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WConditionSet.h" + #include "../common/WLogger.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleCombiner.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleCombiner.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleCombiner.h +@@ -25,7 +25,9 @@ + #ifndef WMODULECOMBINER_H + #define WMODULECOMBINER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WThreadedRunner.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleCombinerTypes.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleCombinerTypes.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleCombinerTypes.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleConnector.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleConnector.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleConnector.h +@@ -28,11 +28,21 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WModule.h" + #include "WModuleCombinerTypes.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleConnectorSignals.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleConnectorSignals.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleConnectorSignals.h +@@ -25,8 +25,12 @@ + #ifndef WMODULECONNECTORSIGNALS_H + #define WMODULECONNECTORSIGNALS_H + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + class WModuleConnector; + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleContainer.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleContainer.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleContainer.h +@@ -32,10 +32,18 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WSharedObject.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleFactory.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleFactory.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleFactory.h +@@ -31,8 +31,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WSharedAssociativeContainer.h" + #include "WModuleCombinerTypes.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleInputConnector.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleInputConnector.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleInputConnector.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + class WModule; + #include "WModuleConnector.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleInputData.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleInputData.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleInputData.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + // this is necessary since we have some kind of cyclic includes + template < typename T > class WModuleOutputData; +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleInputForwardData.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleInputForwardData.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleInputForwardData.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WLogger.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleLoader.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleLoader.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleLoader.h +@@ -29,8 +29,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WSharedAssociativeContainer.h" + #include "../common/WSharedLib.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleMetaInformation.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleMetaInformation.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleMetaInformation.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WStructuredTextParser.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleOutputConnector.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleOutputConnector.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleOutputConnector.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + class WModule; + #include "WModuleConnector.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleOutputData.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleOutputData.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleOutputData.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WLogger.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleOutputForwardData.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleOutputForwardData.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleOutputForwardData.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WModuleInputData.h" + #include "WModuleOutputData.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleSignals.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WModuleSignals.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WModuleSignals.h +@@ -25,8 +25,12 @@ + #ifndef WMODULESIGNALS_H + #define WMODULESIGNALS_H + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + class WModule; + class WException; +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WProjectFile.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WProjectFile.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WProjectFile.h +@@ -29,10 +29,18 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WSharedSequenceContainer.h" + #include "../common/WThreadedRunner.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WRMBranch.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WRMBranch.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WRMBranch.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WProperties.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WROIManager.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WROIManager.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WROIManager.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WRMBranch.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WRoiProjectFileIO.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WRoiProjectFileIO.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WRoiProjectFileIO.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "boost/tuple/tuple.hpp" ++#endif + + #include "../common/WProjectFileIO.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WSelectionManager.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/WSelectionManager.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/WSelectionManager.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WProperties.h" + #include "WCrosshair.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WApplyCombiner.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/combiner/WApplyCombiner.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WApplyCombiner.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WModule.h" + #include "../WModuleCombinerTypes.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WDisconnectCombiner.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/combiner/WDisconnectCombiner.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WDisconnectCombiner.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WModule.h" + #include "../WModuleCombinerTypes.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WModuleOneToOneCombiner.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/combiner/WModuleOneToOneCombiner.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WModuleOneToOneCombiner.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WModule.h" + #include "../WModuleCombiner.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WModuleProjectFileCombiner.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/combiner/WModuleProjectFileCombiner.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/combiner/WModuleProjectFileCombiner.h +@@ -31,7 +31,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WProjectFileIO.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/test/WModuleConnector_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/kernel/test/WModuleConnector_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/kernel/test/WModuleConnector_test.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/WScriptEngine.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/WScriptEngine.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/WScriptEngine.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../kernel/WModuleContainer.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/python/WScriptInterpreterPython.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/python/WScriptInterpreterPython.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/python/WScriptInterpreterPython.h +@@ -31,8 +31,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../../common/WThreadedRunner.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WInputConnectorWrapper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/wrappers/WInputConnectorWrapper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WInputConnectorWrapper.h +@@ -25,7 +25,9 @@ + #ifndef WINPUTCONNECTORWRAPPER_H + #define WINPUTCONNECTORWRAPPER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/kernel/WModuleInputConnector.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WLoggerWrapper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/wrappers/WLoggerWrapper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WLoggerWrapper.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + + #include "core/common/WLogger.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WModuleContainerWrapper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/wrappers/WModuleContainerWrapper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WModuleContainerWrapper.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/kernel/WModuleContainer.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WModuleWrapper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/wrappers/WModuleWrapper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WModuleWrapper.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/kernel/WModule.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WOutputConnectorWrapper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/wrappers/WOutputConnectorWrapper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WOutputConnectorWrapper.h +@@ -25,7 +25,9 @@ + #ifndef WOUTPUTCONNECTORWRAPPER_H + #define WOUTPUTCONNECTORWRAPPER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/kernel/WModuleOutputConnector.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WPropertyWrapper.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/scripting/wrappers/WPropertyWrapper.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/scripting/wrappers/WPropertyWrapper.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WPropertyBase.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/ui/WCustomWidget.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/ui/WCustomWidget.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/ui/WCustomWidget.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/ui/WCustomWidgetEventHandler.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/ui/WCustomWidgetEventHandler.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/ui/WCustomWidgetEventHandler.h +@@ -25,7 +25,9 @@ + #ifndef WCUSTOMWIDGETEVENTHANDLER_H + #define WCUSTOMWIDGETEVENTHANDLER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/ui/WUI.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/core/ui/WUI.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/core/ui/WUI.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../common/WFlag.h" + #include "../graphicsEngine/WGECamera.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.h +@@ -33,8 +33,12 @@ + #include // for std::pair + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WLimits.h" + #include "core/common/WAssert.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/coordinateSystem/WTalairachConverter.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/coordinateSystem/WTalairachConverter.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/coordinateSystem/WTalairachConverter.h +@@ -25,7 +25,9 @@ + #ifndef WTALAIRACHCONVERTER_H + #define WTALAIRACHCONVERTER_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/math/linearAlgebra/WVectorFixed.h" + #include "core/common/math/WMatrix.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/coordinateSystem/test/WTalairachConverter_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/coordinateSystem/test/WTalairachConverter_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/coordinateSystem/test/WTalairachConverter_test.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WTalairachConverter.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/WMData.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/WMData.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/WMData.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/kernel/WDataModule.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WPagerEEGLibeep.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WPagerEEGLibeep.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WPagerEEGLibeep.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/dataHandler/WEEGValueMatrix.h" + #include "core/dataHandler/io/WPagerEEG.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderBiosig.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WReaderBiosig.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderBiosig.h +@@ -32,7 +32,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WReaderEEG.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderClustering.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WReaderClustering.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderClustering.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WStringUtils.h" + #include "core/dataHandler/datastructures/WTreeNode.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderEEGASCII.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WReaderEEGASCII.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderEEGASCII.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "WReaderEEG.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderELC.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WReaderELC.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderELC.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/dataHandler/io/WReader.h" + #include "core/dataHandler/WEEGPositionsLibrary.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderFiberVTK.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WReaderFiberVTK.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderFiberVTK.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WStringUtils.h" + #include "core/dataHandler/WDataSetFibers.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderNIfTI.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WReaderNIfTI.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderNIfTI.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/dataHandler/io/WReader.h" + #include "core/dataHandler/WDataSet.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderVTK.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/WReaderVTK.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/WReaderVTK.h +@@ -29,7 +29,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WStringUtils.h" + #include "core/dataHandler/WDataSet.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/test/WReaderEEGASCII_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/test/WReaderEEGASCII_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/test/WReaderEEGASCII_test.h +@@ -28,7 +28,9 @@ + #include + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "../WReaderEEGASCII.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/test/WReaderNIfTI_test.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/data/io/test/WReaderNIfTI_test.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/data/io/test/WReaderNIfTI_test.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/dataCreator/WDataCreatorFiberSpiral.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/dataCreator/WDataCreatorFiberSpiral.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/dataCreator/WDataCreatorFiberSpiral.h +@@ -25,7 +25,9 @@ + #ifndef WDATACREATORFIBERSPIRAL_H + #define WDATACREATORFIBERSPIRAL_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WObjectNDIP.h" + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/deterministicFTMori/WMDeterministicFTMori.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/deterministicFTMori/WMDeterministicFTMori.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/deterministicFTMori/WMDeterministicFTMori.h +@@ -28,8 +28,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/kernel/WModule.h" + #include "core/common/math/linearAlgebra/WVectorFixed.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/distanceMapIsosurface/WMDistanceMapIsosurface.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/distanceMapIsosurface/WMDistanceMapIsosurface.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/distanceMapIsosurface/WMDistanceMapIsosurface.h +@@ -25,7 +25,9 @@ + #ifndef WMDISTANCEMAPISOSURFACE_H + #define WMDISTANCEMAPISOSURFACE_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/dataHandler/WDataSetScalar.h" + #include "core/kernel/WModule.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WEEGEvent.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/eegView/WEEGEvent.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WEEGEvent.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WEEGSourceCalculator.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/eegView/WEEGSourceCalculator.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WEEGSourceCalculator.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/math/linearAlgebra/WPosition.h" + #include "core/dataHandler/WEEG2.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WEEGViewHandler.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/eegView/WEEGViewHandler.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WEEGViewHandler.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WElectrodePositionCallback.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/eegView/WElectrodePositionCallback.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WElectrodePositionCallback.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WHeadSurfaceCallback.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/eegView/WHeadSurfaceCallback.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WHeadSurfaceCallback.h +@@ -29,7 +29,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WLineStripCallback.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/eegView/WLineStripCallback.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/eegView/WLineStripCallback.h +@@ -27,7 +27,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/histogramView/WMHistogramView.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/histogramView/WMHistogramView.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/histogramView/WMHistogramView.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + #include "core/common/math/linearAlgebra/WMatrixFixed.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/navigationSlices/WMNavigationSlices.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/navigationSlices/WMNavigationSlices.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/navigationSlices/WMNavigationSlices.h +@@ -30,7 +30,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/graphicsEngine/WGEManagedGroupNode.h" + #include "core/graphicsEngine/WGEGroupNode.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/readMesh/WMeshReaderInterface.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/readMesh/WMeshReaderInterface.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/readMesh/WMeshReaderInterface.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WIOTools.h" + #include "core/common/WProgressCombiner.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/scalarSegmentation/WSegmentationAlgo.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/scalarSegmentation/WSegmentationAlgo.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/scalarSegmentation/WSegmentationAlgo.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/common/WPropertyTypes.h" + #include "core/common/WCondition.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/voxelizer/WBresenham.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/voxelizer/WBresenham.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/voxelizer/WBresenham.h +@@ -28,7 +28,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/dataHandler/WGridRegular3D.h" + #include "core/common/math/WLine.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/voxelizer/WBresenhamDBL.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/voxelizer/WBresenhamDBL.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/voxelizer/WBresenhamDBL.h +@@ -25,7 +25,9 @@ + #ifndef WBRESENHAMDBL_H + #define WBRESENHAMDBL_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/dataHandler/WGridRegular3D.h" + #include "core/common/math/WLine.h" +Index: openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/voxelizer/WRasterAlgorithm.h +=================================================================== +--- openwalnut-1.4.0~rc1+hg3a3147463ee2.orig/src/modules/voxelizer/WRasterAlgorithm.h ++++ openwalnut-1.4.0~rc1+hg3a3147463ee2/src/modules/voxelizer/WRasterAlgorithm.h +@@ -27,8 +27,12 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "core/dataHandler/WDataSetScalar.h" + #include "core/dataHandler/WGridRegular3D.h" diff -Nru openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/series openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/series --- openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ openwalnut-1.4.0~rc1+hg3a3147463ee2/debian/patches/series 2015-09-15 21:41:24.000000000 +0000 @@ -0,0 +1 @@ +gcc5.patch