Commit 9bf2e486 authored by Stéphane Albert's avatar Stéphane Albert
Browse files

MRG: Merged from origin/rfc-51-mvd_modules.

parents be4c84e2 f87c8cde
......@@ -116,7 +116,7 @@ public:
// Public methods.
public:
/** \brief Constructor. */
MainWindow( QWidget* Parent =0, Qt::WindowFlags flags =0 );
MainWindow( QWidget* p =0, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
virtual ~MainWindow();
......
......@@ -85,7 +85,7 @@ class Monteverdi_EXPORT PreferencesDialog :
public:
/** Constructor */
PreferencesDialog( QWidget* parent =NULL, Qt::WindowFlags flags =0 );
PreferencesDialog( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor */
virtual ~PreferencesDialog();
......
......@@ -114,8 +114,8 @@ namespace mvd
/*****************************************************************************/
MainWindow
::MainWindow( QWidget* parent, Qt::WindowFlags flags ) :
I18nMainWindow( parent, flags ),
::MainWindow( QWidget* p, Qt::WindowFlags flags ) :
I18nMainWindow( p, flags ),
m_UI( new mvd::Ui::MainWindow() ),
m_ColorDynamicsDock( NULL ),
m_ColorSetupDock( NULL ),
......
......@@ -100,8 +100,8 @@ IsPathModified( I18nCoreApplication::SettingsKey enabledKey,
/* CLASS IMPLEMENTATION SECTION */
/*****************************************************************************/
PreferencesDialog
::PreferencesDialog( QWidget* parent, Qt::WindowFlags flags ) :
QDialog( parent, flags ),
::PreferencesDialog( QWidget* p, Qt::WindowFlags flags ) :
QDialog( p, flags ),
m_UI( new mvd::Ui::PreferencesDialog() ),
m_ResultsDirModified( false ),
m_GeoidFileModified( false ),
......
......@@ -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 ),
......
Supports Markdown
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