Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
a1bd53c0
Commit
a1bd53c0
authored
Aug 17, 2016
by
Guillaume Pasero
Browse files
COMP: shadow warnings
parent
c5f2a025
Changes
8
Hide whitespace changes
Inline
Side-by-side
Modules/Visualization/Monteverdi/include/mvdMainWindow.h
View file @
a1bd53c0
...
...
@@ -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
View file @
a1bd53c0
...
...
@@ -85,7 +85,7 @@ class Monteverdi_EXPORT PreferencesDialog :
public:
/** Constructor */
PreferencesDialog
(
QWidget
*
p
arent
=
NULL
,
Qt
::
WindowFlags
flags
=
0
);
PreferencesDialog
(
QWidget
*
p
=
NULL
,
Qt
::
WindowFlags
flags
=
0
);
/** Destructor */
virtual
~
PreferencesDialog
();
...
...
Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx
View file @
a1bd53c0
...
...
@@ -114,8 +114,8 @@ namespace mvd
/*****************************************************************************/
MainWindow
::
MainWindow
(
QWidget
*
p
arent
,
Qt
::
WindowFlags
flags
)
:
I18nMainWindow
(
p
arent
,
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
View file @
a1bd53c0
...
...
@@ -100,8 +100,8 @@ IsPathModified( I18nCoreApplication::SettingsKey enabledKey,
/* CLASS IMPLEMENTATION SECTION */
/*****************************************************************************/
PreferencesDialog
::
PreferencesDialog
(
QWidget
*
p
arent
,
Qt
::
WindowFlags
flags
)
:
QDialog
(
p
arent
,
flags
),
::
PreferencesDialog
(
QWidget
*
p
,
Qt
::
WindowFlags
flags
)
:
QDialog
(
p
,
flags
),
m_UI
(
new
mvd
::
Ui
::
PreferencesDialog
()
),
m_ResultsDirModified
(
false
),
m_GeoidFileModified
(
false
),
...
...
Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
View file @
a1bd53c0
...
...
@@ -492,7 +492,7 @@ I18nMainWindow
{
QString
path
(
QFileDialog
::
getExistingDirectory
(
p
arent
,
p
,
caption
,
dir
.
isEmpty
()
?
I18nMainWindow
::
m_LastAcceptedDir
.
path
()
:
dir
,
options
...
...
@@ -518,7 +518,7 @@ I18nMainWindow
{
QString
filename
(
QFileDialog
::
getOpenFileName
(
p
arent
,
p
,
caption
,
dir
.
isEmpty
()
?
I18nMainWindow
::
m_LastAcceptedDir
.
path
()
:
dir
,
filter
,
...
...
@@ -546,7 +546,7 @@ I18nMainWindow
{
QStringList
filenames
(
QFileDialog
::
getOpenFileNames
(
p
arent
,
p
,
caption
,
dir
.
isEmpty
()
?
I18nMainWindow
::
m_LastAcceptedDir
.
path
()
:
dir
,
filter
,
...
...
@@ -576,7 +576,7 @@ I18nMainWindow
{
QString
filename
(
QFileDialog
::
getSaveFileName
(
p
arent
,
p
,
caption
,
dir
.
isEmpty
()
?
I18nMainWindow
::
m_LastAcceptedDir
.
path
()
:
dir
,
filter
,
...
...
Modules/Visualization/MonteverdiGui/src/mvdApplicationLauncher.cxx
View file @
a1bd53c0
...
...
@@ -244,7 +244,7 @@ ApplicationLauncher
ApplicationLauncher
::
NewOtbApplicationWidget
(
appName
,
isStandalone
,
p
arent
,
p
,
flags
|
Qt
::
Window
);
...
...
Modules/Visualization/MonteverdiGui/src/mvdLayerStackItemModel.cxx
View file @
a1bd53c0
...
...
@@ -693,7 +693,7 @@ LayerStackItemModel
#if 1
AbstractLayerModel
*
layer
=
m_StackedLayerModel
->
At
(
row
);
if
(
layer
==
NULL
||
p
arent
.
isValid
()
)
if
(
layer
==
NULL
||
p
.
isValid
()
)
return
QModelIndex
();
#endif
...
...
@@ -701,7 +701,7 @@ LayerStackItemModel
createIndex
(
row
,
column
,
p
arent
.
isValid
()
p
.
isValid
()
?
NULL
:
m_StackedLayerModel
->
At
(
row
)
);
...
...
@@ -712,10 +712,10 @@ bool
LayerStackItemModel
::
insertRows
(
int
row
,
int
count
,
const
QModelIndex
&
p
)
{
assert
(
!
p
arent
.
isValid
()
);
assert
(
!
p
.
isValid
()
);
assert
(
count
==
1
);
if
(
p
arent
.
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
(
!
p
arent
.
isValid
()
);
assert
(
!
p
.
isValid
()
);
assert
(
count
==
1
);
if
(
p
arent
.
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(" << p
arent
<< ")";
// qDebug() << this << "::rowCount(" << p << ")";
// qDebug() << "row-count:" <<
// ( ( m_StackedLayerModel==NULL || p
arent
.isValid() )
// ( ( m_StackedLayerModel==NULL || p.isValid() )
// ? 0
// : m_StackedLayerModel->GetCount()
// );
return
(
m_StackedLayerModel
==
NULL
||
p
arent
.
isValid
()
)
(
m_StackedLayerModel
==
NULL
||
p
.
isValid
()
)
?
0
:
m_StackedLayerModel
->
GetCount
();
}
...
...
Modules/Visualization/MonteverdiGui/src/mvdTreeWidgetItem.cxx
View file @
a1bd53c0
...
...
@@ -90,7 +90,7 @@ TreeWidgetItem
QTreeWidgetItem
(
p
,
QStringList
(
text
)
<<
QString
()
<<
columns
,
type
)
#endif // BUG_WORKAROUND_MANTIS_947
{
assert
(
p
arent
!=
NULL
);
assert
(
p
!=
NULL
);
// parent->addChild( this );
SetId
(
id
);
...
...
@@ -108,7 +108,7 @@ TreeWidgetItem
Qt
::
ItemIsEnabled
);
#if BUG_WORKAROUND_MANTIS_947
p
arent
->
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
p
arent
->
addChild
(
this
);
p
->
addChild
(
this
);
#endif // BUG_WORKAROUND_MANTIS_947
break
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment