From af2c7931bc507f39b446cf635717b86736709d07 Mon Sep 17 00:00:00 2001 From: Daniel Stender Date: Thu, 8 Oct 2015 17:53:23 +0200 Subject: [PATCH] applied fix-qt4-parsing-error-on-libboost.patch from Debian --- Despeckle.cpp | 2 ++ EstimateBackground.cpp | 2 ++ FileNameDisambiguator.cpp | 2 ++ FixDpiDialog.cpp | 2 ++ LoadFilesStatusDialog.cpp | 2 ++ MainWindow.cpp | 2 ++ MainWindow.h | 2 ++ NewOpenProjectPanel.cpp | 2 ++ OutOfMemoryHandler.h | 2 ++ ProjectCreationContext.cpp | 2 ++ ProjectPages.cpp | 2 ++ ProjectReader.cpp | 2 ++ ProjectWriter.cpp | 2 ++ ProjectWriter.h | 2 ++ RecentProjects.cpp | 2 ++ RelinkablePath.cpp | 2 ++ RelinkablePathVisualization.cpp | 2 ++ RelinkingDialog.cpp | 2 ++ RelinkingListView.cpp | 2 ++ RelinkingModel.cpp | 2 ++ StageListView.cpp | 2 ++ TabbedDebugImages.h | 2 ++ ThumbnailBase.cpp | 2 ++ ThumbnailBase.h | 2 ++ ThumbnailPixmapCache.cpp | 2 ++ ThumbnailPixmapCache.h | 2 ++ ThumbnailSequence.cpp | 2 ++ XmlMarshaller.cpp | 2 ++ dewarping/Curve.cpp | 2 ++ dewarping/CylindricalSurfaceDewarper.cpp | 2 ++ dewarping/CylindricalSurfaceDewarper.h | 2 ++ dewarping/DetectVertContentBounds.cpp | 2 ++ dewarping/DistortionModel.cpp | 2 ++ dewarping/DistortionModelBuilder.cpp | 2 ++ dewarping/TextLineRefiner.cpp | 2 ++ dewarping/TextLineTracer.cpp | 2 ++ dewarping/TopBottomEdgeTracer.cpp | 2 ++ dewarping/TowardsLineTracer.cpp | 2 ++ filters/deskew/Filter.cpp | 2 ++ filters/deskew/ImageView.cpp | 2 ++ filters/deskew/OptionsWidget.cpp | 2 ++ filters/deskew/Settings.cpp | 2 ++ filters/fix_orientation/Filter.cpp | 2 ++ filters/fix_orientation/OptionsWidget.cpp | 2 ++ filters/fix_orientation/Settings.cpp | 2 ++ filters/output/ChangeDewarpingDialog.cpp | 2 ++ filters/output/ChangeDpiDialog.cpp | 2 ++ filters/output/DewarpingView.cpp | 2 ++ filters/output/FillZoneEditor.cpp | 2 ++ filters/output/FillZoneEditor.h | 2 ++ filters/output/OptionsWidget.cpp | 2 ++ filters/output/OutputGenerator.cpp | 2 ++ filters/output/OutputGenerator.h | 2 ++ filters/output/PictureZoneEditor.cpp | 2 ++ filters/output/Settings.cpp | 2 ++ filters/output/Task.cpp | 2 ++ filters/page_layout/Filter.cpp | 2 ++ filters/page_layout/ImageView.cpp | 2 ++ filters/page_layout/OptionsWidget.cpp | 2 ++ filters/page_layout/Settings.cpp | 2 ++ filters/page_split/Filter.cpp | 2 ++ filters/page_split/ImageView.cpp | 2 ++ filters/page_split/OptionsWidget.cpp | 2 ++ filters/page_split/PageLayout.cpp | 2 ++ filters/page_split/PageLayoutEstimator.cpp | 2 ++ filters/page_split/Settings.cpp | 2 ++ filters/page_split/UnremoveButton.h | 2 ++ filters/page_split/VertLineFinder.cpp | 2 ++ filters/select_content/ContentBoxFinder.cpp | 2 ++ filters/select_content/Filter.cpp | 2 ++ filters/select_content/ImageView.cpp | 2 ++ filters/select_content/OptionsWidget.cpp | 2 ++ filters/select_content/Settings.cpp | 2 ++ foundation/PropertySet.cpp | 2 ++ foundation/QtSignalForwarder.h | 2 ++ imageproc/ConnCompEraserExt.cpp | 2 ++ imageproc/ConnectivityMap.cpp | 2 ++ imageproc/GaussBlur.h | 2 ++ imageproc/HoughLineDetector.cpp | 2 ++ imageproc/MaxWhitespaceFinder.cpp | 2 ++ imageproc/Morphology.cpp | 2 ++ imageproc/PolygonRasterizer.cpp | 2 ++ imageproc/PolygonUtils.cpp | 2 ++ imageproc/PolynomialSurface.cpp | 2 ++ imageproc/RasterOp.h | 2 ++ imageproc/tests/TestBinarize.cpp | 2 ++ imageproc/tests/TestBinaryImage.cpp | 2 ++ imageproc/tests/TestConnCompEraser.cpp | 2 ++ imageproc/tests/TestConnCompEraserExt.cpp | 2 ++ imageproc/tests/TestDentFinder.cpp | 2 ++ imageproc/tests/TestGrayscale.cpp | 2 ++ imageproc/tests/TestMorphology.cpp | 2 ++ imageproc/tests/TestOrthogonalRotation.cpp | 2 ++ imageproc/tests/TestPolygonRasterizer.cpp | 2 ++ imageproc/tests/TestRasterOp.cpp | 2 ++ imageproc/tests/TestReduceThreshold.cpp | 2 ++ imageproc/tests/TestSEDM.cpp | 2 ++ imageproc/tests/TestScale.cpp | 2 ++ imageproc/tests/TestSeedFill.cpp | 2 ++ imageproc/tests/TestShear.cpp | 2 ++ imageproc/tests/TestSkewFinder.cpp | 2 ++ imageproc/tests/TestSlicedHistogram.cpp | 2 ++ imageproc/tests/TestTransform.cpp | 2 ++ interaction/DragHandler.h | 2 ++ interaction/DraggableLineSegment.h | 2 ++ interaction/DraggablePoint.h | 2 ++ interaction/InteractionHandler.cpp | 2 ++ interaction/InteractionState.h | 2 ++ interaction/InteractiveXSpline.cpp | 2 ++ interaction/InteractiveXSpline.h | 2 ++ interaction/ZoomHandler.h | 2 ++ math/XSpline.cpp | 2 ++ math/spfit/PolylineModelShape.cpp | 2 ++ math/spfit/tests/TestSqDistApproximant.cpp | 2 ++ tests/TestSmartFilenameOrdering.cpp | 2 ++ zones/BasicSplineVisualizer.cpp | 2 ++ zones/EditableSpline.cpp | 2 ++ zones/EditableZoneSet.h | 2 ++ zones/SerializableSpline.cpp | 2 ++ zones/SerializableSpline.h | 2 ++ zones/ZoneContextMenuInteraction.cpp | 2 ++ zones/ZoneContextMenuInteraction.h | 2 ++ zones/ZoneContextMenuItem.h | 2 ++ zones/ZoneCreationInteraction.cpp | 2 ++ zones/ZoneDefaultInteraction.cpp | 2 ++ zones/ZoneInteractionContext.cpp | 2 ++ zones/ZoneInteractionContext.h | 2 ++ zones/ZoneSet.cpp | 2 ++ zones/ZoneVertexDragInteraction.cpp | 2 ++ 129 files changed, 258 insertions(+) diff --git a/Despeckle.cpp b/Despeckle.cpp index 868c9f09..1bebb353 100644 --- a/Despeckle.cpp +++ b/Despeckle.cpp @@ -24,7 +24,9 @@ #include "imageproc/BinaryImage.h" #include "imageproc/ConnectivityMap.h" #include "imageproc/Connectivity.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/EstimateBackground.cpp b/EstimateBackground.cpp index 1305b47d..98d57e4f 100644 --- a/EstimateBackground.cpp +++ b/EstimateBackground.cpp @@ -42,9 +42,11 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/FileNameDisambiguator.cpp b/FileNameDisambiguator.cpp index cbefd454..d5aae83f 100644 --- a/FileNameDisambiguator.cpp +++ b/FileNameDisambiguator.cpp @@ -24,6 +24,7 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include @@ -31,6 +32,7 @@ #include #include #include +#endif using namespace boost::multi_index; diff --git a/FixDpiDialog.cpp b/FixDpiDialog.cpp index 731a873f..62cc3007 100644 --- a/FixDpiDialog.cpp +++ b/FixDpiDialog.cpp @@ -30,9 +30,11 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/LoadFilesStatusDialog.cpp b/LoadFilesStatusDialog.cpp index 01505e96..798a4c0c 100644 --- a/LoadFilesStatusDialog.cpp +++ b/LoadFilesStatusDialog.cpp @@ -18,7 +18,9 @@ #include "LoadFilesStatusDialog.h" #include +#ifndef Q_MOC_RUN #include +#endif LoadFilesStatusDialog::LoadFilesStatusDialog(QWidget* parent) : QDialog(parent) diff --git a/MainWindow.cpp b/MainWindow.cpp index 41d08d3c..37426bf0 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -91,9 +91,11 @@ #include "ui_BatchProcessingLowerPanel.h" #include "config.h" #include "version.h" +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/MainWindow.h b/MainWindow.h index ca113252..d33188a7 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -33,7 +33,9 @@ #include "PageRange.h" #include "SelectedPage.h" #include "BeforeOrAfter.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/NewOpenProjectPanel.cpp b/NewOpenProjectPanel.cpp index 153ba19b..440e2328 100644 --- a/NewOpenProjectPanel.cpp +++ b/NewOpenProjectPanel.cpp @@ -19,8 +19,10 @@ #include "NewOpenProjectPanel.h.moc" #include "RecentProjects.h" #include "Utils.h" +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/OutOfMemoryHandler.h b/OutOfMemoryHandler.h index a297623e..f536b61c 100644 --- a/OutOfMemoryHandler.h +++ b/OutOfMemoryHandler.h @@ -22,7 +22,9 @@ #include "NonCopyable.h" #include #include +#ifndef Q_MOC_RUN #include +#endif #include class OutOfMemoryHandler : public QObject diff --git a/ProjectCreationContext.cpp b/ProjectCreationContext.cpp index 40609021..1148d4cb 100644 --- a/ProjectCreationContext.cpp +++ b/ProjectCreationContext.cpp @@ -22,8 +22,10 @@ #include "ImageFileInfo.h" #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include #include diff --git a/ProjectPages.cpp b/ProjectPages.cpp index 700005a2..afd639e0 100644 --- a/ProjectPages.cpp +++ b/ProjectPages.cpp @@ -25,11 +25,13 @@ #include "PageSequence.h" #include "RelinkablePath.h" #include "AbstractRelinker.h" +#ifndef Q_MOC_RUN #include #include #include #include #include +#endif #include #include #include diff --git a/ProjectReader.cpp b/ProjectReader.cpp index 19dfb629..84c0bc55 100644 --- a/ProjectReader.cpp +++ b/ProjectReader.cpp @@ -26,7 +26,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include ProjectReader::ProjectReader(QDomDocument const& doc) diff --git a/ProjectWriter.cpp b/ProjectWriter.cpp index 44329d7f..9c635a71 100644 --- a/ProjectWriter.cpp +++ b/ProjectWriter.cpp @@ -30,8 +30,10 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include #include diff --git a/ProjectWriter.h b/ProjectWriter.h index 377bff38..cbe8fe34 100644 --- a/ProjectWriter.h +++ b/ProjectWriter.h @@ -26,10 +26,12 @@ #include "PageId.h" #include "SelectedPage.h" #include "VirtualFunction.h" +#ifndef Q_MOC_RUN #include #include #include #include +#endif #include #include #include diff --git a/RecentProjects.cpp b/RecentProjects.cpp index 3b7dd88c..7bb9ca87 100644 --- a/RecentProjects.cpp +++ b/RecentProjects.cpp @@ -17,7 +17,9 @@ */ #include "RecentProjects.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/RelinkablePath.cpp b/RelinkablePath.cpp index c3f548a6..d6731419 100644 --- a/RelinkablePath.cpp +++ b/RelinkablePath.cpp @@ -18,7 +18,9 @@ #include "RelinkablePath.h" #include +#ifndef Q_MOC_RUN #include +#endif RelinkablePath::RelinkablePath(QString const& path, Type type) : m_normalizedPath(normalize(path)) diff --git a/RelinkablePathVisualization.cpp b/RelinkablePathVisualization.cpp index cacc42a1..cdd30075 100644 --- a/RelinkablePathVisualization.cpp +++ b/RelinkablePathVisualization.cpp @@ -33,8 +33,10 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include struct RelinkablePathVisualization::PathComponent diff --git a/RelinkingDialog.cpp b/RelinkingDialog.cpp index 7c5b75e8..5218a69f 100644 --- a/RelinkingDialog.cpp +++ b/RelinkingDialog.cpp @@ -22,7 +22,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include RelinkingDialog::RelinkingDialog(QString const& project_file_path, QWidget* parent) diff --git a/RelinkingListView.cpp b/RelinkingListView.cpp index 542b9c5c..a7e9674e 100644 --- a/RelinkingListView.cpp +++ b/RelinkingListView.cpp @@ -27,7 +27,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include class RelinkingListView::Delegate : public QStyledItemDelegate diff --git a/RelinkingModel.cpp b/RelinkingModel.cpp index 1695d038..ce59df33 100644 --- a/RelinkingModel.cpp +++ b/RelinkingModel.cpp @@ -27,11 +27,13 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include #include #include +#endif #include #include #include diff --git a/StageListView.cpp b/StageListView.cpp index ba4ba9e4..aabee142 100644 --- a/StageListView.cpp +++ b/StageListView.cpp @@ -36,7 +36,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/TabbedDebugImages.h b/TabbedDebugImages.h index 8c25daf4..c025def5 100644 --- a/TabbedDebugImages.h +++ b/TabbedDebugImages.h @@ -21,7 +21,9 @@ #include "DebugImageView.h" #include +#ifndef Q_MOC_RUN #include +#endif class TabbedDebugImages : public QTabWidget { diff --git a/ThumbnailBase.cpp b/ThumbnailBase.cpp index b26940ee..385c920a 100644 --- a/ThumbnailBase.cpp +++ b/ThumbnailBase.cpp @@ -23,7 +23,9 @@ #include "AbstractCommand.h" #include "PixmapRenderer.h" #include "imageproc/PolygonUtils.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/ThumbnailBase.h b/ThumbnailBase.h index 00852039..abc26e45 100644 --- a/ThumbnailBase.h +++ b/ThumbnailBase.h @@ -24,7 +24,9 @@ #include "ImageTransformation.h" #include "IntrusivePtr.h" #include "ThumbnailPixmapCache.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/ThumbnailPixmapCache.cpp b/ThumbnailPixmapCache.cpp index f1a0a50b..bce423ed 100644 --- a/ThumbnailPixmapCache.cpp +++ b/ThumbnailPixmapCache.cpp @@ -39,11 +39,13 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include #include #include +#endif #include #include #include diff --git a/ThumbnailPixmapCache.h b/ThumbnailPixmapCache.h index a3fc6719..34cc0dba 100644 --- a/ThumbnailPixmapCache.h +++ b/ThumbnailPixmapCache.h @@ -23,7 +23,9 @@ #include "RefCountable.h" #include "ThumbnailLoadResult.h" #include "AbstractCommand.h" +#ifndef Q_MOC_RUN #include +#endif #include class ImageId; diff --git a/ThumbnailSequence.cpp b/ThumbnailSequence.cpp index b94ad333..b0dd21a5 100644 --- a/ThumbnailSequence.cpp +++ b/ThumbnailSequence.cpp @@ -28,6 +28,7 @@ #include "RefCountable.h" #include "IntrusivePtr.h" #include "ScopedIncDec.h" +#ifndef Q_MOC_RUN #include #include #include @@ -36,6 +37,7 @@ #include #include #include +#endif #include #include #include diff --git a/XmlMarshaller.cpp b/XmlMarshaller.cpp index ecd1f97d..8e3a4cc8 100644 --- a/XmlMarshaller.cpp +++ b/XmlMarshaller.cpp @@ -21,7 +21,9 @@ #include "Margins.h" #include "Dpi.h" #include "Utils.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/dewarping/Curve.cpp b/dewarping/Curve.cpp index d48c70f0..bf2686b3 100644 --- a/dewarping/Curve.cpp +++ b/dewarping/Curve.cpp @@ -20,7 +20,9 @@ #include "XmlMarshaller.h" #include "XmlUnmarshaller.h" #include "VecNT.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/dewarping/CylindricalSurfaceDewarper.cpp b/dewarping/CylindricalSurfaceDewarper.cpp index 1e161be8..dc1ad252 100644 --- a/dewarping/CylindricalSurfaceDewarper.cpp +++ b/dewarping/CylindricalSurfaceDewarper.cpp @@ -24,7 +24,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/dewarping/CylindricalSurfaceDewarper.h b/dewarping/CylindricalSurfaceDewarper.h index 815aeffe..e25430ab 100644 --- a/dewarping/CylindricalSurfaceDewarper.h +++ b/dewarping/CylindricalSurfaceDewarper.h @@ -22,7 +22,9 @@ #include "HomographicTransform.h" #include "PolylineIntersector.h" #include "ArcLengthMapper.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/dewarping/DetectVertContentBounds.cpp b/dewarping/DetectVertContentBounds.cpp index d2695ff2..cb99a463 100644 --- a/dewarping/DetectVertContentBounds.cpp +++ b/dewarping/DetectVertContentBounds.cpp @@ -32,9 +32,11 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/dewarping/DistortionModel.cpp b/dewarping/DistortionModel.cpp index 44fe6e15..4eb65df6 100644 --- a/dewarping/DistortionModel.cpp +++ b/dewarping/DistortionModel.cpp @@ -26,7 +26,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include namespace dewarping diff --git a/dewarping/DistortionModelBuilder.cpp b/dewarping/DistortionModelBuilder.cpp index 7e5139aa..e4ed9776 100644 --- a/dewarping/DistortionModelBuilder.cpp +++ b/dewarping/DistortionModelBuilder.cpp @@ -39,7 +39,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/dewarping/TextLineRefiner.cpp b/dewarping/TextLineRefiner.cpp index ba25aff8..9476fc71 100644 --- a/dewarping/TextLineRefiner.cpp +++ b/dewarping/TextLineRefiner.cpp @@ -24,10 +24,12 @@ #include "imageproc/GrayImage.h" #include "imageproc/GaussBlur.h" #include "imageproc/Sobel.h" +#ifndef Q_MOC_RUN #include #include #include #include +#endif #include #include #include diff --git a/dewarping/TextLineTracer.cpp b/dewarping/TextLineTracer.cpp index c0ac319f..f6272ec8 100644 --- a/dewarping/TextLineTracer.cpp +++ b/dewarping/TextLineTracer.cpp @@ -58,11 +58,13 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include #include #include +#endif #include #include #include diff --git a/dewarping/TopBottomEdgeTracer.cpp b/dewarping/TopBottomEdgeTracer.cpp index dda3f896..dbeba2d4 100644 --- a/dewarping/TopBottomEdgeTracer.cpp +++ b/dewarping/TopBottomEdgeTracer.cpp @@ -39,9 +39,11 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/dewarping/TowardsLineTracer.cpp b/dewarping/TowardsLineTracer.cpp index 8eb321fb..ac445080 100644 --- a/dewarping/TowardsLineTracer.cpp +++ b/dewarping/TowardsLineTracer.cpp @@ -23,9 +23,11 @@ #include "imageproc/SEDM.h" #include #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/filters/deskew/Filter.cpp b/filters/deskew/Filter.cpp index 450e548d..527d8f68 100644 --- a/filters/deskew/Filter.cpp +++ b/filters/deskew/Filter.cpp @@ -27,8 +27,10 @@ #include "PageId.h" #include "RelinkablePath.h" #include "AbstractRelinker.h" +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/filters/deskew/ImageView.cpp b/filters/deskew/ImageView.cpp index 81c1fe6c..dd83c5e1 100644 --- a/filters/deskew/ImageView.cpp +++ b/filters/deskew/ImageView.cpp @@ -31,7 +31,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/filters/deskew/OptionsWidget.cpp b/filters/deskew/OptionsWidget.cpp index 5acee600..1c7dfa68 100644 --- a/filters/deskew/OptionsWidget.cpp +++ b/filters/deskew/OptionsWidget.cpp @@ -24,7 +24,9 @@ #include #include #include "ApplyDialog.h" +#ifndef Q_MOC_RUN #include +#endif namespace deskew { diff --git a/filters/deskew/Settings.cpp b/filters/deskew/Settings.cpp index b792ed95..716e02d6 100644 --- a/filters/deskew/Settings.cpp +++ b/filters/deskew/Settings.cpp @@ -21,7 +21,9 @@ #include "RelinkablePath.h" #include "AbstractRelinker.h" #include +#ifndef Q_MOC_RUN #include +#endif namespace deskew { diff --git a/filters/fix_orientation/Filter.cpp b/filters/fix_orientation/Filter.cpp index 4e5732fc..6779c217 100644 --- a/filters/fix_orientation/Filter.cpp +++ b/filters/fix_orientation/Filter.cpp @@ -29,8 +29,10 @@ #include "ProjectWriter.h" #include "XmlMarshaller.h" #include "XmlUnmarshaller.h" +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/filters/fix_orientation/OptionsWidget.cpp b/filters/fix_orientation/OptionsWidget.cpp index 1bd50eb9..62625850 100644 --- a/filters/fix_orientation/OptionsWidget.cpp +++ b/filters/fix_orientation/OptionsWidget.cpp @@ -24,7 +24,9 @@ #include "ProjectPages.h" #include "ImageId.h" #include "PageId.h" +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/filters/fix_orientation/Settings.cpp b/filters/fix_orientation/Settings.cpp index 614a5c63..55ee673f 100644 --- a/filters/fix_orientation/Settings.cpp +++ b/filters/fix_orientation/Settings.cpp @@ -20,7 +20,9 @@ #include "Utils.h" #include "RelinkablePath.h" #include "AbstractRelinker.h" +#ifndef Q_MOC_RUN #include +#endif namespace fix_orientation { diff --git a/filters/output/ChangeDewarpingDialog.cpp b/filters/output/ChangeDewarpingDialog.cpp index f6678100..7c02aeaa 100644 --- a/filters/output/ChangeDewarpingDialog.cpp +++ b/filters/output/ChangeDewarpingDialog.cpp @@ -20,8 +20,10 @@ #include "ChangeDewarpingDialog.h.moc" #include "PageSelectionAccessor.h" #include "QtSignalForwarder.h" +#ifndef Q_MOC_RUN #include #include +#endif namespace output { diff --git a/filters/output/ChangeDpiDialog.cpp b/filters/output/ChangeDpiDialog.cpp index 5c34ebe2..1e278e84 100644 --- a/filters/output/ChangeDpiDialog.cpp +++ b/filters/output/ChangeDpiDialog.cpp @@ -26,7 +26,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include namespace output diff --git a/filters/output/DewarpingView.cpp b/filters/output/DewarpingView.cpp index 28d200e0..96252eb9 100644 --- a/filters/output/DewarpingView.cpp +++ b/filters/output/DewarpingView.cpp @@ -43,9 +43,11 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include diff --git a/filters/output/FillZoneEditor.cpp b/filters/output/FillZoneEditor.cpp index 780da467..207e7064 100644 --- a/filters/output/FillZoneEditor.cpp +++ b/filters/output/FillZoneEditor.cpp @@ -39,8 +39,10 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include #include diff --git a/filters/output/FillZoneEditor.h b/filters/output/FillZoneEditor.h index 4a8dc932..e6a51d88 100644 --- a/filters/output/FillZoneEditor.h +++ b/filters/output/FillZoneEditor.h @@ -32,7 +32,9 @@ #include "EditableZoneSet.h" #include "ZoomHandler.h" #include "DragHandler.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/output/OptionsWidget.cpp b/filters/output/OptionsWidget.cpp index 382e3857..480862bc 100644 --- a/filters/output/OptionsWidget.cpp +++ b/filters/output/OptionsWidget.cpp @@ -31,7 +31,9 @@ #include "../../Utils.h" #include "ScopedIncDec.h" #include "config.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/output/OutputGenerator.cpp b/filters/output/OutputGenerator.cpp index 8fba04ac..759d9c6a 100644 --- a/filters/output/OutputGenerator.cpp +++ b/filters/output/OutputGenerator.cpp @@ -61,9 +61,11 @@ #include "imageproc/ConnectivityMap.h" #include "imageproc/InfluenceMap.h" #include "config.h" +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/filters/output/OutputGenerator.h b/filters/output/OutputGenerator.h index fbd149b8..904aa406 100644 --- a/filters/output/OutputGenerator.h +++ b/filters/output/OutputGenerator.h @@ -26,7 +26,9 @@ #include "DespeckleLevel.h" #include "DewarpingMode.h" #include "ImageTransformation.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/output/PictureZoneEditor.cpp b/filters/output/PictureZoneEditor.cpp index 392cc04d..08c174a2 100644 --- a/filters/output/PictureZoneEditor.cpp +++ b/filters/output/PictureZoneEditor.cpp @@ -41,8 +41,10 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include namespace output diff --git a/filters/output/Settings.cpp b/filters/output/Settings.cpp index 4aaa377e..700b768f 100644 --- a/filters/output/Settings.cpp +++ b/filters/output/Settings.cpp @@ -23,7 +23,9 @@ #include "RelinkablePath.h" #include "AbstractRelinker.h" #include "../../Utils.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/output/Task.cpp b/filters/output/Task.cpp index 04970b44..7a6dca8f 100644 --- a/filters/output/Task.cpp +++ b/filters/output/Task.cpp @@ -58,8 +58,10 @@ #include "ErrorWidget.h" #include "imageproc/BinaryImage.h" #include "imageproc/PolygonUtils.h" +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/filters/page_layout/Filter.cpp b/filters/page_layout/Filter.cpp index 44fee10a..df315c6e 100644 --- a/filters/page_layout/Filter.cpp +++ b/filters/page_layout/Filter.cpp @@ -32,8 +32,10 @@ #include "OrderByWidthProvider.h" #include "OrderByHeightProvider.h" #include "Utils.h" +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/filters/page_layout/ImageView.cpp b/filters/page_layout/ImageView.cpp index 8c8d8b40..72852ef0 100644 --- a/filters/page_layout/ImageView.cpp +++ b/filters/page_layout/ImageView.cpp @@ -37,8 +37,10 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/filters/page_layout/OptionsWidget.cpp b/filters/page_layout/OptionsWidget.cpp index 3fbb56fc..607a0775 100644 --- a/filters/page_layout/OptionsWidget.cpp +++ b/filters/page_layout/OptionsWidget.cpp @@ -25,7 +25,9 @@ #include "PageInfo.h" #include "PageId.h" #include "imageproc/Constants.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/page_layout/Settings.cpp b/filters/page_layout/Settings.cpp index a2d9a75a..fe67252b 100644 --- a/filters/page_layout/Settings.cpp +++ b/filters/page_layout/Settings.cpp @@ -27,6 +27,7 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include @@ -34,6 +35,7 @@ #include #include #include +#endif #include #include // for std::greater<> #include diff --git a/filters/page_split/Filter.cpp b/filters/page_split/Filter.cpp index 83b879a6..83fd1653 100644 --- a/filters/page_split/Filter.cpp +++ b/filters/page_split/Filter.cpp @@ -31,8 +31,10 @@ #include "Params.h" #include "CacheDrivenTask.h" #include "OrthogonalRotation.h" +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/filters/page_split/ImageView.cpp b/filters/page_split/ImageView.cpp index 3040e173..82baca98 100644 --- a/filters/page_split/ImageView.cpp +++ b/filters/page_split/ImageView.cpp @@ -29,8 +29,10 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include namespace page_split diff --git a/filters/page_split/OptionsWidget.cpp b/filters/page_split/OptionsWidget.cpp index 9bc626bc..f26d344a 100644 --- a/filters/page_split/OptionsWidget.cpp +++ b/filters/page_split/OptionsWidget.cpp @@ -27,7 +27,9 @@ #include "ProjectPages.h" #include "ScopedIncDec.h" #include +#ifndef Q_MOC_RUN #include +#endif #include namespace page_split diff --git a/filters/page_split/PageLayout.cpp b/filters/page_split/PageLayout.cpp index d5bf0a9d..70e0ee7c 100644 --- a/filters/page_split/PageLayout.cpp +++ b/filters/page_split/PageLayout.cpp @@ -28,7 +28,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/page_split/PageLayoutEstimator.cpp b/filters/page_split/PageLayoutEstimator.cpp index b66ea271..98043579 100644 --- a/filters/page_split/PageLayoutEstimator.cpp +++ b/filters/page_split/PageLayoutEstimator.cpp @@ -47,9 +47,11 @@ #include "imageproc/Grayscale.h" #include "imageproc/GrayRasterOp.h" #include "imageproc/PolygonRasterizer.h" +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include #include diff --git a/filters/page_split/Settings.cpp b/filters/page_split/Settings.cpp index e0e7a12c..b2849b37 100644 --- a/filters/page_split/Settings.cpp +++ b/filters/page_split/Settings.cpp @@ -20,7 +20,9 @@ #include "RelinkablePath.h" #include "AbstractRelinker.h" #include +#ifndef Q_MOC_RUN #include +#endif #include namespace page_split diff --git a/filters/page_split/UnremoveButton.h b/filters/page_split/UnremoveButton.h index 948a255f..f1b17dac 100644 --- a/filters/page_split/UnremoveButton.h +++ b/filters/page_split/UnremoveButton.h @@ -25,7 +25,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif namespace page_split { diff --git a/filters/page_split/VertLineFinder.cpp b/filters/page_split/VertLineFinder.cpp index ceeabb9a..3bebf147 100644 --- a/filters/page_split/VertLineFinder.cpp +++ b/filters/page_split/VertLineFinder.cpp @@ -28,7 +28,9 @@ #include "imageproc/MorphGradientDetect.h" #include "imageproc/HoughLineDetector.h" #include "imageproc/Constants.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/select_content/ContentBoxFinder.cpp b/filters/select_content/ContentBoxFinder.cpp index ea1545cd..495a1e1c 100644 --- a/filters/select_content/ContentBoxFinder.cpp +++ b/filters/select_content/ContentBoxFinder.cpp @@ -42,7 +42,9 @@ #include "imageproc/ConnectivityMap.h" #include "imageproc/InfluenceMap.h" #include "imageproc/SEDM.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/filters/select_content/Filter.cpp b/filters/select_content/Filter.cpp index 4817c6fd..b0361b0c 100644 --- a/filters/select_content/Filter.cpp +++ b/filters/select_content/Filter.cpp @@ -28,8 +28,10 @@ #include "CacheDrivenTask.h" #include "OrderByWidthProvider.h" #include "OrderByHeightProvider.h" +#ifndef Q_MOC_RUN #include #include +#endif #include #include #include diff --git a/filters/select_content/ImageView.cpp b/filters/select_content/ImageView.cpp index 7f9e2ae7..f5a732e6 100644 --- a/filters/select_content/ImageView.cpp +++ b/filters/select_content/ImageView.cpp @@ -32,7 +32,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include namespace select_content diff --git a/filters/select_content/OptionsWidget.cpp b/filters/select_content/OptionsWidget.cpp index c7e2549b..2a2bae87 100644 --- a/filters/select_content/OptionsWidget.cpp +++ b/filters/select_content/OptionsWidget.cpp @@ -22,7 +22,9 @@ #include "Settings.h" #include "Params.h" #include "ScopedIncDec.h" +#ifndef Q_MOC_RUN #include +#endif namespace select_content { diff --git a/filters/select_content/Settings.cpp b/filters/select_content/Settings.cpp index 614a794b..306e7ff7 100644 --- a/filters/select_content/Settings.cpp +++ b/filters/select_content/Settings.cpp @@ -21,7 +21,9 @@ #include "RelinkablePath.h" #include "AbstractRelinker.h" #include +#ifndef Q_MOC_RUN #include +#endif namespace select_content { diff --git a/foundation/PropertySet.cpp b/foundation/PropertySet.cpp index 6395671b..301b31ea 100644 --- a/foundation/PropertySet.cpp +++ b/foundation/PropertySet.cpp @@ -21,7 +21,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif PropertySet::PropertySet(QDomElement const& el, PropertyFactory const& factory) { diff --git a/foundation/QtSignalForwarder.h b/foundation/QtSignalForwarder.h index 2f683b1a..3f70a7a7 100644 --- a/foundation/QtSignalForwarder.h +++ b/foundation/QtSignalForwarder.h @@ -21,7 +21,9 @@ #include "NonCopyable.h" #include +#ifndef Q_MOC_RUN #include +#endif /** * \brief Connects to a Qt signal and forwards it to a boost::function. diff --git a/imageproc/ConnCompEraserExt.cpp b/imageproc/ConnCompEraserExt.cpp index 030f8479..94a28d0b 100644 --- a/imageproc/ConnCompEraserExt.cpp +++ b/imageproc/ConnCompEraserExt.cpp @@ -19,7 +19,9 @@ #include "ConnCompEraserExt.h" #include "RasterOp.h" #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/ConnectivityMap.cpp b/imageproc/ConnectivityMap.cpp index fd02588a..3fbab3ec 100644 --- a/imageproc/ConnectivityMap.cpp +++ b/imageproc/ConnectivityMap.cpp @@ -20,7 +20,9 @@ #include "BinaryImage.h" #include "InfluenceMap.h" #include "BitOps.h" +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/GaussBlur.h b/imageproc/GaussBlur.h index 1facb1c1..44e4092f 100644 --- a/imageproc/GaussBlur.h +++ b/imageproc/GaussBlur.h @@ -24,7 +24,9 @@ #include "ValueConv.h" #include +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/imageproc/HoughLineDetector.cpp b/imageproc/HoughLineDetector.cpp index 38f23463..6a6abba4 100644 --- a/imageproc/HoughLineDetector.cpp +++ b/imageproc/HoughLineDetector.cpp @@ -36,7 +36,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/MaxWhitespaceFinder.cpp b/imageproc/MaxWhitespaceFinder.cpp index 5635312c..6b2ac233 100644 --- a/imageproc/MaxWhitespaceFinder.cpp +++ b/imageproc/MaxWhitespaceFinder.cpp @@ -19,7 +19,9 @@ #include "MaxWhitespaceFinder.h" #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/Morphology.cpp b/imageproc/Morphology.cpp index e1e40434..257d6181 100644 --- a/imageproc/Morphology.cpp +++ b/imageproc/Morphology.cpp @@ -25,7 +25,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/PolygonRasterizer.cpp b/imageproc/PolygonRasterizer.cpp index e180de90..4203e905 100644 --- a/imageproc/PolygonRasterizer.cpp +++ b/imageproc/PolygonRasterizer.cpp @@ -26,7 +26,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/PolygonUtils.cpp b/imageproc/PolygonUtils.cpp index 2535cd24..71874c49 100644 --- a/imageproc/PolygonUtils.cpp +++ b/imageproc/PolygonUtils.cpp @@ -20,7 +20,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/PolynomialSurface.cpp b/imageproc/PolynomialSurface.cpp index fc79be3f..9a0a3bf7 100644 --- a/imageproc/PolynomialSurface.cpp +++ b/imageproc/PolynomialSurface.cpp @@ -24,7 +24,9 @@ #include "Grayscale.h" #include "BitOps.h" #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/RasterOp.h b/imageproc/RasterOp.h index 2569c215..0b215273 100644 --- a/imageproc/RasterOp.h +++ b/imageproc/RasterOp.h @@ -23,7 +23,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/imageproc/tests/TestBinarize.cpp b/imageproc/tests/TestBinarize.cpp index 932628c5..4b1f6f78 100644 --- a/imageproc/tests/TestBinarize.cpp +++ b/imageproc/tests/TestBinarize.cpp @@ -21,7 +21,9 @@ #include "Utils.h" #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestBinaryImage.cpp b/imageproc/tests/TestBinaryImage.cpp index 80e3a6a6..3a438b56 100644 --- a/imageproc/tests/TestBinaryImage.cpp +++ b/imageproc/tests/TestBinaryImage.cpp @@ -20,7 +20,9 @@ #include "BWColor.h" #include "Utils.h" #include +#ifndef Q_MOC_RUN #include +#endif #include namespace imageproc diff --git a/imageproc/tests/TestConnCompEraser.cpp b/imageproc/tests/TestConnCompEraser.cpp index d043aca5..c1f59f5b 100644 --- a/imageproc/tests/TestConnCompEraser.cpp +++ b/imageproc/tests/TestConnCompEraser.cpp @@ -23,7 +23,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestConnCompEraserExt.cpp b/imageproc/tests/TestConnCompEraserExt.cpp index 24926ee5..4b3bd51c 100644 --- a/imageproc/tests/TestConnCompEraserExt.cpp +++ b/imageproc/tests/TestConnCompEraserExt.cpp @@ -25,7 +25,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestDentFinder.cpp b/imageproc/tests/TestDentFinder.cpp index a75ffc90..c11560db 100644 --- a/imageproc/tests/TestDentFinder.cpp +++ b/imageproc/tests/TestDentFinder.cpp @@ -20,7 +20,9 @@ #include "BinaryImage.h" #include "Utils.h" #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestGrayscale.cpp b/imageproc/tests/TestGrayscale.cpp index caabc455..2063929a 100644 --- a/imageproc/tests/TestGrayscale.cpp +++ b/imageproc/tests/TestGrayscale.cpp @@ -19,7 +19,9 @@ #include "Grayscale.h" #include "Utils.h" #include +#ifndef Q_MOC_RUN #include +#endif #include namespace imageproc diff --git a/imageproc/tests/TestMorphology.cpp b/imageproc/tests/TestMorphology.cpp index d31edc84..d3ac8ab7 100644 --- a/imageproc/tests/TestMorphology.cpp +++ b/imageproc/tests/TestMorphology.cpp @@ -24,7 +24,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestOrthogonalRotation.cpp b/imageproc/tests/TestOrthogonalRotation.cpp index 44454fe0..33121f96 100644 --- a/imageproc/tests/TestOrthogonalRotation.cpp +++ b/imageproc/tests/TestOrthogonalRotation.cpp @@ -21,7 +21,9 @@ #include "Utils.h" #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestPolygonRasterizer.cpp b/imageproc/tests/TestPolygonRasterizer.cpp index a80c2d95..7b0efff0 100644 --- a/imageproc/tests/TestPolygonRasterizer.cpp +++ b/imageproc/tests/TestPolygonRasterizer.cpp @@ -32,7 +32,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestRasterOp.cpp b/imageproc/tests/TestRasterOp.cpp index fa455ca3..d8ce690d 100644 --- a/imageproc/tests/TestRasterOp.cpp +++ b/imageproc/tests/TestRasterOp.cpp @@ -20,7 +20,9 @@ #include "BinaryImage.h" #include "Utils.h" #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/tests/TestReduceThreshold.cpp b/imageproc/tests/TestReduceThreshold.cpp index 2c043f3e..529829af 100644 --- a/imageproc/tests/TestReduceThreshold.cpp +++ b/imageproc/tests/TestReduceThreshold.cpp @@ -20,7 +20,9 @@ #include "BinaryImage.h" #include "Utils.h" #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestSEDM.cpp b/imageproc/tests/TestSEDM.cpp index 7549c855..3f3819a0 100644 --- a/imageproc/tests/TestSEDM.cpp +++ b/imageproc/tests/TestSEDM.cpp @@ -22,7 +22,9 @@ #include "Utils.h" #include #include +#ifndef Q_MOC_RUN #include +#endif #include diff --git a/imageproc/tests/TestScale.cpp b/imageproc/tests/TestScale.cpp index 14dd7003..9b4bc4ed 100644 --- a/imageproc/tests/TestScale.cpp +++ b/imageproc/tests/TestScale.cpp @@ -21,7 +21,9 @@ #include "Utils.h" #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/imageproc/tests/TestSeedFill.cpp b/imageproc/tests/TestSeedFill.cpp index d60b9d00..4c41f8ff 100644 --- a/imageproc/tests/TestSeedFill.cpp +++ b/imageproc/tests/TestSeedFill.cpp @@ -25,7 +25,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestShear.cpp b/imageproc/tests/TestShear.cpp index 89694e3e..427d7b43 100644 --- a/imageproc/tests/TestShear.cpp +++ b/imageproc/tests/TestShear.cpp @@ -21,7 +21,9 @@ #include "BWColor.h" #include "Utils.h" #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestSkewFinder.cpp b/imageproc/tests/TestSkewFinder.cpp index 9ea109cb..2871eb18 100644 --- a/imageproc/tests/TestSkewFinder.cpp +++ b/imageproc/tests/TestSkewFinder.cpp @@ -24,7 +24,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/imageproc/tests/TestSlicedHistogram.cpp b/imageproc/tests/TestSlicedHistogram.cpp index 56466425..1d0429a5 100644 --- a/imageproc/tests/TestSlicedHistogram.cpp +++ b/imageproc/tests/TestSlicedHistogram.cpp @@ -22,7 +22,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif namespace imageproc { diff --git a/imageproc/tests/TestTransform.cpp b/imageproc/tests/TestTransform.cpp index 41da64bc..aa5b124d 100644 --- a/imageproc/tests/TestTransform.cpp +++ b/imageproc/tests/TestTransform.cpp @@ -21,7 +21,9 @@ #include "Utils.h" #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/interaction/DragHandler.h b/interaction/DragHandler.h index 922ebc25..f875177c 100644 --- a/interaction/DragHandler.h +++ b/interaction/DragHandler.h @@ -25,7 +25,9 @@ #include "InteractionState.h" #include #include +#ifndef Q_MOC_RUN #include +#endif class ImageViewBase; diff --git a/interaction/DraggableLineSegment.h b/interaction/DraggableLineSegment.h index 4c7881c0..39ed22c2 100644 --- a/interaction/DraggableLineSegment.h +++ b/interaction/DraggableLineSegment.h @@ -22,7 +22,9 @@ #include "DraggableObject.h" #include #include +#ifndef Q_MOC_RUN #include +#endif class ObjectDragHandler; diff --git a/interaction/DraggablePoint.h b/interaction/DraggablePoint.h index 23f740d3..c775b717 100644 --- a/interaction/DraggablePoint.h +++ b/interaction/DraggablePoint.h @@ -21,7 +21,9 @@ #include "DraggableObject.h" #include +#ifndef Q_MOC_RUN #include +#endif class DraggablePoint : public DraggableObject { diff --git a/interaction/InteractionHandler.cpp b/interaction/InteractionHandler.cpp index 76a0b46e..65b5df9c 100644 --- a/interaction/InteractionHandler.cpp +++ b/interaction/InteractionHandler.cpp @@ -24,9 +24,11 @@ #include #include #include +#ifndef Q_MOC_RUn #include #include #include +#endif #include #define DISPATCH(list, call) { \ diff --git a/interaction/InteractionState.h b/interaction/InteractionState.h index 869ce9e7..377eef8d 100644 --- a/interaction/InteractionState.h +++ b/interaction/InteractionState.h @@ -21,7 +21,9 @@ #include "NonCopyable.h" #include "Proximity.h" +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/interaction/InteractiveXSpline.cpp b/interaction/InteractiveXSpline.cpp index 2f1991ae..81b0e695 100644 --- a/interaction/InteractiveXSpline.cpp +++ b/interaction/InteractiveXSpline.cpp @@ -23,7 +23,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif struct InteractiveXSpline::NoOp { diff --git a/interaction/InteractiveXSpline.h b/interaction/InteractiveXSpline.h index 95512157..a3bc2ec0 100644 --- a/interaction/InteractiveXSpline.h +++ b/interaction/InteractiveXSpline.h @@ -26,8 +26,10 @@ #include "VecNT.h" #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include class InteractiveXSpline : public InteractionHandler diff --git a/interaction/ZoomHandler.h b/interaction/ZoomHandler.h index adf0f400..e6aa7362 100644 --- a/interaction/ZoomHandler.h +++ b/interaction/ZoomHandler.h @@ -23,7 +23,9 @@ #include "InteractionState.h" #include #include +#ifndef Q_MOC_RUN #include +#endif class ImageViewBase; diff --git a/math/XSpline.cpp b/math/XSpline.cpp index e304583a..a6a5c544 100644 --- a/math/XSpline.cpp +++ b/math/XSpline.cpp @@ -25,7 +25,9 @@ #include "adiff/Function.h" #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/math/spfit/PolylineModelShape.cpp b/math/spfit/PolylineModelShape.cpp index d1b282ca..1b623d19 100644 --- a/math/spfit/PolylineModelShape.cpp +++ b/math/spfit/PolylineModelShape.cpp @@ -23,7 +23,9 @@ #include "VecNT.h" #include "ToLineProjector.h" #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/math/spfit/tests/TestSqDistApproximant.cpp b/math/spfit/tests/TestSqDistApproximant.cpp index a7f39670..c96b67da 100644 --- a/math/spfit/tests/TestSqDistApproximant.cpp +++ b/math/spfit/tests/TestSqDistApproximant.cpp @@ -21,8 +21,10 @@ #include "ToLineProjector.h" #include #include +#ifndef Q_MOC_RUN #include #include +#endif #include #include diff --git a/tests/TestSmartFilenameOrdering.cpp b/tests/TestSmartFilenameOrdering.cpp index 61a30046..6f29d603 100644 --- a/tests/TestSmartFilenameOrdering.cpp +++ b/tests/TestSmartFilenameOrdering.cpp @@ -19,7 +19,9 @@ #include "SmartFilenameOrdering.h" #include #include +#ifndef Q_MOC_RUN #include +#endif namespace Tests { diff --git a/zones/BasicSplineVisualizer.cpp b/zones/BasicSplineVisualizer.cpp index 355237bb..d6820396 100644 --- a/zones/BasicSplineVisualizer.cpp +++ b/zones/BasicSplineVisualizer.cpp @@ -21,7 +21,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif BasicSplineVisualizer::BasicSplineVisualizer() : m_solidColor(0xcc1420), diff --git a/zones/EditableSpline.cpp b/zones/EditableSpline.cpp index f5d01e48..fcc4a7c2 100644 --- a/zones/EditableSpline.cpp +++ b/zones/EditableSpline.cpp @@ -22,7 +22,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include EditableSpline::EditableSpline() diff --git a/zones/EditableZoneSet.h b/zones/EditableZoneSet.h index 4ecfd0d9..90005dd5 100644 --- a/zones/EditableZoneSet.h +++ b/zones/EditableZoneSet.h @@ -24,9 +24,11 @@ #include "PropertySet.h" #include "IntrusivePtr.h" #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include class EditableZoneSet : public QObject diff --git a/zones/SerializableSpline.cpp b/zones/SerializableSpline.cpp index 87e76ccd..54543323 100644 --- a/zones/SerializableSpline.cpp +++ b/zones/SerializableSpline.cpp @@ -26,7 +26,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif SerializableSpline::SerializableSpline(EditableSpline const& spline) { diff --git a/zones/SerializableSpline.h b/zones/SerializableSpline.h index 72bfe502..bd77b9a5 100644 --- a/zones/SerializableSpline.h +++ b/zones/SerializableSpline.h @@ -22,7 +22,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif class EditableSpline; class QTransform; diff --git a/zones/ZoneContextMenuInteraction.cpp b/zones/ZoneContextMenuInteraction.cpp index 65ff3142..98edbaa1 100644 --- a/zones/ZoneContextMenuInteraction.cpp +++ b/zones/ZoneContextMenuInteraction.cpp @@ -33,9 +33,11 @@ #include #include #include +#ifndef Q_MOC_RUN #include #include #include +#endif #include #include diff --git a/zones/ZoneContextMenuInteraction.h b/zones/ZoneContextMenuInteraction.h index daa151da..914366b3 100644 --- a/zones/ZoneContextMenuInteraction.h +++ b/zones/ZoneContextMenuInteraction.h @@ -30,7 +30,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include #include diff --git a/zones/ZoneContextMenuItem.h b/zones/ZoneContextMenuItem.h index 4d89ea58..efa8bdb6 100644 --- a/zones/ZoneContextMenuItem.h +++ b/zones/ZoneContextMenuItem.h @@ -20,7 +20,9 @@ #define ZONE_CONTEXT_MENU_ITEM_H_ #include +#ifndef Q_MOC_RUN #include +#endif class InteractionState; class InteractionHandler; diff --git a/zones/ZoneCreationInteraction.cpp b/zones/ZoneCreationInteraction.cpp index cd80ec69..5d991da4 100644 --- a/zones/ZoneCreationInteraction.cpp +++ b/zones/ZoneCreationInteraction.cpp @@ -30,7 +30,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif ZoneCreationInteraction::ZoneCreationInteraction( ZoneInteractionContext& context, InteractionState& interaction) diff --git a/zones/ZoneDefaultInteraction.cpp b/zones/ZoneDefaultInteraction.cpp index b3a714d8..e1c95b79 100644 --- a/zones/ZoneDefaultInteraction.cpp +++ b/zones/ZoneDefaultInteraction.cpp @@ -30,7 +30,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/zones/ZoneInteractionContext.cpp b/zones/ZoneInteractionContext.cpp index 3ebefbb7..6efb31ce 100644 --- a/zones/ZoneInteractionContext.cpp +++ b/zones/ZoneInteractionContext.cpp @@ -21,7 +21,9 @@ #include "ZoneCreationInteraction.h" #include "ZoneVertexDragInteraction.h" #include "ZoneContextMenuInteraction.h" +#ifndef Q_MOC_RUN #include +#endif ZoneInteractionContext::ZoneInteractionContext( ImageViewBase& image_view, EditableZoneSet& zones) diff --git a/zones/ZoneInteractionContext.h b/zones/ZoneInteractionContext.h index a973053a..3e907fbf 100644 --- a/zones/ZoneInteractionContext.h +++ b/zones/ZoneInteractionContext.h @@ -22,7 +22,9 @@ #include "EditableSpline.h" #include "SplineVertex.h" #include "EditableZoneSet.h" +#ifndef Q_MOC_RUN #include +#endif class InteractionHandler; class InteractionState; diff --git a/zones/ZoneSet.cpp b/zones/ZoneSet.cpp index b21e7970..fdbcc3a3 100644 --- a/zones/ZoneSet.cpp +++ b/zones/ZoneSet.cpp @@ -21,7 +21,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif ZoneSet::ZoneSet(QDomElement const& el, PropertyFactory const& prop_factory) { diff --git a/zones/ZoneVertexDragInteraction.cpp b/zones/ZoneVertexDragInteraction.cpp index 64a5831b..e6e6d8c2 100644 --- a/zones/ZoneVertexDragInteraction.cpp +++ b/zones/ZoneVertexDragInteraction.cpp @@ -27,7 +27,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif ZoneVertexDragInteraction::ZoneVertexDragInteraction( ZoneInteractionContext& context, InteractionState& interaction,