Permalink
Browse files

applied fix-qt4-parsing-error-on-libboost.patch from Debian

  • Loading branch information...
1 parent b9bae62 commit af2c7931bc507f39b446cf635717b86736709d07 Daniel Stender committed Oct 8, 2015
Showing with 258 additions and 0 deletions.
  1. +2 −0 Despeckle.cpp
  2. +2 −0 EstimateBackground.cpp
  3. +2 −0 FileNameDisambiguator.cpp
  4. +2 −0 FixDpiDialog.cpp
  5. +2 −0 LoadFilesStatusDialog.cpp
  6. +2 −0 MainWindow.cpp
  7. +2 −0 MainWindow.h
  8. +2 −0 NewOpenProjectPanel.cpp
  9. +2 −0 OutOfMemoryHandler.h
  10. +2 −0 ProjectCreationContext.cpp
  11. +2 −0 ProjectPages.cpp
  12. +2 −0 ProjectReader.cpp
  13. +2 −0 ProjectWriter.cpp
  14. +2 −0 ProjectWriter.h
  15. +2 −0 RecentProjects.cpp
  16. +2 −0 RelinkablePath.cpp
  17. +2 −0 RelinkablePathVisualization.cpp
  18. +2 −0 RelinkingDialog.cpp
  19. +2 −0 RelinkingListView.cpp
  20. +2 −0 RelinkingModel.cpp
  21. +2 −0 StageListView.cpp
  22. +2 −0 TabbedDebugImages.h
  23. +2 −0 ThumbnailBase.cpp
  24. +2 −0 ThumbnailBase.h
  25. +2 −0 ThumbnailPixmapCache.cpp
  26. +2 −0 ThumbnailPixmapCache.h
  27. +2 −0 ThumbnailSequence.cpp
  28. +2 −0 XmlMarshaller.cpp
  29. +2 −0 dewarping/Curve.cpp
  30. +2 −0 dewarping/CylindricalSurfaceDewarper.cpp
  31. +2 −0 dewarping/CylindricalSurfaceDewarper.h
  32. +2 −0 dewarping/DetectVertContentBounds.cpp
  33. +2 −0 dewarping/DistortionModel.cpp
  34. +2 −0 dewarping/DistortionModelBuilder.cpp
  35. +2 −0 dewarping/TextLineRefiner.cpp
  36. +2 −0 dewarping/TextLineTracer.cpp
  37. +2 −0 dewarping/TopBottomEdgeTracer.cpp
  38. +2 −0 dewarping/TowardsLineTracer.cpp
  39. +2 −0 filters/deskew/Filter.cpp
  40. +2 −0 filters/deskew/ImageView.cpp
  41. +2 −0 filters/deskew/OptionsWidget.cpp
  42. +2 −0 filters/deskew/Settings.cpp
  43. +2 −0 filters/fix_orientation/Filter.cpp
  44. +2 −0 filters/fix_orientation/OptionsWidget.cpp
  45. +2 −0 filters/fix_orientation/Settings.cpp
  46. +2 −0 filters/output/ChangeDewarpingDialog.cpp
  47. +2 −0 filters/output/ChangeDpiDialog.cpp
  48. +2 −0 filters/output/DewarpingView.cpp
  49. +2 −0 filters/output/FillZoneEditor.cpp
  50. +2 −0 filters/output/FillZoneEditor.h
  51. +2 −0 filters/output/OptionsWidget.cpp
  52. +2 −0 filters/output/OutputGenerator.cpp
  53. +2 −0 filters/output/OutputGenerator.h
  54. +2 −0 filters/output/PictureZoneEditor.cpp
  55. +2 −0 filters/output/Settings.cpp
  56. +2 −0 filters/output/Task.cpp
  57. +2 −0 filters/page_layout/Filter.cpp
  58. +2 −0 filters/page_layout/ImageView.cpp
  59. +2 −0 filters/page_layout/OptionsWidget.cpp
  60. +2 −0 filters/page_layout/Settings.cpp
  61. +2 −0 filters/page_split/Filter.cpp
  62. +2 −0 filters/page_split/ImageView.cpp
  63. +2 −0 filters/page_split/OptionsWidget.cpp
  64. +2 −0 filters/page_split/PageLayout.cpp
  65. +2 −0 filters/page_split/PageLayoutEstimator.cpp
  66. +2 −0 filters/page_split/Settings.cpp
  67. +2 −0 filters/page_split/UnremoveButton.h
  68. +2 −0 filters/page_split/VertLineFinder.cpp
  69. +2 −0 filters/select_content/ContentBoxFinder.cpp
  70. +2 −0 filters/select_content/Filter.cpp
  71. +2 −0 filters/select_content/ImageView.cpp
  72. +2 −0 filters/select_content/OptionsWidget.cpp
  73. +2 −0 filters/select_content/Settings.cpp
  74. +2 −0 foundation/PropertySet.cpp
  75. +2 −0 foundation/QtSignalForwarder.h
  76. +2 −0 imageproc/ConnCompEraserExt.cpp
  77. +2 −0 imageproc/ConnectivityMap.cpp
  78. +2 −0 imageproc/GaussBlur.h
  79. +2 −0 imageproc/HoughLineDetector.cpp
  80. +2 −0 imageproc/MaxWhitespaceFinder.cpp
  81. +2 −0 imageproc/Morphology.cpp
  82. +2 −0 imageproc/PolygonRasterizer.cpp
  83. +2 −0 imageproc/PolygonUtils.cpp
  84. +2 −0 imageproc/PolynomialSurface.cpp
  85. +2 −0 imageproc/RasterOp.h
  86. +2 −0 imageproc/tests/TestBinarize.cpp
  87. +2 −0 imageproc/tests/TestBinaryImage.cpp
  88. +2 −0 imageproc/tests/TestConnCompEraser.cpp
  89. +2 −0 imageproc/tests/TestConnCompEraserExt.cpp
  90. +2 −0 imageproc/tests/TestDentFinder.cpp
  91. +2 −0 imageproc/tests/TestGrayscale.cpp
  92. +2 −0 imageproc/tests/TestMorphology.cpp
  93. +2 −0 imageproc/tests/TestOrthogonalRotation.cpp
  94. +2 −0 imageproc/tests/TestPolygonRasterizer.cpp
  95. +2 −0 imageproc/tests/TestRasterOp.cpp
  96. +2 −0 imageproc/tests/TestReduceThreshold.cpp
  97. +2 −0 imageproc/tests/TestSEDM.cpp
  98. +2 −0 imageproc/tests/TestScale.cpp
  99. +2 −0 imageproc/tests/TestSeedFill.cpp
  100. +2 −0 imageproc/tests/TestShear.cpp
  101. +2 −0 imageproc/tests/TestSkewFinder.cpp
  102. +2 −0 imageproc/tests/TestSlicedHistogram.cpp
  103. +2 −0 imageproc/tests/TestTransform.cpp
  104. +2 −0 interaction/DragHandler.h
  105. +2 −0 interaction/DraggableLineSegment.h
  106. +2 −0 interaction/DraggablePoint.h
  107. +2 −0 interaction/InteractionHandler.cpp
  108. +2 −0 interaction/InteractionState.h
  109. +2 −0 interaction/InteractiveXSpline.cpp
  110. +2 −0 interaction/InteractiveXSpline.h
  111. +2 −0 interaction/ZoomHandler.h
  112. +2 −0 math/XSpline.cpp
  113. +2 −0 math/spfit/PolylineModelShape.cpp
  114. +2 −0 math/spfit/tests/TestSqDistApproximant.cpp
  115. +2 −0 tests/TestSmartFilenameOrdering.cpp
  116. +2 −0 zones/BasicSplineVisualizer.cpp
  117. +2 −0 zones/EditableSpline.cpp
  118. +2 −0 zones/EditableZoneSet.h
  119. +2 −0 zones/SerializableSpline.cpp
  120. +2 −0 zones/SerializableSpline.h
  121. +2 −0 zones/ZoneContextMenuInteraction.cpp
  122. +2 −0 zones/ZoneContextMenuInteraction.h
  123. +2 −0 zones/ZoneContextMenuItem.h
  124. +2 −0 zones/ZoneCreationInteraction.cpp
  125. +2 −0 zones/ZoneDefaultInteraction.cpp
  126. +2 −0 zones/ZoneInteractionContext.cpp
  127. +2 −0 zones/ZoneInteractionContext.h
  128. +2 −0 zones/ZoneSet.cpp
  129. +2 −0 zones/ZoneVertexDragInteraction.cpp
View
@@ -24,7 +24,9 @@
#include "imageproc/BinaryImage.h"
#include "imageproc/ConnectivityMap.h"
#include "imageproc/Connectivity.h"
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <QtGlobal>
#include <QImage>
#include <QDebug>
@@ -42,9 +42,11 @@
#include <QTransform>
#include <QDebug>
#include <Qt>
+#ifndef Q_MOC_RUN
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/lambda/control_structures.hpp>
+#endif
#include <vector>
#include <algorithm>
#include <stdint.h>
@@ -24,13 +24,15 @@
#include <QDomDocument>
#include <QDomElement>
#include <QMutex>
+#ifndef Q_MOC_RUN
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/multi_index/composite_key.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/foreach.hpp>
+#endif
using namespace boost::multi_index;
View
@@ -30,9 +30,11 @@
#include <QColor>
#include <Qt>
#include <QDebug>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#endif
#include <vector>
#include <algorithm>
#include <assert.h>
@@ -18,7 +18,9 @@
#include "LoadFilesStatusDialog.h"
#include <QPushButton>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
LoadFilesStatusDialog::LoadFilesStatusDialog(QWidget* parent)
: QDialog(parent)
View
@@ -91,9 +91,11 @@
#include "ui_BatchProcessingLowerPanel.h"
#include "config.h"
#include "version.h"
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#endif
#include <QApplication>
#include <QLineF>
#include <QPointer>
View
@@ -33,7 +33,9 @@
#include "PageRange.h"
#include "SelectedPage.h"
#include "BeforeOrAfter.h"
+#ifndef Q_MOC_RUN
#include <boost/function.hpp>
+#endif
#include <QMainWindow>
#include <QString>
#include <QPointer>
@@ -19,8 +19,10 @@
#include "NewOpenProjectPanel.h.moc"
#include "RecentProjects.h"
#include "Utils.h"
+#ifndef Q_MOC_RUN
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#endif
#include <QVBoxLayout>
#include <QPainter>
#include <QPalette>
@@ -22,7 +22,9 @@
#include "NonCopyable.h"
#include <QObject>
#include <QMutex>
+#ifndef Q_MOC_RUN
#include <boost/scoped_array.hpp>
+#endif
#include <stddef.h>
class OutOfMemoryHandler : public QObject
@@ -22,8 +22,10 @@
#include "ImageFileInfo.h"
#include <QString>
#include <Qt>
+#ifndef Q_MOC_RUN
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#endif
#include <algorithm>
#include <assert.h>
View
@@ -25,11 +25,13 @@
#include "PageSequence.h"
#include "RelinkablePath.h"
#include "AbstractRelinker.h"
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/member.hpp>
+#endif
#include <QMutexLocker>
#include <QFileInfo>
#include <QSize>
View
@@ -26,7 +26,9 @@
#include <QDir>
#include <QDomElement>
#include <QDomNode>
+#ifndef Q_MOC_RUN
#include <boost/bind.hpp>
+#endif
#include <set>
ProjectReader::ProjectReader(QDomDocument const& doc)
View
@@ -30,8 +30,10 @@
#include <QFile>
#include <QTextStream>
#include <QFileInfo>
+#ifndef Q_MOC_RUN
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
+#endif
#include <stddef.h>
#include <assert.h>
View
@@ -26,10 +26,12 @@
#include "PageId.h"
#include "SelectedPage.h"
#include "VirtualFunction.h"
+#ifndef Q_MOC_RUN
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/member.hpp>
+#endif
#include <QString>
#include <Qt>
#include <vector>
View
@@ -17,7 +17,9 @@
*/
#include "RecentProjects.h"
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <QSettings>
#include <QFile>
#include <algorithm>
View
@@ -18,7 +18,9 @@
#include "RelinkablePath.h"
#include <QStringList>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
RelinkablePath::RelinkablePath(QString const& path, Type type)
: m_normalizedPath(normalize(path))
@@ -33,8 +33,10 @@
#include <QStyleOptionButton>
#include <QFile>
#include <QVariant>
+#ifndef Q_MOC_RUN
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
+#endif
#include <vector>
struct RelinkablePathVisualization::PathComponent
View
@@ -22,7 +22,9 @@
#include <QDir>
#include <QFileDialog>
#include <QDebug>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <assert.h>
RelinkingDialog::RelinkingDialog(QString const& project_file_path, QWidget* parent)
@@ -27,7 +27,9 @@
#include <QBrush>
#include <QColor>
#include <QVariant>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <vector>
class RelinkingListView::Delegate : public QStyledItemDelegate
View
@@ -27,11 +27,13 @@
#include <QCoreApplication>
#include <QColor>
#include <Qt>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/member.hpp>
+#endif
#include <utility>
#include <iterator>
#include <algorithm>
View
@@ -36,7 +36,9 @@
#include <QVariant>
#include <Qt>
#include <QDebug>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <algorithm>
#include <memory>
#include <assert.h>
View
@@ -21,7 +21,9 @@
#include "DebugImageView.h"
#include <QTabWidget>
+#ifndef Q_MOC_RUN
#include <boost/intrusive/list.hpp>
+#endif
class TabbedDebugImages : public QTabWidget
{
View
@@ -23,7 +23,9 @@
#include "AbstractCommand.h"
#include "PixmapRenderer.h"
#include "imageproc/PolygonUtils.h"
+#ifndef Q_MOC_RUN
#include <boost/weak_ptr.hpp>
+#endif
#include <QPixmap>
#include <QPixmapCache>
#include <QPainter>
View
@@ -24,7 +24,9 @@
#include "ImageTransformation.h"
#include "IntrusivePtr.h"
#include "ThumbnailPixmapCache.h"
+#ifndef Q_MOC_RUN
#include <boost/shared_ptr.hpp>
+#endif
#include <QTransform>
#include <QGraphicsItem>
#include <QSizeF>
@@ -39,11 +39,13 @@
#include <QEvent>
#include <QSize>
#include <QDebug>
+#ifndef Q_MOC_RUN
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/foreach.hpp>
+#endif
#include <algorithm>
#include <vector>
#include <new>
@@ -23,7 +23,9 @@
#include "RefCountable.h"
#include "ThumbnailLoadResult.h"
#include "AbstractCommand.h"
+#ifndef Q_MOC_RUN
#include <boost/weak_ptr.hpp>
+#endif
#include <memory>
class ImageId;
@@ -28,6 +28,7 @@
#include "RefCountable.h"
#include "IntrusivePtr.h"
#include "ScopedIncDec.h"
+#ifndef Q_MOC_RUN
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/sequenced_index.hpp>
@@ -36,6 +37,7 @@
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/foreach.hpp>
+#endif
#include <QGraphicsScene>
#include <QGraphicsItem>
#include <QGraphicsItemGroup>
View
@@ -21,7 +21,9 @@
#include "Margins.h"
#include "Dpi.h"
#include "Utils.h"
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <QPointF>
#include <QLineF>
#include <QRect>
View
@@ -20,7 +20,9 @@
#include "XmlMarshaller.h"
#include "XmlUnmarshaller.h"
#include "VecNT.h"
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <QByteArray>
#include <QDataStream>
#include <QDomDocument>
@@ -24,7 +24,9 @@
#include <QLineF>
#include <QtGlobal>
#include <QDebug>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <algorithm>
#include <math.h>
#include <assert.h>
@@ -22,7 +22,9 @@
#include "HomographicTransform.h"
#include "PolylineIntersector.h"
#include "ArcLengthMapper.h"
+#ifndef Q_MOC_RUN
#include <boost/array.hpp>
+#endif
#include <vector>
#include <utility>
#include <QPointF>
@@ -32,9 +32,11 @@
#include <QColor>
#include <Qt>
#include <QtGlobal>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#endif
#include <vector>
#include <deque>
#include <algorithm>
@@ -26,7 +26,9 @@
#include <QString>
#include <QDomDocument>
#include <QDomElement>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <algorithm>
namespace dewarping
@@ -39,7 +39,9 @@
#include <QPen>
#include <QColor>
#include <QDebug>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
#include <algorithm>
#include <exception>
#include <iterator>
@@ -24,10 +24,12 @@
#include "imageproc/GrayImage.h"
#include "imageproc/GaussBlur.h"
#include "imageproc/Sobel.h"
+#ifndef Q_MOC_RUN
#include <boost/scoped_array.hpp>
#include <boost/foreach.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#endif
#include <QImage>
#include <QPainter>
#include <QPen>
Oops, something went wrong.

0 comments on commit af2c793

Please sign in to comment.