Commit b60f3fde authored by Stéphane Albert's avatar Stéphane Albert

REFAC: Changed order of includes (ConfigureMonteverdi2.h before Qt before...

REFAC: Changed order of includes (ConfigureMonteverdi2.h before Qt before other includes to prevent system compilation problems).
parent cd75b1d6
......@@ -17,17 +17,21 @@
=========================================================================*/
//#include "ConfigureMonteverdi.h"
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// System includes (sorted by alphabetic order)
// Monteverdi includes (sorted by alphabetic order)
#include "mvdMainWindow.h"
#include "mvdApplication.h"
#include "mvdMainWindow.h"
//
// OTB includes (sorted by alphabetic order)
......
......@@ -20,10 +20,11 @@
#include "mvdApplication.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// OTB includes (sorted by alphabetic order)
......
......@@ -21,10 +21,16 @@
#define __mvdApplication_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -50,7 +56,7 @@ namespace mvd
/** \class Application
*
*/
class Application
class Monteverdi2_EXPORT Application
: public I18nApplication
{
Q_OBJECT;
......
......@@ -19,10 +19,11 @@
#include "mvdImageModel.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,11 +21,17 @@
#define __mvdImageModel_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
#include <QObject>
//// Must be included before system/custom includes.
#include <QtCore>
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -50,7 +56,7 @@ namespace mvd
/** \class ImageModel
*
*/
class ImageModel :
class Monteverdi2_EXPORT ImageModel :
public QObject
{
Q_OBJECT;
......
......@@ -19,16 +19,13 @@
#include "mvdMainWindow.h"
#include "ui_mvdMainWindow.h"
#include "otbImageLayer.h"
#include "otbImageLayerGenerator.h"
//
// System includes (sorted by alphabetic order)
#include <exception>
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
#include <QFileDialog>
#include <QMessageBox>
// System includes (sorted by alphabetic order)
#include <exception>
//
// ITK includes (sorted by alphabetic order)
......@@ -36,12 +33,13 @@
//
// OTB includes (sorted by alphabetic order)
#include "otbImageLayer.h"
#include "otbImageLayerGenerator.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
//
// Monteverdi includes (sorted by alphabetic order)
#include "ConfigureMonteverdi2.h"
#include "mvdApplication.h"
#include "mvdVectorImageModel.h"
......
......@@ -21,11 +21,17 @@
#define __mvdMainWindow_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//#include <QtGui>
//// Must be included before system/custom includes.
#include <QtGui>
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -39,7 +45,6 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "ConfigureMonteverdi2.h"
#include "mvdImageView.h"
//
......@@ -60,7 +65,7 @@ class MainWindow;
/** \class MainWindow
*
*/
class MainWindow
class Monteverdi2_EXPORT MainWindow
: public QMainWindow
{
Q_OBJECT;
......
......@@ -20,10 +20,11 @@
#include "mvdAbstractImageModel.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,10 +21,16 @@
#define __mvdAbstractImageModel_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -34,8 +40,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "mvdTypes.h"
#include "mvdAbstractModel.h"
#include "mvdTypes.h"
//
// External classes pre-declaration.
......
......@@ -20,10 +20,11 @@
#include "mvdAbstractModel.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,11 +21,17 @@
#define __mvdAbstractModel_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
#include <QObject>
//// Must be included before system/custom includes.
#include <QtCore>
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -20,10 +20,11 @@
#include "mvdDatasetModel.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,10 +21,16 @@
#define __mvdDatasetModel_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -34,8 +40,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "mvdTypes.h"
#include "mvdAbstractModel.h"
#include "mvdTypes.h"
//
// External classes pre-declaration.
......
......@@ -20,10 +20,11 @@
#include "mvdGLImageWidget.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// OTB includes (sorted by alphabetic order)
......
......@@ -20,12 +20,18 @@
#define __mvdGLImageWidget_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QGLWidget>
//
// System includes (sorted by alphabetic order)
// this include must be added here to avoid compilation problem
#include "mvdTypes.h"
......@@ -66,7 +72,7 @@ namespace mvd
/** \class GLImageWidget
*
*/
class GLImageWidget : public QGLWidget
class Monteverdi2_EXPORT GLImageWidget : public QGLWidget
{
Q_OBJECT;
......
......@@ -20,11 +20,11 @@
#include "mvdI18nApplication.h"
//
// System includes (sorted by alphabetic order)
#include <iostream>
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// OTB includes (sorted by alphabetic order)
......
......@@ -21,12 +21,18 @@
#define __mvdI18nApplication_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
//
// System includes (sorted by alphabetic order)
//
// OTB includes (sorted by alphabetic order)
......
......@@ -20,11 +20,12 @@
#include "mvdImageModelRenderer.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtOpenGL>
//
// Qt includes (sorted by alphabetic order)
#include <QGLWidget>
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,10 +21,17 @@
#define __mvdImageModelRenderer_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtCore>
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -47,7 +54,7 @@ namespace mvd
{
//
// Internal classes pre-declaration.
class AbstractImageModel;
class Monteverdi2_EXPORT AbstractImageModel;
/** \class ImageModelRenderer
*
......
......@@ -20,10 +20,11 @@
#include "mvdImageViewManipulator.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,12 +21,18 @@
#define __mvdImageViewManipulator_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
#include "itkImageRegion.h"
......@@ -60,7 +66,7 @@ namespace mvd
*
* WIP
*/
class ImageViewManipulator :
class Monteverdi2_EXPORT ImageViewManipulator :
public QObject
{
Q_OBJECT;
......
......@@ -20,10 +20,11 @@
#include "mvdMyClass.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -20,11 +20,17 @@
#define __mvdMyClass_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
#include <QObject>
//// Must be included before system/custom includes.
#include <QtCore>
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -34,7 +40,6 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "ConfigureMonteverdi2.h"
//
// External classes pre-declaration.
......
......@@ -20,10 +20,11 @@
#include "mvdTypes.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,14 +21,16 @@
#define __mvdTypes_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Including QtGui here prevents conflicting with ITK at compile-time.
#if 0 // re-activate when compile-type errors appear.
#include <QtGui>
#endif
//// Must be included before system/custom includes.
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -42,7 +44,6 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "ConfigureMonteverdi2.h"
//
// External classes pre-declaration.
......
......@@ -20,10 +20,11 @@
#include "mvdVectorImageModel.h"
//
// System includes (sorted by alphabetic order)
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// Qt includes (sorted by alphabetic order)
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......
......@@ -21,10 +21,16 @@
#define __mvdVectorImageModel_h
//
// System includes (sorted by alphabetic order)
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
//
// System includes (sorted by alphabetic order)
//
// ITK includes (sorted by alphabetic order)
......@@ -34,8 +40,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "mvdTypes.h"
#include "mvdAbstractImageModel.h"
#include "mvdTypes.h"
//
// External classes pre-declaration.
......
#ifndef __ConfigureMonteverdi2_h
#define __ConfigureMonteverdi2_h
//
// System includes (sorted by alphabetic order).
#include <cassert>
//
// Qt includes (sorted by alphabetic order).
#include <QDebug> // temporary (experimental version).
//
// Windows DLL import/export macros.
#if defined( _WIN32 ) || defined( _WIN64 )
......@@ -61,6 +53,6 @@
//
// Miscellaneous
#define Monteverdi2_FLOATING_TYPE @Monteverdi2_FLOATING_TYPE@
#define Monteverdi2_DIMENSION_TYPE int(2)
#define Monteverdi2_DIMENSION_TYPE int( 2 )
#endif // __ConfigureMonteverdi2_h
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