Skip to content

Commit af2c793

Browse files
author
Daniel Stender
committed
applied fix-qt4-parsing-error-on-libboost.patch from Debian
1 parent b9bae62 commit af2c793

File tree

129 files changed

+258
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+258
-0
lines changed

‎Despeckle.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#include "imageproc/BinaryImage.h"
2525
#include "imageproc/ConnectivityMap.h"
2626
#include "imageproc/Connectivity.h"
27+
#ifndef Q_MOC_RUN
2728
#include <boost/foreach.hpp>
29+
#endif
2830
#include <QtGlobal>
2931
#include <QImage>
3032
#include <QDebug>

‎EstimateBackground.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@
4242
#include <QTransform>
4343
#include <QDebug>
4444
#include <Qt>
45+
#ifndef Q_MOC_RUN
4546
#include <boost/lambda/lambda.hpp>
4647
#include <boost/lambda/bind.hpp>
4748
#include <boost/lambda/control_structures.hpp>
49+
#endif
4850
#include <vector>
4951
#include <algorithm>
5052
#include <stdint.h>

‎FileNameDisambiguator.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
#include <QDomDocument>
2525
#include <QDomElement>
2626
#include <QMutex>
27+
#ifndef Q_MOC_RUN
2728
#include <boost/multi_index_container.hpp>
2829
#include <boost/multi_index/ordered_index.hpp>
2930
#include <boost/multi_index/sequenced_index.hpp>
3031
#include <boost/multi_index/member.hpp>
3132
#include <boost/multi_index/composite_key.hpp>
3233
#include <boost/lambda/lambda.hpp>
3334
#include <boost/foreach.hpp>
35+
#endif
3436

3537
using namespace boost::multi_index;
3638

‎FixDpiDialog.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
#include <QColor>
3131
#include <Qt>
3232
#include <QDebug>
33+
#ifndef Q_MOC_RUN
3334
#include <boost/foreach.hpp>
3435
#include <boost/lambda/lambda.hpp>
3536
#include <boost/lambda/bind.hpp>
37+
#endif
3638
#include <vector>
3739
#include <algorithm>
3840
#include <assert.h>

‎LoadFilesStatusDialog.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
#include "LoadFilesStatusDialog.h"
2020
#include <QPushButton>
21+
#ifndef Q_MOC_RUN
2122
#include <boost/foreach.hpp>
23+
#endif
2224

2325
LoadFilesStatusDialog::LoadFilesStatusDialog(QWidget* parent)
2426
: QDialog(parent)

‎MainWindow.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,11 @@
9191
#include "ui_BatchProcessingLowerPanel.h"
9292
#include "config.h"
9393
#include "version.h"
94+
#ifndef Q_MOC_RUN
9495
#include <boost/foreach.hpp>
9596
#include <boost/lambda/lambda.hpp>
9697
#include <boost/lambda/bind.hpp>
98+
#endif
9799
#include <QApplication>
98100
#include <QLineF>
99101
#include <QPointer>

‎MainWindow.h

+2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
#include "PageRange.h"
3434
#include "SelectedPage.h"
3535
#include "BeforeOrAfter.h"
36+
#ifndef Q_MOC_RUN
3637
#include <boost/function.hpp>
38+
#endif
3739
#include <QMainWindow>
3840
#include <QString>
3941
#include <QPointer>

‎NewOpenProjectPanel.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
#include "NewOpenProjectPanel.h.moc"
2020
#include "RecentProjects.h"
2121
#include "Utils.h"
22+
#ifndef Q_MOC_RUN
2223
#include <boost/lambda/lambda.hpp>
2324
#include <boost/lambda/bind.hpp>
25+
#endif
2426
#include <QVBoxLayout>
2527
#include <QPainter>
2628
#include <QPalette>

‎OutOfMemoryHandler.h

+2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
#include "NonCopyable.h"
2323
#include <QObject>
2424
#include <QMutex>
25+
#ifndef Q_MOC_RUN
2526
#include <boost/scoped_array.hpp>
27+
#endif
2628
#include <stddef.h>
2729

2830
class OutOfMemoryHandler : public QObject

‎ProjectCreationContext.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
#include "ImageFileInfo.h"
2323
#include <QString>
2424
#include <Qt>
25+
#ifndef Q_MOC_RUN
2526
#include <boost/lambda/lambda.hpp>
2627
#include <boost/lambda/bind.hpp>
28+
#endif
2729
#include <algorithm>
2830
#include <assert.h>
2931

‎ProjectPages.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
#include "PageSequence.h"
2626
#include "RelinkablePath.h"
2727
#include "AbstractRelinker.h"
28+
#ifndef Q_MOC_RUN
2829
#include <boost/foreach.hpp>
2930
#include <boost/multi_index_container.hpp>
3031
#include <boost/multi_index/ordered_index.hpp>
3132
#include <boost/multi_index/sequenced_index.hpp>
3233
#include <boost/multi_index/member.hpp>
34+
#endif
3335
#include <QMutexLocker>
3436
#include <QFileInfo>
3537
#include <QSize>

‎ProjectReader.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
#include <QDir>
2727
#include <QDomElement>
2828
#include <QDomNode>
29+
#ifndef Q_MOC_RUN
2930
#include <boost/bind.hpp>
31+
#endif
3032
#include <set>
3133

3234
ProjectReader::ProjectReader(QDomDocument const& doc)

‎ProjectWriter.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
#include <QFile>
3131
#include <QTextStream>
3232
#include <QFileInfo>
33+
#ifndef Q_MOC_RUN
3334
#include <boost/bind.hpp>
3435
#include <boost/foreach.hpp>
36+
#endif
3537
#include <stddef.h>
3638
#include <assert.h>
3739

‎ProjectWriter.h

+2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
#include "PageId.h"
2727
#include "SelectedPage.h"
2828
#include "VirtualFunction.h"
29+
#ifndef Q_MOC_RUN
2930
#include <boost/multi_index_container.hpp>
3031
#include <boost/multi_index/sequenced_index.hpp>
3132
#include <boost/multi_index/ordered_index.hpp>
3233
#include <boost/multi_index/member.hpp>
34+
#endif
3335
#include <QString>
3436
#include <Qt>
3537
#include <vector>

‎RecentProjects.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
*/
1818

1919
#include "RecentProjects.h"
20+
#ifndef Q_MOC_RUN
2021
#include <boost/foreach.hpp>
22+
#endif
2123
#include <QSettings>
2224
#include <QFile>
2325
#include <algorithm>

‎RelinkablePath.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
#include "RelinkablePath.h"
2020
#include <QStringList>
21+
#ifndef Q_MOC_RUN
2122
#include <boost/foreach.hpp>
23+
#endif
2224

2325
RelinkablePath::RelinkablePath(QString const& path, Type type)
2426
: m_normalizedPath(normalize(path))

‎RelinkablePathVisualization.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
#include <QStyleOptionButton>
3434
#include <QFile>
3535
#include <QVariant>
36+
#ifndef Q_MOC_RUN
3637
#include <boost/bind.hpp>
3738
#include <boost/foreach.hpp>
39+
#endif
3840
#include <vector>
3941

4042
struct RelinkablePathVisualization::PathComponent

‎RelinkingDialog.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
#include <QDir>
2323
#include <QFileDialog>
2424
#include <QDebug>
25+
#ifndef Q_MOC_RUN
2526
#include <boost/foreach.hpp>
27+
#endif
2628
#include <assert.h>
2729

2830
RelinkingDialog::RelinkingDialog(QString const& project_file_path, QWidget* parent)

‎RelinkingListView.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
#include <QBrush>
2828
#include <QColor>
2929
#include <QVariant>
30+
#ifndef Q_MOC_RUN
3031
#include <boost/foreach.hpp>
32+
#endif
3133
#include <vector>
3234

3335
class RelinkingListView::Delegate : public QStyledItemDelegate

‎RelinkingModel.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@
2727
#include <QCoreApplication>
2828
#include <QColor>
2929
#include <Qt>
30+
#ifndef Q_MOC_RUN
3031
#include <boost/foreach.hpp>
3132
#include <boost/multi_index_container.hpp>
3233
#include <boost/multi_index/ordered_index.hpp>
3334
#include <boost/multi_index/sequenced_index.hpp>
3435
#include <boost/multi_index/member.hpp>
36+
#endif
3537
#include <utility>
3638
#include <iterator>
3739
#include <algorithm>

‎StageListView.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
#include <QVariant>
3737
#include <Qt>
3838
#include <QDebug>
39+
#ifndef Q_MOC_RUN
3940
#include <boost/foreach.hpp>
41+
#endif
4042
#include <algorithm>
4143
#include <memory>
4244
#include <assert.h>

‎TabbedDebugImages.h

+2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121

2222
#include "DebugImageView.h"
2323
#include <QTabWidget>
24+
#ifndef Q_MOC_RUN
2425
#include <boost/intrusive/list.hpp>
26+
#endif
2527

2628
class TabbedDebugImages : public QTabWidget
2729
{

‎ThumbnailBase.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
#include "AbstractCommand.h"
2424
#include "PixmapRenderer.h"
2525
#include "imageproc/PolygonUtils.h"
26+
#ifndef Q_MOC_RUN
2627
#include <boost/weak_ptr.hpp>
28+
#endif
2729
#include <QPixmap>
2830
#include <QPixmapCache>
2931
#include <QPainter>

‎ThumbnailBase.h

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#include "ImageTransformation.h"
2525
#include "IntrusivePtr.h"
2626
#include "ThumbnailPixmapCache.h"
27+
#ifndef Q_MOC_RUN
2728
#include <boost/shared_ptr.hpp>
29+
#endif
2830
#include <QTransform>
2931
#include <QGraphicsItem>
3032
#include <QSizeF>

‎ThumbnailPixmapCache.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@
3939
#include <QEvent>
4040
#include <QSize>
4141
#include <QDebug>
42+
#ifndef Q_MOC_RUN
4243
#include <boost/multi_index_container.hpp>
4344
#include <boost/multi_index/ordered_index.hpp>
4445
#include <boost/multi_index/sequenced_index.hpp>
4546
#include <boost/multi_index/member.hpp>
4647
#include <boost/foreach.hpp>
48+
#endif
4749
#include <algorithm>
4850
#include <vector>
4951
#include <new>

‎ThumbnailPixmapCache.h

+2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
#include "RefCountable.h"
2424
#include "ThumbnailLoadResult.h"
2525
#include "AbstractCommand.h"
26+
#ifndef Q_MOC_RUN
2627
#include <boost/weak_ptr.hpp>
28+
#endif
2729
#include <memory>
2830

2931
class ImageId;

‎ThumbnailSequence.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "RefCountable.h"
2929
#include "IntrusivePtr.h"
3030
#include "ScopedIncDec.h"
31+
#ifndef Q_MOC_RUN
3132
#include <boost/multi_index_container.hpp>
3233
#include <boost/multi_index/ordered_index.hpp>
3334
#include <boost/multi_index/sequenced_index.hpp>
@@ -36,6 +37,7 @@
3637
#include <boost/lambda/lambda.hpp>
3738
#include <boost/lambda/bind.hpp>
3839
#include <boost/foreach.hpp>
40+
#endif
3941
#include <QGraphicsScene>
4042
#include <QGraphicsItem>
4143
#include <QGraphicsItemGroup>

‎XmlMarshaller.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include "Margins.h"
2222
#include "Dpi.h"
2323
#include "Utils.h"
24+
#ifndef Q_MOC_RUN
2425
#include <boost/foreach.hpp>
26+
#endif
2527
#include <QPointF>
2628
#include <QLineF>
2729
#include <QRect>

‎dewarping/Curve.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
#include "XmlMarshaller.h"
2121
#include "XmlUnmarshaller.h"
2222
#include "VecNT.h"
23+
#ifndef Q_MOC_RUN
2324
#include <boost/foreach.hpp>
25+
#endif
2426
#include <QByteArray>
2527
#include <QDataStream>
2628
#include <QDomDocument>

‎dewarping/CylindricalSurfaceDewarper.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#include <QLineF>
2525
#include <QtGlobal>
2626
#include <QDebug>
27+
#ifndef Q_MOC_RUN
2728
#include <boost/foreach.hpp>
29+
#endif
2830
#include <algorithm>
2931
#include <math.h>
3032
#include <assert.h>

‎dewarping/CylindricalSurfaceDewarper.h

+2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
#include "HomographicTransform.h"
2323
#include "PolylineIntersector.h"
2424
#include "ArcLengthMapper.h"
25+
#ifndef Q_MOC_RUN
2526
#include <boost/array.hpp>
27+
#endif
2628
#include <vector>
2729
#include <utility>
2830
#include <QPointF>

‎dewarping/DetectVertContentBounds.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@
3232
#include <QColor>
3333
#include <Qt>
3434
#include <QtGlobal>
35+
#ifndef Q_MOC_RUN
3536
#include <boost/foreach.hpp>
3637
#include <boost/lambda/lambda.hpp>
3738
#include <boost/lambda/bind.hpp>
39+
#endif
3840
#include <vector>
3941
#include <deque>
4042
#include <algorithm>

‎dewarping/DistortionModel.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
#include <QString>
2727
#include <QDomDocument>
2828
#include <QDomElement>
29+
#ifndef Q_MOC_RUN
2930
#include <boost/foreach.hpp>
31+
#endif
3032
#include <algorithm>
3133

3234
namespace dewarping

‎dewarping/DistortionModelBuilder.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
#include <QPen>
4040
#include <QColor>
4141
#include <QDebug>
42+
#ifndef Q_MOC_RUN
4243
#include <boost/foreach.hpp>
44+
#endif
4345
#include <algorithm>
4446
#include <exception>
4547
#include <iterator>

‎dewarping/TextLineRefiner.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424
#include "imageproc/GrayImage.h"
2525
#include "imageproc/GaussBlur.h"
2626
#include "imageproc/Sobel.h"
27+
#ifndef Q_MOC_RUN
2728
#include <boost/scoped_array.hpp>
2829
#include <boost/foreach.hpp>
2930
#include <boost/lambda/lambda.hpp>
3031
#include <boost/lambda/bind.hpp>
32+
#endif
3133
#include <QImage>
3234
#include <QPainter>
3335
#include <QPen>

0 commit comments

Comments
 (0)