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

Modules/Visualization/Monteverdi/include/mvdMainWindow.h

@@ -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();

Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h

@@ -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();

Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx

@@ -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 ),

Modules/Visualization/Monteverdi/src/mvdPreferencesDialog.cxx

@@ -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 ),

Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h

@@ -293,7 +293,7 @@ signals:
 protected:
 
   /** Constructor */
-  AbstractImageModel( QObject* parent =NULL );
+  AbstractImageModel( QObject* p =NULL );
 
   /**
    * \brief Set image properties pointer.

Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h

@@ -156,7 +156,7 @@ signals:
 protected:
 
   /** \brief Constructor. */
-  AbstractLayerModel( QObject* parent =NULL );
+  AbstractLayerModel( QObject* p =NULL );
 
   /**
    */

Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h

@@ -132,7 +132,7 @@ signals:
 // Protected methods.
 protected:
   /** Constructor */
-  AbstractModel( QObject* parent =NULL );
+  AbstractModel( QObject* p =NULL );
 
   /**
    */

Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h

@@ -162,7 +162,7 @@ signals:
 protected:
 
   /** \brief Constructor. */
-  AbstractWorker( QObject* parent =NULL );
+  AbstractWorker( QObject* p =NULL );
 
 //
 // Protected attributes.

Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h

@@ -103,7 +103,7 @@ public:
   /** typedef */
 
   /** \brief Constructor. */
-  ApplicationsBrowser( QObject* parent =NULL );
+  ApplicationsBrowser( QObject* p =NULL );
 
   /** \brief Destructor. */
   virtual ~ApplicationsBrowser();

Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h

@@ -90,7 +90,7 @@ public:
    */
   BackgroundTask( AbstractWorker* worker,
 		  bool autoDestroy =true,
-		  QObject* parent =NULL );
+		  QObject* p =NULL );
 
   /**
    * \brief Destructor.

Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h

@@ -158,7 +158,7 @@ public:
 public:
 
   /** \brief Constructor. */
-  HistogramModel( QObject* parent =NULL );
+  HistogramModel( QObject* p =NULL );
 
   /** \brief Destructor. */
   virtual ~HistogramModel();

Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h

@@ -296,7 +296,7 @@ public:
     LoadImageModel( const QString & filename,
                     int width,
                     int height,
-                    QObject * parent =NULL );
+                    QObject * p =NULL );
 
   /**
    */

Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h

@@ -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.

Modules/Visualization/MonteverdiCore/include/mvdImageProperties.h

@@ -103,7 +103,7 @@ public:
 
   /** \brief Constructor. */
 #if IMAGE_PROPERTIES_IS_QOBJECT
-  ImageProperties( QObject* parent =NULL );
+  ImageProperties( QObject* p =NULL );
 #else
   ImageProperties();
 #endif

Modules/Visualization/MonteverdiCore/include/mvdMyClass.h

@@ -86,7 +86,7 @@ class Monteverdi_EXPORT MyClass :
 public:
 
   /** \brief Constructor. */
-  MyClass( QObject* parent =NULL );
+  MyClass( QObject* p =NULL );
 
   /** \brief Destructor. */
   virtual ~MyClass();

Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h

@@ -100,7 +100,7 @@ public:
    * \brief Constructor.
    */
   OverviewBuilder( const GDALOverviewsBuilderVector & builders,
-		   QObject * parent =NULL );
+		   QObject * p =NULL );
 
   /**
    * \brief Destructor.

Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h

@@ -93,7 +93,7 @@ public:
 public:
 
   /** Constructor */
-  QuicklookModel( QObject* parent =NULL );
+  QuicklookModel( QObject* p =NULL );
 
   /** Destructor */
   virtual ~QuicklookModel();

Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h

@@ -108,7 +108,7 @@ public:
 public:
 
   /** \brief Constructor. */
-  StackedLayerModel( QObject* parent =NULL );
+  StackedLayerModel( QObject* p =NULL );
 
   /** \brief Destructor. */
   virtual ~StackedLayerModel();

Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h

@@ -110,7 +110,7 @@ public:
   static const unsigned int DEFAULT_LOD_SIZE;
 
   /** Constructor */
-  VectorImageModel( QObject* parent =NULL );
+  VectorImageModel( QObject* p =NULL );
 
   /** Destructor */
   virtual ~VectorImageModel();

Modules/Visualization/MonteverdiCore/src/mvdAbstractImageModel.cxx

@@ -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 ),