feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Get rid of const_casts.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-02-08 11:03:39 +01:00
parent 999c73ad9d
commit 1f5bc3c0bd
2 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

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