Commit da47937f authored by Christophe Palmann's avatar Christophe Palmann

COMP: QT4 Boost compatibility

Moc is unable to parse some preprocessing lines in Boost lib (Qt bug).
One fix is to use the macro Q_MOC_RUN to prevent moc from processing OTB header files, where many boost headers are included.
More info here : https://bugreports.qt.io/browse/QTBUG-22829
Headers in Module/Wrappers/QtWidget were modified by a python script (QT4-boost-compat.py in DevUtils).
Each modified line is tagged with QT4-boost-compatibility.
parent 5a4c251d
......@@ -18,7 +18,9 @@
#define __itkQtProgressBar_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkCommand.h"
#endif //tag=QT4-boost-compatibility
namespace itk {
......
......@@ -20,8 +20,10 @@
#define __otbQtApplication_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include <QString>
#include "itkMacro.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
namespace Wrapper
......
......@@ -19,9 +19,11 @@
#define __otbQtFileSelectionWidget_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputImageListParameter.h"
#include "otbWrapperInputFilenameListParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,7 +19,9 @@
#define __otbQtLogOutput_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkStdStreamLogOutput.h"
#endif //tag=QT4-boost-compatibility
//#include "itkObjectFactory.h"
//#include "itkProcessObject.h"
......
......@@ -19,8 +19,10 @@
#define __otbQtStringSelectionWidget_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperStringListParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetChoiceParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperChoiceParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetComplexInputImageParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperComplexInputImageParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetComplexOutputImageParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperComplexOutputImageParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetDirectoryParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperDirectoryParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetEmptyParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperEmptyParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetFloatParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperNumericalParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,7 +19,9 @@
#define __otbWrapperQtWidgetInputFilenameListParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbQtFileSelectionWidget.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetInputFilenameParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputFilenameParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,7 +19,9 @@
#define __otbWrapperQtWidgetInputImageListParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbQtFileSelectionWidget.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetInputImageParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputImageParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetInputProcessXMLParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputProcessXMLParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetInputVectorDataListParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputVectorDataListParameter.h"
#include "otbQtFileSelectionWidget.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetInputVectorDataParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputVectorDataParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetIntParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperNumericalParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetListViewParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperListViewParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetModel_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperApplication.h"
#include "otbQtLogOutput.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetOutputFilenameParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperOutputFilenameParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetOutputImageParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperOutputImageParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetOutputProcessXMLParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperOutputProcessXMLParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetOutputVectorDataParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperOutputVectorDataParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetParameterBase_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperParameter.h"
#include "otbWrapperQtWidgetModel.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetFactory_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkObject.h"
#include "itkObjectFactory.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,12 +19,14 @@
#define __otbWrapperQtWidgetParameterGroup_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperParameterGroup.h"
#include "otbWrapperRadiusParameter.h"
#include "otbWrapperRAMParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#include "otbWrapperInputProcessXMLParameter.h"
#include "otbWrapperOutputProcessXMLParameter.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,7 +19,9 @@
#define __otbWrapperQtWidgetParameterLabel_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperParameter.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,9 +19,11 @@
#define __otbWrapperQtWidgetProgressReport_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperQtWidgetModel.h"
#include "itkQtProgressBar.h"
#include "itkProcessObject.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetRAMParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperRAMParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,9 +19,11 @@
#define __otbWrapperQtWidgetSimpleProgressReport_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperQtWidgetModel.h"
#include "itkProcessObject.h"
#include "itkQtProgressBar.h"
#endif //tag=QT4-boost-compatibility
namespace otb
......
......@@ -19,7 +19,9 @@
#define __otbWrapperQtWidgetStringListParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbQtStringSelectionWidget.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetStringParameter_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperStringParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
......@@ -19,8 +19,10 @@
#define __otbWrapperQtWidgetView_h
#include <QtGui>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include <QObject>
#include "otbWrapperQtWidgetModel.h"
#endif //tag=QT4-boost-compatibility
namespace otb
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment