Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
1f5bc3c0
Commit
1f5bc3c0
authored
Feb 08, 2010
by
ck
Browse files
Maemo: Get rid of const_casts.
Reviewed-by: kh1
parent
999c73ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View file @
1f5bc3c0
...
...
@@ -385,17 +385,31 @@ const QString MaemoRunConfiguration::dumperLib() const
QString
MaemoRunConfiguration
::
executable
()
const
{
const_cast
<
MaemoRunConfiguration
*>
(
this
)
->
updateTarget
();
updateTarget
();
return
m_executable
;
}
QString
MaemoRunConfiguration
::
simulatorSshPort
()
const
{
if
(
!
m_cachedSimulatorInformationValid
)
updateTarget
();
return
m_simulatorSshPort
;
}
QString
MaemoRunConfiguration
::
simulatorGdbServerPort
()
const
{
if
(
!
m_cachedSimulatorInformationValid
)
updateTarget
();
return
m_simulatorGdbServerPort
;
}
QString
MaemoRunConfiguration
::
simulatorPath
()
const
{
qDebug
(
"MaemoRunConfiguration::simulatorPath() called, %s"
,
qPrintable
(
m_simulatorPath
));
if
(
!
m_cachedSimulatorInformationValid
)
const_cast
<
MaemoRunConfiguration
*>
(
this
)
->
updateSimulatorInformation
();
updateSimulatorInformation
();
return
m_simulatorPath
;
}
...
...
@@ -405,7 +419,7 @@ QString MaemoRunConfiguration::visibleSimulatorParameter() const
qPrintable
(
m_visibleSimulatorParameter
));
if
(
!
m_cachedSimulatorInformationValid
)
const_cast
<
MaemoRunConfiguration
*>
(
this
)
->
updateSimulatorInformation
();
updateSimulatorInformation
();
return
m_visibleSimulatorParameter
;
}
...
...
@@ -415,7 +429,7 @@ QString MaemoRunConfiguration::simulator() const
qPrintable
(
m_simulator
));
if
(
!
m_cachedSimulatorInformationValid
)
const_cast
<
MaemoRunConfiguration
*>
(
this
)
->
updateSimulatorInformation
();
updateSimulatorInformation
();
return
m_simulator
;
}
...
...
@@ -425,7 +439,7 @@ QString MaemoRunConfiguration::simulatorArgs() const
qPrintable
(
m_simulatorArgs
));
if
(
!
m_cachedSimulatorInformationValid
)
const_cast
<
MaemoRunConfiguration
*>
(
this
)
->
updateSimulatorInformation
();
updateSimulatorInformation
();
return
m_simulatorArgs
;
}
...
...
@@ -445,7 +459,7 @@ void MaemoRunConfiguration::invalidateCachedTargetInformation()
emit
targetInformationChanged
();
}
void
MaemoRunConfiguration
::
updateTarget
()
void
MaemoRunConfiguration
::
updateTarget
()
const
{
if
(
m_cachedTargetInformationValid
)
return
;
...
...
@@ -472,7 +486,7 @@ void MaemoRunConfiguration::updateTarget()
emit
targetInformationChanged
();
}
void
MaemoRunConfiguration
::
updateSimulatorInformation
()
void
MaemoRunConfiguration
::
updateSimulatorInformation
()
const
{
if
(
m_cachedSimulatorInformationValid
)
return
;
...
...
@@ -481,6 +495,9 @@ void MaemoRunConfiguration::updateSimulatorInformation()
m_simulatorPath
.
clear
();
m_simulatorArgs
.
clear
();
m_visibleSimulatorParameter
.
clear
();
m_simulatorLibPath
.
clear
();
m_simulatorSshPort
.
clear
();
m_simulatorGdbServerPort
.
clear
();
m_cachedSimulatorInformationValid
=
true
;
if
(
const
MaemoToolChain
*
tc
=
toolchain
())
...
...
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
View file @
1f5bc3c0
...
...
@@ -94,8 +94,8 @@ public:
QString
simulator
()
const
;
QString
simulatorArgs
()
const
;
QString
simulatorPath
()
const
;
QString
simulatorSshPort
()
const
{
return
m_simulatorSshPort
;
}
QString
simulatorGdbServerPort
()
const
{
return
m_simulatorGdbServerPort
;
}
QString
simulatorSshPort
()
const
;
QString
simulatorGdbServerPort
()
const
;
QString
visibleSimulatorParameter
()
const
;
const
QString
sshCmd
()
const
;
...
...
@@ -109,8 +109,8 @@ public:
signals:
void
deviceConfigurationsUpdated
();
void
targetInformationChanged
();
void
cachedSimulatorInformationChanged
();
void
targetInformationChanged
()
const
;
void
cachedSimulatorInformationChanged
()
const
;
void
qemuProcessStatus
(
bool
running
);
protected:
...
...
@@ -130,24 +130,24 @@ private slots:
private:
void
init
();
void
updateTarget
();
void
updateSimulatorInformation
();
void
updateTarget
()
const
;
void
updateSimulatorInformation
()
const
;
const
QString
cmd
(
const
QString
&
cmdName
)
const
;
const
MaemoToolChain
*
toolchain
()
const
;
bool
fileNeedsDeployment
(
const
QString
&
path
,
const
QDateTime
&
lastDeployed
)
const
;
QString
m_executable
;
mutable
QString
m_executable
;
QString
m_proFilePath
;
bool
m_cachedTargetInformationValid
;
QString
m_simulator
;
QString
m_simulatorArgs
;
QString
m_simulatorPath
;
QString
m_visibleSimulatorParameter
;
QString
m_simulatorLibPath
;
QString
m_simulatorSshPort
;
QString
m_simulatorGdbServerPort
;
bool
m_cachedSimulatorInformationValid
;
mutable
bool
m_cachedTargetInformationValid
;
mutable
QString
m_simulator
;
mutable
QString
m_simulatorArgs
;
mutable
QString
m_simulatorPath
;
mutable
QString
m_visibleSimulatorParameter
;
mutable
QString
m_simulatorLibPath
;
mutable
QString
m_simulatorSshPort
;
mutable
QString
m_simulatorGdbServerPort
;
mutable
bool
m_cachedSimulatorInformationValid
;
QString
m_gdbPath
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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