Commit a1bd53c0 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

COMP: shadow warnings

parent c5f2a025
......@@ -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 ),
......
......@@ -492,7 +492,7 @@ I18nMainWindow
{
QString path(
QFileDialog::getExistingDirectory(
parent,
p,
caption,
dir.isEmpty() ? I18nMainWindow::m_LastAcceptedDir.path() : dir,
options
......@@ -518,7 +518,7 @@ I18nMainWindow
{
QString filename(
QFileDialog::getOpenFileName(
parent,
p,
caption,
dir.isEmpty() ? I18nMainWindow::m_LastAcceptedDir.path() : dir,
filter,
......@@ -546,7 +546,7 @@ I18nMainWindow
{
QStringList filenames(
QFileDialog::getOpenFileNames(
parent,
p,
caption,
dir.isEmpty() ? I18nMainWindow::m_LastAcceptedDir.path() : dir,
filter,
......@@ -576,7 +576,7 @@ I18nMainWindow
{
QString filename(
QFileDialog::getSaveFileName(
parent,
p,
caption,
dir.isEmpty() ? I18nMainWindow::m_LastAcceptedDir.path() : dir,
filter,
......
......@@ -244,7 +244,7 @@ ApplicationLauncher
ApplicationLauncher::NewOtbApplicationWidget(
appName,
isStandalone,
parent,
p,
flags | Qt::Window
);
......
......@@ -693,7 +693,7 @@ LayerStackItemModel
#if 1
AbstractLayerModel * layer = m_StackedLayerModel->At( row );
if( layer==NULL || parent.isValid() )
if( layer==NULL || p.isValid() )
return QModelIndex();
#endif
......@@ -701,7 +701,7 @@ LayerStackItemModel
createIndex(
row,
column,
parent.isValid()
p.isValid()
? NULL
: m_StackedLayerModel->At( row )
);
......@@ -712,10 +712,10 @@ bool
LayerStackItemModel
::insertRows( int row, int count, const QModelIndex & p )
{
assert( !parent.isValid() );
assert( !p.isValid() );
assert( count==1 );
if( parent.isValid() || count!=1 )
if( p.isValid() || count!=1 )
return false;
beginInsertRows( p, row, row + count - 1 );
......@@ -793,10 +793,10 @@ bool
LayerStackItemModel
::removeRows( int row, int count, const QModelIndex & p )
{
assert( !parent.isValid() );
assert( !p.isValid() );
assert( count==1 );
if( parent.isValid() || count!=1 )
if( p.isValid() || count!=1 )
return false;
beginRemoveRows( p, row, row + count - 1 );
......@@ -815,16 +815,16 @@ int
LayerStackItemModel
::rowCount( const QModelIndex & p ) const
{
// qDebug() << this << "::rowCount(" << parent << ")";
// qDebug() << this << "::rowCount(" << p << ")";
// qDebug() << "row-count:" <<
// ( ( m_StackedLayerModel==NULL || parent.isValid() )
// ( ( m_StackedLayerModel==NULL || p.isValid() )
// ? 0
// : m_StackedLayerModel->GetCount()
// );
return
( m_StackedLayerModel==NULL || parent.isValid() )
( m_StackedLayerModel==NULL || p.isValid() )
? 0
: m_StackedLayerModel->GetCount();
}
......
......@@ -90,7 +90,7 @@ TreeWidgetItem
QTreeWidgetItem( p, QStringList( text ) << QString() << columns, type )
#endif // BUG_WORKAROUND_MANTIS_947
{
assert( parent!=NULL );
assert( p!=NULL );
// parent->addChild( this );
SetId( id );
......@@ -108,7 +108,7 @@ TreeWidgetItem
Qt::ItemIsEnabled
);
#if BUG_WORKAROUND_MANTIS_947
parent->insertChild( 0, this );
p->insertChild( 0, this );
#endif // BUG_WORKAROUND_MANTIS_947
break;
......@@ -123,7 +123,7 @@ TreeWidgetItem
Qt::ItemIsSelectable
);
#if BUG_WORKAROUND_MANTIS_947
parent->addChild( this );
p->addChild( this );
#endif // BUG_WORKAROUND_MANTIS_947
break;
......
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