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

COMP: Fixed shadowed members.

parent 91fe2a8f
......@@ -80,8 +80,8 @@ namespace mvd
/*****************************************************************************/
MaplaMainWindow
::MaplaMainWindow( QWidget* parent, Qt::WindowFlags flags ) :
I18nMainWindow( parent, flags ),
::MaplaMainWindow( QWidget * p, Qt::WindowFlags flags ) :
I18nMainWindow( p, flags ),
m_UI( new mvd::Ui::MaplaMainWindow() )
#ifdef OTB_USE_QT4
,
......@@ -161,7 +161,7 @@ MaplaMainWindow
/*****************************************************************************/
void
MaplaMainWindow
::closeEvent( QCloseEvent* event )
::closeEvent( QCloseEvent* e )
{
assert( MaplaApplication::Instance() );
assert(
......@@ -171,7 +171,7 @@ MaplaMainWindow
SaveLayout( Monteverdi_UI_VERSION );
I18nMainWindow::closeEvent( event );
I18nMainWindow::closeEvent( e );
}
/*****************************************************************************/
......
......@@ -1178,7 +1178,7 @@ MainWindow
assert( referenceLayerComboBox!=NULL );
bool signalsBlocked = referenceLayerComboBox->blockSignals( true );
bool blocked = referenceLayerComboBox->blockSignals( true );
// }
//
......@@ -1212,7 +1212,7 @@ MainWindow
//
// BUGFIX: MANTIS-1120
// {
referenceLayerComboBox->blockSignals( signalsBlocked );
referenceLayerComboBox->blockSignals( blocked );
// }
//
......@@ -1257,23 +1257,23 @@ MainWindow
/*****************************************************************************/
void
MainWindow
::closeEvent( QCloseEvent* event )
::closeEvent( QCloseEvent * e )
{
assert( event!=NULL );
assert( e!=NULL );
{
//
// List OTB-application widgets.
typedef QList< mvd::Wrapper::QtWidgetView * > QtWidgetViewList;
QtWidgetViewList children( findChildren< mvd::Wrapper::QtWidgetView * >() );
QtWidgetViewList c( findChildren< mvd::Wrapper::QtWidgetView * >() );
QStringList names;
//
// Find out which OTB-applications are running.
for( QtWidgetViewList::iterator it( children.begin() );
it!=children.end();
for( QtWidgetViewList::iterator it( c.begin() );
it!=c.end();
++ it )
{
assert( *it );
......@@ -1304,7 +1304,7 @@ MainWindow
.arg( names.join( "\n- " ) )
);
event->ignore();
e->ignore();
return;
}
......@@ -1332,7 +1332,7 @@ MainWindow
if( button==QMessageBox::No )
{
event->ignore();
e->ignore();
return;
}
......@@ -1345,7 +1345,7 @@ MainWindow
//
// Otherwise, close.
I18nMainWindow::closeEvent( event );
I18nMainWindow::closeEvent( e );
}
/*****************************************************************************/
......@@ -1426,13 +1426,13 @@ MainWindow
assert( comboBox!=NULL );
bool signalsBlocked = comboBox->blockSignals( true );
bool blocked = comboBox->blockSignals( true );
{
comboBox->clear();
comboBox->addItem( "None" );
}
comboBox->blockSignals( signalsBlocked );
comboBox->blockSignals( blocked );
if( model==NULL )
......
......@@ -644,13 +644,13 @@ ImageViewWidget
/*******************************************************************************/
void
ImageViewWidget
::resizeGL( int width, int height )
::resizeGL( int w, int h )
{
QGLWidget::resizeGL( width, height );
QGLWidget::resizeGL( w, h );
assert( m_Renderer!=NULL );
m_Renderer->ResizeGL( width, height );
m_Renderer->ResizeGL( w, h );
}
/*******************************************************************************/
......@@ -666,20 +666,20 @@ ImageViewWidget
// Get new rendering-context.
assert( m_Renderer!=NULL );
AbstractImageViewRenderer::RenderingContext* context =
AbstractImageViewRenderer::RenderingContext* c =
m_Renderer->NewRenderingContext();
assert( context!=NULL );
assert( c!=NULL );
//
// Setup new rendering-context.
assert( m_Manipulator!=NULL );
m_Manipulator->SetupRenderingContext( context );
m_Manipulator->SetupRenderingContext( c );
//
// OpenGL paint using new rendering-context.
m_Renderer->PaintGL( context );
m_Renderer->PaintGL( c );
//
// Post-rendering tasks.
......@@ -701,8 +701,8 @@ ImageViewWidget
//
// Relase rendering-context.
delete context;
context = NULL;
delete c;
c = NULL;
}
/*******************************************************************************/
......@@ -1132,11 +1132,11 @@ ImageViewWidget
/*****************************************************************************/
bool
ImageViewWidget
::SetBypassRenderingEnabled( bool isEnabled )
::SetBypassRenderingEnabled( bool enabled )
{
assert( m_Renderer!=NULL );
return m_Renderer->SetBypassRenderingEnabled( isEnabled );
return m_Renderer->SetBypassRenderingEnabled( enabled );
}
/*****************************************************************************/
......@@ -1150,9 +1150,9 @@ ImageViewWidget
/*****************************************************************************/
void
ImageViewWidget
::SetPickingEnabled( bool isEnabled )
::SetPickingEnabled( bool enabled )
{
m_IsPickingEnabled = isEnabled;
m_IsPickingEnabled = enabled;
}
/*****************************************************************************/
......@@ -1289,13 +1289,13 @@ ImageViewWidget
settings.GetRgbChannels()
);
for( VectorImageSettings::ChannelVector::const_iterator it(
for( VectorImageSettings::ChannelVector::const_iterator vis(
rgb.begin()
);
it!=rgb.end();
++it )
if( *it > rgbChannel )
rgbChannel = *it;
vis!=rgb.end();
++vis )
if( *vis > rgbChannel )
rgbChannel = *vis;
}
CountType nbComponents = vim->GetNbComponents();
......
......@@ -95,10 +95,10 @@ StatusBarWidget
/*****************************************************************************/
void
StatusBarWidget
::SetGLSLEnabled( bool isEnabled )
::SetGLSLEnabled( bool enabled )
{
m_UI->renderModelLabel->setText(
isEnabled
enabled
? tr( "GLSL" )
: tr( "OpenGL" )
);
......
Markdown is supported
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