ENH: Replaced Monteverdi_EXPORT macro by ITK_EXPORT.

Modules/Visualization/Mapla/include/mvdMaplaApplication.h

@@ -70,7 +70,7 @@ class OTBApplicationsModel;
  * \ingroup Mapla
  *
  */
-class Monteverdi_EXPORT MaplaApplication
+class ITK_EXPORT MaplaApplication
   : public I18nApplication
 {
 

Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h

@@ -80,7 +80,7 @@ class MaplaMainWindow;
  *
  * \brief The application main-widow widget.
  */
-class Monteverdi_EXPORT MaplaMainWindow
+class ITK_EXPORT MaplaMainWindow
   : public I18nMainWindow
 {
 

Modules/Visualization/Monteverdi/include/mvdApplication.h

@@ -70,7 +70,7 @@ class OTBApplicationsModel;
  * \ingroup Monteverdi
  *
  */
-class Monteverdi_EXPORT Application
+class ITK_EXPORT Application
   : public I18nApplication
 {
 

Modules/Visualization/Monteverdi/include/mvdMainWindow.h

@@ -100,7 +100,7 @@ class MainWindow;
  *
  * \brief The application main-widow widget.
  */
-class Monteverdi_EXPORT MainWindow
+class ITK_EXPORT MainWindow
   : public I18nMainWindow
 {
 

Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h

@@ -72,7 +72,7 @@ class PreferencesDialog;
  * \ingroup Monteverdi
  *
  */
-class Monteverdi_EXPORT PreferencesDialog :
+class ITK_EXPORT PreferencesDialog :
     public QDialog
 {
 

Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h

@@ -81,7 +81,7 @@ class QuicklookModel;
  * \ingroup MonteverdiCore
  *
  */
-class Monteverdi_EXPORT AbstractImageModel :
+class ITK_EXPORT AbstractImageModel :
     public AbstractLayerModel
 {
 

Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h

@@ -85,11 +85,11 @@ enum SpatialReferenceType
 
 /**
  */
-Monteverdi_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & filename );
+ITK_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & filename );
 
 /**
  */
-Monteverdi_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & wkt, bool hasKwl );
+ITK_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & wkt, bool hasKwl );
 
 /*****************************************************************************/
 /* CLASS DEFINITION SECTION                                                  */
@@ -101,7 +101,7 @@ Monteverdi_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::strin
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT AbstractLayerModel :
+class ITK_EXPORT AbstractLayerModel :
     public AbstractModel,
     public VisibleInterface
 {

Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h

@@ -75,7 +75,7 @@ namespace mvd
  * \ingroup MonteverdiCore
  *
  */
-class Monteverdi_EXPORT AbstractModel :
+class ITK_EXPORT AbstractModel :
     public QObject
 {
 

Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief Abstract worker object used as a base-class for threaded tasks.
  */
-class Monteverdi_EXPORT AbstractWorker :
+class ITK_EXPORT AbstractWorker :
     public QObject
 {
 

Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h

@@ -88,7 +88,7 @@ namespace mvd
  * signal.
  *
  */
-class Monteverdi_EXPORT ApplicationsBrowser :
+class ITK_EXPORT ApplicationsBrowser :
     public QObject
 {
 

Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h

@@ -73,7 +73,7 @@ class AbstractWorker;
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT BackgroundTask :
+class ITK_EXPORT BackgroundTask :
     public QThread
 {
 

Modules/Visualization/MonteverdiCore/include/mvdCore.h

@@ -96,7 +96,7 @@ enum RgbwChannel
 /**
  * Constant naming video-channels.
  */
-extern Monteverdi_EXPORT
+extern ITK_EXPORT
 const char*
 RGBW_CHANNEL_NAMES[ RGBW_CHANNEL_COUNT ];
 
@@ -137,7 +137,7 @@ enum Effect
 /**
  * Constant naming effect values.
  */
-Monteverdi_EXPORT
+ITK_EXPORT
 extern
 char const * const
 EFFECT_NAMES[ EFFECT_COUNT ];

Modules/Visualization/MonteverdiCore/include/mvdFilenameInterface.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT FilenameInterface
+class ITK_EXPORT FilenameInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h

@@ -89,7 +89,7 @@ class AbstractImageModel;
  *
  * \ingroup MonteverdiCore
  */
-class Monteverdi_EXPORT HistogramModel :
+class ITK_EXPORT HistogramModel :
     public AbstractModel,
     private SerializableInterface
 {

Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h

@@ -99,7 +99,7 @@ class VectorImageModel;
  * for example, provide sessio management), the specialized instance
  * can be passed as argument of constructor.
  */
-class Monteverdi_EXPORT I18nCoreApplication
+class ITK_EXPORT I18nCoreApplication
   : public QObject
 {
 

Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h

@@ -75,7 +75,7 @@ namespace mvd
  * \brief Import image worker. It is parametrized by the image
  * filename and the desired (width, height) best-fit size.
  */
-class Monteverdi_EXPORT ImageImporter :
+class ITK_EXPORT ImageImporter :
     public AbstractWorker
 {
 

Modules/Visualization/MonteverdiCore/include/mvdImageProperties.h

@@ -77,7 +77,7 @@ namespace mvd
  * \brief WIP.
  */
 #define IMAGE_PROPERTIES_IS_QOBJECT 0
-class Monteverdi_EXPORT ImageProperties
+class ITK_EXPORT ImageProperties
 #if IMAGE_PROPERTIES_IS_QOBJECT
   : public QObject
 #endif

Modules/Visualization/MonteverdiCore/include/mvdImageSettings.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT ImageSettings
+class ITK_EXPORT ImageSettings
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdImageSettingsInterface.h

@@ -72,7 +72,7 @@ class ImageSettings;
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT ImageSettingsInterface
+class ITK_EXPORT ImageSettingsInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdModifiableInterface.h

@@ -71,7 +71,7 @@ namespace mvd
  * \ingroup MonteverdiCore
  *
  */
-class Monteverdi_EXPORT ModifiableInterface
+class ITK_EXPORT ModifiableInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdMyClass.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT MyClass :
+class ITK_EXPORT MyClass :
     public QObject
 {
 

Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h

@@ -77,7 +77,7 @@ namespace mvd
  * \brief Import image worker. It is parametrized by the image
  * filename and the desired (width, height) best-fit size.
  */
-class Monteverdi_EXPORT OverviewBuilder :
+class ITK_EXPORT OverviewBuilder :
     public AbstractWorker,
     public ProgressInterface
 {

Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h

@@ -74,7 +74,7 @@ class ProgressInterface;
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT ProcessObjectObserver :
+class ITK_EXPORT ProcessObjectObserver :
     public itk::Command
 {
 

Modules/Visualization/MonteverdiCore/include/mvdProgressInterface.h

@@ -72,7 +72,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT ProgressInterface
+class ITK_EXPORT ProgressInterface
 {
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/
 

Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h

@@ -76,7 +76,7 @@ namespace mvd
  * \ingroup MonteverdiCore
  *
  */
-class Monteverdi_EXPORT QuicklookModel :
+class ITK_EXPORT QuicklookModel :
     public VectorImageModel
 {
 

Modules/Visualization/MonteverdiCore/include/mvdSerializableInterface.h

@@ -74,7 +74,7 @@ namespace mvd
  *
  * \brief 'Template method' pattern applied to serializable objects.
  */
-class Monteverdi_EXPORT SerializableInterface
+class ITK_EXPORT SerializableInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h

@@ -76,7 +76,7 @@ class AbstractLayerModel;
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT StackedLayerModel :
+class ITK_EXPORT StackedLayerModel :
     public AbstractModel
 {
 

Modules/Visualization/MonteverdiCore/include/mvdSystemError.h

@@ -77,7 +77,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT SystemError :
+class ITK_EXPORT SystemError :
     public std::runtime_error
 {
 

Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h

@@ -84,7 +84,7 @@ class DatasetModel;
  * \ingroup MonteverdiCore
  *
  */
-class Monteverdi_EXPORT VectorImageModel :
+class ITK_EXPORT VectorImageModel :
     public AbstractImageModel,
     public FilenameInterface
 {

Modules/Visualization/MonteverdiCore/include/mvdVectorImageSettings.h

@@ -76,7 +76,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT VectorImageSettings :
+class ITK_EXPORT VectorImageSettings :
     public ImageSettings
 {
 

Modules/Visualization/MonteverdiCore/include/mvdVisibleInterface.h

@@ -72,7 +72,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT VisibleInterface
+class ITK_EXPORT VisibleInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in

 #ifndef __ConfigureMonteverdi_h
 #define __ConfigureMonteverdi_h
 
-//
-// Windows DLL import/export macros.
-#cmakedefine BUILD_SHARED_LIBS
-#if defined( _WIN32 ) || defined( _WIN64 ) || defined(WIN32)
-   #ifdef  BUILD_SHARED_LIBS
-      #define Monteverdi_IMPORT __declspec(dllimport)
-      #define Monteverdi_EXPORT __declspec(dllexport)
-   #else
-      // Empty definition when build statically.
-      #define Monteverdi_IMPORT
-      #define Monteverdi_EXPORT
-   #endif
-#else 
-   //Empty definition on non Windows plateforms.
-   #define Monteverdi_IMPORT
-   #define Monteverdi_EXPORT
-#endif
-
 //
 // Monteverdi project
 #define PROJECT_NAME "@Monteverdi_PROJECT_NAME@"
@@ -142,6 +124,7 @@
 #endif
 
 #include "otbConfigure.h"
+#include "otbMacro.h"
 
 //
 // Options

Modules/Visualization/MonteverdiCore/src/mvdCore.cxx

@@ -62,7 +62,7 @@ namespace
 {
 } // end of anonymous namespace.
 
-Monteverdi_EXPORT const char*
+ITK_EXPORT const char*
 RGBW_CHANNEL_NAMES[ RGBW_CHANNEL_COUNT ] = {
   "RGBW_CHANNEL_RED",
   "RGBW_CHANNEL_GREEN",

Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h

@@ -62,7 +62,7 @@ class AboutDialog;
  * \ingroup MonteverdiGui
  *
  */
-class Monteverdi_EXPORT AboutDialog :
+class ITK_EXPORT AboutDialog :
     public QDialog
 {
   Q_OBJECT;

Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h

@@ -73,7 +73,7 @@ namespace mvd
  * \brief Widget template skeleton to copy-paste when adding a new
  * widget class.
  */
-class Monteverdi_EXPORT AbstractDragAndDropEventFilter :
+class ITK_EXPORT AbstractDragAndDropEventFilter :
     public QObject
 {
 

Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  *  \brief Base class for QWidget manipulation
  */
-class Monteverdi_EXPORT AbstractImageViewManipulator :
+class ITK_EXPORT AbstractImageViewManipulator :
     public QObject
 {
 

Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h

@@ -69,7 +69,7 @@ class AbstractModel;
  *
  * \ingroup MonteverdiGui
  */
-class Monteverdi_EXPORT AbstractModelController :
+class ITK_EXPORT AbstractModelController :
     public QObject
 {
 

Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h

@@ -76,7 +76,7 @@ class QtWidgetView;
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT ApplicationLauncher :
+class ITK_EXPORT ApplicationLauncher :
     public QObject
 {
 

Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h

@@ -79,7 +79,7 @@ class ApplicationsToolBox;
  * \brief Widget template skeleton to copy-paste when adding a new
  * widget class.
  */
-class Monteverdi_EXPORT ApplicationsToolBox :
+class ITK_EXPORT ApplicationsToolBox :
     public QWidget
 {
 

Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h

@@ -76,7 +76,7 @@ class ApplicationsToolBox;
  *
  * \brief Color-setup widget controller for VectorImageModel objects.
  */
-class Monteverdi_EXPORT ApplicationsToolBoxController :
+class ITK_EXPORT ApplicationsToolBoxController :
     public AbstractModelController
 {
 

Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h

@@ -75,7 +75,7 @@ class ColorBandDynamicsWidget;
  *
  * \ingroup MonteverdiGui
  */
-class Monteverdi_EXPORT ColorBandDynamicsWidget :
+class ITK_EXPORT ColorBandDynamicsWidget :
     public QWidget
 {
 

Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h

@@ -73,7 +73,7 @@ class ColorDynamicsWidget;
  *
  * \brief Color-dynamics widget controller for VectorImageModel objects.
  */
-class Monteverdi_EXPORT ColorDynamicsController :
+class ITK_EXPORT ColorDynamicsController :
     public AbstractModelController
 {
 

Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h

@@ -74,7 +74,7 @@ class ColorDynamicsWidget;
  *
  * \ingroup MonteverdiGui
  */
-class Monteverdi_EXPORT ColorDynamicsWidget :
+class ITK_EXPORT ColorDynamicsWidget :
     public QWidget
 {
 

Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h

@@ -73,7 +73,7 @@ class ColorSetupWidget;
  *
  * \brief Color-setup widget controller for VectorImageModel objects.
  */
-class Monteverdi_EXPORT ColorSetupController :
+class ITK_EXPORT ColorSetupController :
     public AbstractModelController
 {
 

Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h

@@ -62,7 +62,7 @@ class ColorSetupWidget;
  *
  * \ingroup MonteverdiGui
  */
-class Monteverdi_EXPORT ColorSetupWidget :
+class ITK_EXPORT ColorSetupWidget :
     public QWidget
 {
   Q_OBJECT;

Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h

@@ -71,7 +71,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class Monteverdi_EXPORT DoubleValidator :
+class ITK_EXPORT DoubleValidator :
     public QDoubleValidator
 {
 

Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h

@@ -77,7 +77,7 @@ namespace Ui
  * \brief Widget template skeleton to copy-paste when adding a new
  * widget class.
  */
-class Monteverdi_EXPORT DropLineEdit :
+class ITK_EXPORT DropLineEdit :
     public QLineEdit
 {
 

Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h

@@ -73,7 +73,7 @@ namespace mvd
  * \brief Widget template skeleton to copy-paste when adding a new
  * widget class.
  */
-class Monteverdi_EXPORT FilenameDragAndDropEventFilter :
+class ITK_EXPORT FilenameDragAndDropEventFilter :
     public AbstractDragAndDropEventFilter
 {
 

Modules/Visualization/MonteverdiGui/include/mvdGui.h

@@ -103,7 +103,7 @@ enum Resolution
 /**
  * Constant naming effect values.
  */
-Monteverdi_EXPORT
+ITK_EXPORT
 extern
 char const * const
 RESOLUTION_NAMES[ RESOLUTION_COUNT ];
@@ -127,14 +127,14 @@ enum TileSize
 /**
  * Constant naming effect values.
  */
-Monteverdi_EXPORT
+ITK_EXPORT
 extern
 char const * const
 TILE_SIZE_NAMES[ TILE_SIZE_COUNT ];
 
 /**
  */
-Monteverdi_EXPORT
+ITK_EXPORT
 extern
 int
 TILE_SIZE_VALUE[ TILE_SIZE_COUNT ];
@@ -163,7 +163,7 @@ namespace mvd
 
 /**
  */
-Monteverdi_EXPORT
+ITK_EXPORT
 void
 AddItemsInto( QComboBox * comboBox,
 	      const char * context,

Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h

@@ -73,7 +73,7 @@ class HistogramWidget;
  *
  * \brief Color-setup widget controller for VectorImageModel objects.
  */
-class Monteverdi_EXPORT HistogramController :
+class ITK_EXPORT HistogramController :
     public AbstractModelController
 {
 

Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h

@@ -81,7 +81,7 @@ namespace mvd
  * \brief Widget template skeleton to copy-paste when adding a new
  * widget class.
  */
-class Monteverdi_EXPORT HistogramPlotPicker :
+class ITK_EXPORT HistogramPlotPicker :
     public QwtPlotPicker
 {
 

Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h

@@ -92,7 +92,7 @@ class HistogramWidget;
  * \brief Widget template skeleton to copy-paste when adding a new
  * widget class.
  */
-class Monteverdi_EXPORT HistogramWidget :
+class ITK_EXPORT HistogramWidget :
     public QWidget
 {
 

Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h

@@ -81,7 +81,7 @@ namespace mvd
  *
  * \see I18nCoreApplication.
  */
-class Monteverdi_EXPORT I18nApplication
+class ITK_EXPORT I18nApplication
   : public I18nCoreApplication
 {
 

Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h

@@ -76,7 +76,7 @@ class VectorImageModel;
 *
  * \brief Main-window widget base for the i18n application.
  */
-class Monteverdi_EXPORT I18nMainWindow
+class ITK_EXPORT I18nMainWindow
   : public QMainWindow
 {
 

Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h

@@ -76,7 +76,7 @@ namespace mvd
  *
  *  \brief TODO.
  */
-class Monteverdi_EXPORT ImageViewManipulator :
+class ITK_EXPORT ImageViewManipulator :
     public AbstractImageViewManipulator
 {