Commit 4a21fe34 authored by Stéphane Albert's avatar Stéphane Albert

ENH: Removed "Core/" and "Gui/" prefixes in include directives.

parent b540a4e8
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdI18nApplication.h"
#include "mvdI18nApplication.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -43,9 +43,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
//
#include "Gui/mvdI18nMainWindow.h"
#include "mvdI18nMainWindow.h"
/*****************************************************************************/
......@@ -220,7 +220,7 @@ private slots:
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdImageViewWidget.h"
#include "mvdImageViewWidget.h"
//
// Some constants.
......
......@@ -50,7 +50,7 @@
# endif
#endif
//
#include "Gui/mvdApplicationsToolBox.h"
#include "mvdApplicationsToolBox.h"
//
#include "maplaApplication.h"
// #include "mvdPreferencesDialog.h"
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdI18nApplication.h"
#include "mvdI18nApplication.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -56,10 +56,10 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "Core/mvdStackedLayerModel.h"
#include "mvdTypes.h"
#include "mvdStackedLayerModel.h"
//
#include "Gui/mvdI18nMainWindow.h"
#include "mvdI18nMainWindow.h"
/*****************************************************************************/
......@@ -521,7 +521,7 @@ private slots:
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdImageViewWidget.h"
#include "mvdImageViewWidget.h"
//
// Some constants.
......
......@@ -34,7 +34,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdStackedLayerModel.h"
#include "mvdStackedLayerModel.h"
//
#ifdef OTB_USE_QT4
......
......@@ -46,41 +46,41 @@
# include "ApplicationsWrapper/mvdWrapperQtWidgetView.h"
#endif
//
// #include "Core/mvdDatabaseModel.h"
// #include "Core/mvdDatasetModel.h"
#include "Core/mvdQuicklookModel.h"
#include "Core/mvdVectorImageModel.h"
// #include "mvdDatabaseModel.h"
// #include "mvdDatasetModel.h"
#include "mvdQuicklookModel.h"
#include "mvdVectorImageModel.h"
//
#include "Gui/mvdApplicationsToolBox.h"
#include "Gui/mvdColorSetupController.h"
#include "Gui/mvdColorSetupWidget.h"
#include "Gui/mvdColorDynamicsController.h"
#include "Gui/mvdColorDynamicsWidget.h"
// #include "Gui/mvdDatabaseBrowserController.h"
#include "mvdApplicationsToolBox.h"
#include "mvdColorSetupController.h"
#include "mvdColorSetupWidget.h"
#include "mvdColorDynamicsController.h"
#include "mvdColorDynamicsWidget.h"
// #include "mvdDatabaseBrowserController.h"
#if ENABLE_TREE_WIDGET_TEST
// #include "Gui/mvdDatabaseBrowserWidgetTest.h"
// #include "mvdDatabaseBrowserWidgetTest.h"
#else // ENABLE_TREE_WIDGET_TEST
// #include "Gui/mvdDatabaseBrowserWidget.h"
// #include "mvdDatabaseBrowserWidget.h"
#endif // ENABLE_TREE_WIDGET_TEST
// #include "Gui/mvdDatasetPropertiesController.h"
// #include "Gui/mvdDatasetPropertiesWidget.h"
#include "Gui/mvdFilenameDragAndDropEventFilter.h"
#include "Gui/mvdHistogramController.h"
#include "Gui/mvdHistogramWidget.h"
#include "Gui/mvdImageViewManipulator.h"
#include "Gui/mvdImageViewRenderer.h"
#include "Gui/mvdImageViewWidget.h"
#include "Gui/mvdImportSubDatasetDialog.h"
#include "Gui/mvdKeymapDialog.h"
#include "Gui/mvdLayerStackController.h"
#include "Gui/mvdLayerStackWidget.h"
// #include "mvdDatasetPropertiesController.h"
// #include "mvdDatasetPropertiesWidget.h"
#include "mvdFilenameDragAndDropEventFilter.h"
#include "mvdHistogramController.h"
#include "mvdHistogramWidget.h"
#include "mvdImageViewManipulator.h"
#include "mvdImageViewRenderer.h"
#include "mvdImageViewWidget.h"
#include "mvdImportSubDatasetDialog.h"
#include "mvdKeymapDialog.h"
#include "mvdLayerStackController.h"
#include "mvdLayerStackWidget.h"
#if USE_PIXEL_DESCRIPTION
# include "Gui/mvdPixelDescriptionWidget.h"
# include "mvdPixelDescriptionWidget.h"
#endif // USE_PIXEL_DESCRIPTION
#include "Gui/mvdQuicklookViewManipulator.h"
#include "Gui/mvdQuicklookViewRenderer.h"
#include "Gui/mvdShaderWidget.h"
#include "Gui/mvdStatusBarWidget.h"
#include "mvdQuicklookViewManipulator.h"
#include "mvdQuicklookViewRenderer.h"
#include "mvdShaderWidget.h"
#include "mvdStatusBarWidget.h"
//
#include "mvdApplication.h"
#include "mvdPreferencesDialog.h"
......
......@@ -38,9 +38,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdGui.h"
#include "Gui/mvdI18nApplication.h"
#include "Gui/mvdI18nMainWindow.h"
#include "mvdGui.h"
#include "mvdI18nApplication.h"
#include "mvdI18nMainWindow.h"
namespace mvd
{
......
......@@ -47,9 +47,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdAbstractModel.h"
#include "Core/mvdTypes.h"
#include "Core/mvdVisibleInterface.h"
#include "mvdAbstractModel.h"
#include "mvdTypes.h"
#include "mvdVisibleInterface.h"
#endif //tag=QT4-boost-compatibility
/*****************************************************************************/
......
......@@ -47,7 +47,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
#endif //tag=QT4-boost-compatibility
/*****************************************************************************/
......
......@@ -47,7 +47,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
#endif //tag=QT4-boost-compatibility
......
......@@ -50,8 +50,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdAlgorithm.h"
#include "Core/mvdSystemError.h"
#include "mvdAlgorithm.h"
#include "mvdSystemError.h"
#endif //tag=QT4-boost-compatibility
/*****************************************************************************/
......
......@@ -298,7 +298,7 @@ private slots:
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdAbstractImageModel.h"
#include "mvdAbstractImageModel.h"
#endif //tag=QT4-boost-compatibility
namespace mvd
......
......@@ -46,7 +46,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "mvdCore.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -53,11 +53,11 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdAbstractImageModel.h"
#include "Core/mvdFilenameInterface.h"
#include "Core/mvdVectorImageSettings.h"
#include "Core/mvdTypes.h"
#include "Gui/mvdColorSetupWidget.h"
#include "mvdAbstractImageModel.h"
#include "mvdFilenameInterface.h"
#include "mvdVectorImageSettings.h"
#include "mvdTypes.h"
#include "mvdColorSetupWidget.h"
#endif //tag=QT4-boost-compatibility
......
......@@ -46,8 +46,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdCore.h"
#include "Core/mvdImageSettings.h"
#include "mvdCore.h"
#include "mvdImageSettings.h"
#endif //tag=QT4-boost-compatibility
......
......@@ -38,8 +38,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdAlgorithm.h"
#include "Core/mvdTypes.h"
#include "mvdAlgorithm.h"
#include "mvdTypes.h"
namespace mvd
......
......@@ -19,7 +19,7 @@
#include "mvdApplicationsBrowser.h"
#include "Core/mvdAlgorithm.h"
#include "mvdAlgorithm.h"
/*****************************************************************************/
/* INCLUDE SECTION */
......
......@@ -39,8 +39,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdAbstractWorker.h"
#include "Core/mvdAlgorithm.h"
#include "mvdAbstractWorker.h"
#include "mvdAlgorithm.h"
namespace mvd
{
......
......@@ -33,7 +33,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdVectorImageModel.h"
#include "mvdVectorImageModel.h"
namespace mvd
{
......
......@@ -37,7 +37,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdImageSettings.h"
#include "mvdImageSettings.h"
namespace mvd
......
......@@ -39,8 +39,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdAbstractLayerModel.h"
#include "Core/mvdAlgorithm.h"
#include "mvdAbstractLayerModel.h"
#include "mvdAlgorithm.h"
namespace mvd
{
......
......@@ -47,9 +47,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdAlgorithm.h"
#include "Core/mvdQuicklookModel.h"
#include "Core/mvdSystemError.h"
#include "mvdAlgorithm.h"
#include "mvdQuicklookModel.h"
#include "mvdSystemError.h"
......
......@@ -38,7 +38,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTextStream.h"
#include "mvdTextStream.h"
namespace mvd
{
......
......@@ -45,9 +45,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "Gui/mvdAbstractImageViewRenderer.h"
#include "Gui/mvdGui.h"
#include "mvdTypes.h"
#include "mvdAbstractImageViewRenderer.h"
#include "mvdGui.h"
/*****************************************************************************/
......
......@@ -45,7 +45,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdStackedLayerModel.h"
#include "mvdStackedLayerModel.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
#define USE_ALGORITHM_ROOT_NODE 0
......
......@@ -46,7 +46,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Gui/mvdAbstractModelController.h"
#include "mvdAbstractModelController.h"
#endif //tag=QT4-boost-compatibility
//#include "mvdGui.h"
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "mvdCore.h"
/*****************************************************************************/
......
......@@ -43,7 +43,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "mvdCore.h"
//
#include "mvdAbstractModelController.h"
......
......@@ -43,9 +43,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "mvdCore.h"
//
#include "Gui/mvdAbstractModelController.h"
#include "mvdAbstractModelController.h"
/*****************************************************************************/
......
......@@ -40,7 +40,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "mvdCore.h"
//
// External classes pre-declaration.
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdAbstractDragAndDropEventFilter.h"
#include "mvdAbstractDragAndDropEventFilter.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
/*****************************************************************************/
......
......@@ -43,7 +43,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "mvdCore.h"
//
#include "mvdAbstractModelController.h"
......
......@@ -47,8 +47,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "Core/mvdTypes.h"
#include "mvdCore.h"
#include "mvdTypes.h"
/*****************************************************************************/
......
......@@ -49,7 +49,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "mvdCore.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -42,7 +42,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdI18nCoreApplication.h"
#include "mvdI18nCoreApplication.h"
//
// Macros.
......
......@@ -383,7 +383,7 @@ private slots:
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdAbstractModelController.h"
#include "mvdAbstractModelController.h"
namespace mvd
{
......
......@@ -46,9 +46,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "Gui/mvdAbstractImageViewManipulator.h"
#include "Gui/mvdImageViewRenderer.h"
#include "mvdCore.h"
#include "mvdAbstractImageViewManipulator.h"
#include "mvdImageViewRenderer.h"
/*****************************************************************************/
......
......@@ -53,8 +53,8 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdAbstractImageViewRenderer.h"
#include "Gui/mvdGui.h"
#include "mvdAbstractImageViewRenderer.h"
#include "mvdGui.h"
/*****************************************************************************/
......
......@@ -42,9 +42,9 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdCore.h"
#include "Gui/mvdAbstractImageViewRenderer.h"
#include "Gui/mvdGui.h"
#include "mvdCore.h"
#include "mvdAbstractImageViewRenderer.h"
#include "mvdGui.h"
#define USE_XP_REGION_OPTIM 0
......@@ -435,8 +435,8 @@ private slots:
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdHistogramModel.h"
#include "Gui/mvdAbstractImageViewManipulator.h"
#include "mvdHistogramModel.h"
#include "mvdAbstractImageViewManipulator.h"
namespace mvd
{
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
/*****************************************************************************/
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdAbstractModelController.h"
#include "mvdAbstractModelController.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
/*****************************************************************************/
......
......@@ -47,7 +47,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdAbstractModel.h"
#include "mvdAbstractModel.h"
#endif //tag=QT4-boost-compatibility
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
/*****************************************************************************/
/* PRE-DECLARATION SECTION */
......
......@@ -342,8 +342,8 @@ public:
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdI18nCoreApplication.h"
#include "Gui/mvdFilenameDragAndDropEventFilter.h"
#include "mvdI18nCoreApplication.h"
#include "mvdFilenameDragAndDropEventFilter.h"
#endif //tag=QT4-boost-compatibility
namespace mvd
......
......@@ -50,7 +50,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
#endif //tag=QT4-boost-compatibility
/*****************************************************************************/
......
......@@ -45,7 +45,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdImageViewManipulator.h"
#include "mvdImageViewManipulator.h"
/*****************************************************************************/
......
......@@ -45,7 +45,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Gui/mvdImageViewRenderer.h"
#include "mvdImageViewRenderer.h"
/*****************************************************************************/
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
// #include "Core/mvdTypes.h"
// #include "mvdTypes.h"
/*****************************************************************************/
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdImageSettingsInterface.h"
#include "mvdImageSettingsInterface.h"
/*****************************************************************************/
......
......@@ -44,7 +44,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdTypes.h"
#include "mvdTypes.h"
/*****************************************************************************/
......@@ -193,7 +193,7 @@ private slots:
//
// Monteverdi includes (sorted by alphabetic order)
#include "Core/mvdAlgorithm.h"
#include "mvdAlgorithm.h"
namespace mvd
{
......