Commit c5f2a025 authored by Guillaume Pasero's avatar Guillaume Pasero

WRG: avoid shadow warning (parent)

parent 8cc4ee64
......@@ -293,7 +293,7 @@ signals:
protected:
/** Constructor */
AbstractImageModel( QObject* parent =NULL );
AbstractImageModel( QObject* p =NULL );
/**
* \brief Set image properties pointer.
......
......@@ -156,7 +156,7 @@ signals:
protected:
/** \brief Constructor. */
AbstractLayerModel( QObject* parent =NULL );
AbstractLayerModel( QObject* p =NULL );
/**
*/
......
......@@ -132,7 +132,7 @@ signals:
// Protected methods.
protected:
/** Constructor */
AbstractModel( QObject* parent =NULL );
AbstractModel( QObject* p =NULL );
/**
*/
......
......@@ -162,7 +162,7 @@ signals:
protected:
/** \brief Constructor. */
AbstractWorker( QObject* parent =NULL );
AbstractWorker( QObject* p =NULL );
//
// Protected attributes.
......
......@@ -103,7 +103,7 @@ public:
/** typedef */
/** \brief Constructor. */
ApplicationsBrowser( QObject* parent =NULL );
ApplicationsBrowser( QObject* p =NULL );
/** \brief Destructor. */
virtual ~ApplicationsBrowser();
......
......@@ -90,7 +90,7 @@ public:
*/
BackgroundTask( AbstractWorker* worker,
bool autoDestroy =true,
QObject* parent =NULL );
QObject* p =NULL );
/**
* \brief Destructor.
......
......@@ -158,7 +158,7 @@ public:
public:
/** \brief Constructor. */
HistogramModel( QObject* parent =NULL );
HistogramModel( QObject* p =NULL );
/** \brief Destructor. */
virtual ~HistogramModel();
......
......@@ -296,7 +296,7 @@ public:
LoadImageModel( const QString & filename,
int width,
int height,
QObject * parent =NULL );
QObject * p =NULL );
/**
*/
......
......@@ -99,7 +99,7 @@ public:
bool isForceCreateEnabled,
int width =-1,
int height =-1,
QObject* parent =NULL );
QObject* p =NULL );
/**
* \brief Constructor (image-model).
......@@ -112,7 +112,7 @@ public:
ImageImporter( const QString& filename,
int width =-1,
int height =-1,
QObject* parent =NULL );
QObject* p =NULL );
/**
* \brief Destructor.
......
......@@ -103,7 +103,7 @@ public:
/** \brief Constructor. */
#if IMAGE_PROPERTIES_IS_QOBJECT
ImageProperties( QObject* parent =NULL );
ImageProperties( QObject* p =NULL );
#else
ImageProperties();
#endif
......
......@@ -86,7 +86,7 @@ class Monteverdi_EXPORT MyClass :
public:
/** \brief Constructor. */
MyClass( QObject* parent =NULL );
MyClass( QObject* p =NULL );
/** \brief Destructor. */
virtual ~MyClass();
......
......@@ -100,7 +100,7 @@ public:
* \brief Constructor.
*/
OverviewBuilder( const GDALOverviewsBuilderVector & builders,
QObject * parent =NULL );
QObject * p =NULL );
/**
* \brief Destructor.
......
......@@ -93,7 +93,7 @@ public:
public:
/** Constructor */
QuicklookModel( QObject* parent =NULL );
QuicklookModel( QObject* p =NULL );
/** Destructor */
virtual ~QuicklookModel();
......
......@@ -108,7 +108,7 @@ public:
public:
/** \brief Constructor. */
StackedLayerModel( QObject* parent =NULL );
StackedLayerModel( QObject* p =NULL );
/** \brief Destructor. */
virtual ~StackedLayerModel();
......
......@@ -110,7 +110,7 @@ public:
static const unsigned int DEFAULT_LOD_SIZE;
/** Constructor */
VectorImageModel( QObject* parent =NULL );
VectorImageModel( QObject* p =NULL );
/** Destructor */
virtual ~VectorImageModel();
......
......@@ -87,8 +87,8 @@ ENHANCED_BAND_NAMES[ 10 ] = {
/*******************************************************************************/
AbstractImageModel
::AbstractImageModel( QObject* parent ) :
AbstractLayerModel( parent ),
::AbstractImageModel( QObject* p ) :
AbstractLayerModel( p ),
m_NativeLargestRegion(),
m_Id( -1 ),
m_CurrentLod( 0 ),
......
......@@ -113,8 +113,8 @@ GetSpatialReferenceType( const std::string & wkt, bool hasKwl )
/* CLASS IMPLEMENTATION SECTION */
/*****************************************************************************/
AbstractLayerModel
::AbstractLayerModel( QObject* parent ) :
AbstractModel( parent ),
::AbstractLayerModel( QObject* p ) :
AbstractModel( p ),
VisibleInterface()
{
}
......
......@@ -55,8 +55,8 @@ namespace mvd
/*******************************************************************************/
AbstractModel
::AbstractModel( QObject* parent ) :
QObject( parent )
::AbstractModel( QObject* p ) :
QObject( p )
{
}
......
......@@ -66,8 +66,8 @@ namespace
/*******************************************************************************/
AbstractWorker
::AbstractWorker( QObject* parent ) :
QObject( parent )
::AbstractWorker( QObject* p ) :
QObject( p )
{
}
......
......@@ -66,8 +66,8 @@ namespace mvd
/*******************************************************************************/
ApplicationsBrowser
::ApplicationsBrowser( QObject* parent ) :
QObject( parent ),
::ApplicationsBrowser( QObject* p ) :
QObject( p ),
m_AutoLoadPath("")
{
}
......
......@@ -69,8 +69,8 @@ namespace
/*******************************************************************************/
BackgroundTask
::BackgroundTask( AbstractWorker* worker, bool autoDestroy, QObject* parent ) :
QThread( parent ),
::BackgroundTask( AbstractWorker* worker, bool autoDestroy, QObject* p ) :
QThread( p ),
m_Worker( worker )
{
// Check worker argument.
......
......@@ -67,8 +67,8 @@ namespace
/*******************************************************************************/
HistogramModel
::HistogramModel( QObject* parent ) :
AbstractModel( parent ),
::HistogramModel( QObject* p ) :
AbstractModel( p ),
m_Histograms(),
m_MinPixel(),
m_MaxPixel()
......
......@@ -177,7 +177,7 @@ I18nCoreApplication
::LoadImageModel( const QString & filename,
int width,
int height,
QObject * parent )
QObject * p )
{
try
{
......@@ -194,7 +194,7 @@ I18nCoreApplication
{
AbstractImageModel::BuildContext context( filename );
imageModel = new VectorImageModel( parent );
imageModel = new VectorImageModel( p );
imageModel->SetFilename( filename, width, height );
......
......@@ -70,8 +70,8 @@ ImageImporter
::ImageImporter( const QString& filename,
int width,
int height,
QObject* parent ) :
AbstractWorker( parent ),
QObject* p ) :
AbstractWorker( p ),
m_Filename( filename ),
m_ModelType( IMAGE ),
m_Width( width ),
......
......@@ -67,8 +67,8 @@ namespace
/*******************************************************************************/
ImageProperties
#if IMAGE_PROPERTIES_IS_QOBJECT
::ImageProperties( QObject* parent ) :
QObject( parent ),
::ImageProperties( QObject* p ) :
QObject( p ),
#else
::ImageProperties() :
#endif
......
......@@ -66,8 +66,8 @@ namespace
/*******************************************************************************/
MyClass
::MyClass( QObject* parent ) :
QObject( parent )
::MyClass( QObject* p ) :
QObject( p )
{
}
......
......@@ -71,8 +71,8 @@ namespace
/*******************************************************************************/
OverviewBuilder
::OverviewBuilder( const GDALOverviewsBuilderVector & builders,
QObject * parent ) :
AbstractWorker( parent ),
QObject * p ) :
AbstractWorker( p ),
ProgressInterface(),
m_GDALOverviewsBuilders( builders ),
m_Index( 0 ),
......
......@@ -64,8 +64,8 @@ namespace mvd
/*******************************************************************************/
QuicklookModel
::QuicklookModel( QObject* parent ) :
VectorImageModel( parent )
::QuicklookModel( QObject* p ) :
VectorImageModel( p )
{
}
......
......@@ -78,8 +78,8 @@ StackedLayerModel::NIL_INDEX = -1;
/*******************************************************************************/
StackedLayerModel
::StackedLayerModel( QObject* parent ) :
AbstractModel( parent ),
::StackedLayerModel( QObject* p ) :
AbstractModel( p ),
m_LayerModels(),
m_Keys(),
m_Current( StackedLayerModel::NIL_INDEX ),
......
......@@ -69,8 +69,8 @@ const unsigned int VectorImageModel::DEFAULT_LOD_SIZE = 512;
/* CLASS IMPLEMENTATION SECTION */
/*****************************************************************************/
VectorImageModel
::VectorImageModel( QObject* parent ) :
AbstractImageModel( parent ),
::VectorImageModel( QObject* p ) :
AbstractImageModel( p ),
FilenameInterface(),
m_Image(),
m_ImageFileReader(),
......
......@@ -70,7 +70,7 @@ class Monteverdi_EXPORT AboutDialog :
public:
/** Constructor */
AboutDialog( QWidget* parent =NULL, Qt::WindowFlags flags =0 );
AboutDialog( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor */
virtual ~AboutDialog();
......
......@@ -115,7 +115,7 @@ signals:
protected:
/** \brief Constructor. */
AbstractDragAndDropEventFilter( QObject* parent =NULL );
AbstractDragAndDropEventFilter( QObject* p =NULL );
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dragEnterEvent
......
......@@ -259,7 +259,7 @@ protected:
protected:
/** \brief Constructor. */
AbstractImageViewManipulator( QObject* parent =NULL ):QObject( parent ){};
AbstractImageViewManipulator( QObject* p =NULL ):QObject( p ){};
//
// Protected attributes.
......
......@@ -267,8 +267,8 @@ protected:
/**
* Constructor.
*/
AbstractImageViewRenderer( QObject* parent = NULL ) :
QObject( parent ),
AbstractImageViewRenderer( QObject* p = NULL ) :
QObject( p ),
m_StackedLayerModel( NULL ),
m_BypassRenderingEnabled( false ),
m_GLSLEnabled( true )
......
......@@ -161,7 +161,7 @@ signals:
protected:
/** Constructor */
AbstractModelController( QWidget* widget, QObject* parent =NULL );
AbstractModelController( QWidget* widget, QObject* p =NULL );
//
// Protected attributes.
......
......@@ -89,7 +89,7 @@ class Monteverdi_EXPORT ApplicationLauncher :
public:
/** \brief Constructor. */
ApplicationLauncher( QObject* parent =NULL );
ApplicationLauncher( QObject* p =NULL );
/** \brief Destructor. */
virtual ~ApplicationLauncher();
......@@ -101,14 +101,14 @@ public:
Wrapper::QtWidgetView *
NewOtbApplicationWidget( const QString & appName,
bool isStandalone =false,
QWidget * parent =NULL,
QWidget * p =NULL,
Qt::WindowFlags =0 ) const;
/**
*/
QWidget * NewOtbApplicationWindow( const QString & appName,
bool isStandalone =false,
QWidget * parent =NULL,
QWidget * p =NULL,
Qt::WindowFlags =0 ) const;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
......
......@@ -92,7 +92,7 @@ class Monteverdi_EXPORT ApplicationsToolBox :
public:
/** \brief Constructor. */
ApplicationsToolBox( QWidget* parent =NULL, Qt::WindowFlags flags =0 );
ApplicationsToolBox( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
virtual ~ApplicationsToolBox();
......
......@@ -95,7 +95,7 @@ public:
* \param parent Parent QObject of this QObject.
*/
ApplicationsToolBoxController( ApplicationsToolBox* widget,
QObject* parent =NULL );
QObject* p =NULL );
/**
* \brief Destructor.
......
......@@ -135,7 +135,7 @@ class Monteverdi_EXPORT ColorBandDynamicsWidget :
public:
/** Constructor */
ColorBandDynamicsWidget( QWidget* parent =NULL, Qt::WindowFlags flags =0 );
ColorBandDynamicsWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor */
virtual ~ColorBandDynamicsWidget();
......
......@@ -91,7 +91,7 @@ public:
* \param widget Controlled widget.
* \param parent Parent QObject of this QObject.
*/
ColorDynamicsController( ColorDynamicsWidget* widget, QObject* parent =NULL );
ColorDynamicsController( ColorDynamicsWidget* widget, QObject* p =NULL );
/** \brief Destructor. */
virtual ~ColorDynamicsController();
......
......@@ -115,7 +115,7 @@ class Monteverdi_EXPORT ColorDynamicsWidget :
public:
/** Constructor. */
ColorDynamicsWidget( QWidget* parent =NULL, Qt::WindowFlags flags =0 );
ColorDynamicsWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor. */
virtual ~ColorDynamicsWidget();
......
......@@ -91,7 +91,7 @@ public:
* \param widget Controlled widget.
* \param parent Parent QObject of this QObject.
*/
ColorSetupController( ColorSetupWidget* widget, QObject* parent =NULL );
ColorSetupController( ColorSetupWidget* widget, QObject* p =NULL );
/**
* \brief Destructor.
......
......@@ -82,7 +82,7 @@ public:
public:
/** \brief Constructor. */
ColorSetupWidget( QWidget* parent =NULL, Qt::WindowFlags flags =0 );
ColorSetupWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
virtual ~ColorSetupWidget();
......
......@@ -84,7 +84,7 @@ class Monteverdi_EXPORT DoubleValidator :
public:
/** \brief Constructor. */
DoubleValidator( QObject* parent =NULL );
DoubleValidator( QObject* p =NULL );
/**
* \brief Constructor.
......@@ -92,7 +92,7 @@ public:
DoubleValidator( double bottom,
double top,
int decimals,
QObject *parent = 0 );
QObject *p = 0 );
/** \brief Destructor. */
virtual ~DoubleValidator();
......
......@@ -90,10 +90,10 @@ class Monteverdi_EXPORT DropLineEdit :
public:
/** \brief Constructor. */
DropLineEdit( QWidget* parent =0 );
DropLineEdit( QWidget* p =0 );
/** \brief Constructor. */
DropLineEdit( const QString& contents, QWidget* parent =0 );
DropLineEdit( const QString& contents, QWidget* p =0 );
/** \brief Destructor. */
virtual ~DropLineEdit();
......
......@@ -86,7 +86,7 @@ class Monteverdi_EXPORT FilenameDragAndDropEventFilter :
public:
/** \brief Constructor. */
FilenameDragAndDropEventFilter( QObject* parent =NULL );
FilenameDragAndDropEventFilter( QObject* p =NULL );
/** \brief Destructor. */
virtual ~FilenameDragAndDropEventFilter();
......
......@@ -91,7 +91,7 @@ public:
* \param widget Controlled widget.
* \param parent Parent QObject of this QObject.
*/
HistogramController( HistogramWidget* widget, QObject* parent =NULL );
HistogramController( HistogramWidget* widget, QObject* p =NULL );
/**
* \brief Destructor.
......
......@@ -108,7 +108,7 @@ class Monteverdi_EXPORT HistogramWidget :
public:
/** \brief Constructor. */
HistogramWidget( QWidget* parent =NULL, Qt::WindowFlags flags =0 );
HistogramWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
virtual ~HistogramWidget();
......
......@@ -116,7 +116,7 @@ public:
*/
static inline
QString
GetExistingDirectory( QWidget* parent =0,
GetExistingDirectory( QWidget* p =0,
const QString& caption =QString(),
const QString& dir = QString(),
QFileDialog::Options options =QFileDialog::ShowDirsOnly
......@@ -142,7 +142,7 @@ public:
*/
static inline
QString
GetOpenFileName( QWidget* parent =0,
GetOpenFileName( QWidget* p =0,
const QString& caption =QString(),
const QString& dir = QString(),
const QString& filter = QString(),
......@@ -169,7 +169,7 @@ public:
*/
static inline
QStringList
GetOpenFileNames( QWidget* parent =0,
GetOpenFileNames( QWidget* p =0,
const QString& caption =QString(),
const QString& dir =QString(),
const QString& filter =QString(),
......@@ -196,7 +196,7 @@ public:
*/
static inline
QString
GetSaveFileName( QWidget* parent =0,
GetSaveFileName( QWidget* p =0,
const QString& caption =QString(),
const QString& dir =QString(),
const QString& filter =QString(),
......@@ -485,7 +485,7 @@ I18nMainWindow
inline
QString
I18nMainWindow
::GetExistingDirectory( QWidget* parent,
::GetExistingDirectory( QWidget* p,
const QString& caption,
const QString& dir,
QFileDialog::Options options )
......@@ -509,7 +509,7 @@ I18nMainWindow
inline
QString
I18nMainWindow
::GetOpenFileName( QWidget* parent,
::GetOpenFileName( QWidget* p,
const QString& caption,
const QString& dir,
const QString& filter,
......@@ -537,7 +537,7 @@ I18nMainWindow
inline
QStringList
I18nMainWindow
::GetOpenFileNames( QWidget* parent,
::GetOpenFileNames( QWidget* p,
const QString& caption,
const QString& dir,
const QString& filter,
......@@ -567,7 +567,7 @@ I18nMainWindow
inline
QString
I18nMainWindow
::GetSaveFileName( QWidget* parent,
::GetSaveFileName( QWidget* p,
const QString& caption,
const QString& dir,
const QString& filter,
......
......@@ -113,9 +113,9 @@ public:
/** \brief Constructor. */
#if USE_VIEW_SETTINGS_SIDE_EFFECT
ImageViewManipulator( const otb::ViewSettings::Pointer& viewSettings,
QObject* parent =NULL );
QObject* p =NULL );
#else // USE_VIEW_SETTINGS_SIDE_EFFECT
ImageViewManipulator( QObject* parent =NULL );
ImageViewManipulator( QObject* p =NULL );
#endif // USE_VIEW_SETTINGS_SIDE_EFFECT
/** \brief Destructor. */
......
......@@ -129,7 +129,7 @@ public:
// Public methods.
public:
/** Constructor */
ImageViewRenderer( QObject* parent = NULL );
ImageViewRenderer( QObject* p = NULL );
/** Destructor */
virtual ~ImageViewRenderer();
......
......@@ -92,7 +92,7 @@ public:
/** \brief Constructor. */
ImageViewWidget( AbstractImageViewManipulator* manipulator,
AbstractImageViewRenderer* renderer,
QWidget* parent =NULL,
QWidget* p =NULL,
const QGLWidget* shareWidget =NULL,
Qt::WindowFlags f =0 );
......@@ -100,7 +100,7 @@ public:
ImageViewWidget( AbstractImageViewManipulator* manipulator,
AbstractImageViewRenderer* renderer,
QGLContext* context,
QWidget* parent =NULL,