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

Maemo: Missed some const_casts the last time.

Browse Source
This commit is contained in:
ck
2010-02-08 11:45:50 +01:00
parent 50f5f91b70
commit 158fe4728f
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
View File

@@ -97,7 +97,7 @@ bool MaemoToolChain::equals(ToolChain *other) const
QString MaemoToolChain::maddeRoot() const QString MaemoToolChain::maddeRoot() const
{ {
if (!m_maddeInitialized) if (!m_maddeInitialized)
(const_cast<MaemoToolChain*> (this))->setMaddeRoot(); setMaddeRoot();
return m_maddeRoot; return m_maddeRoot;
} }
@@ -109,25 +109,25 @@ QString MaemoToolChain::targetRoot() const
QString MaemoToolChain::sysrootRoot() const QString MaemoToolChain::sysrootRoot() const
{ {
if (!m_sysrootInitialized) if (!m_sysrootInitialized)
(const_cast<MaemoToolChain*> (this))->setSysrootAndToolchain(); setSysrootAndToolchain();
return m_sysrootRoot; return m_sysrootRoot;
} }
QString MaemoToolChain::simulatorRoot() const QString MaemoToolChain::simulatorRoot() const
{ {
if (!m_simulatorInitialized) if (!m_simulatorInitialized)
(const_cast<MaemoToolChain*> (this))->setSimulatorRoot(); setSimulatorRoot();
return m_simulatorRoot; return m_simulatorRoot;
} }
QString MaemoToolChain::toolchainRoot() const QString MaemoToolChain::toolchainRoot() const
{ {
if (!m_toolchainInitialized) if (!m_toolchainInitialized)
(const_cast<MaemoToolChain*> (this))->setSysrootAndToolchain(); setSysrootAndToolchain();
return m_toolchainRoot; return m_toolchainRoot;
} }
void MaemoToolChain::setMaddeRoot() void MaemoToolChain::setMaddeRoot() const
{ {
QDir dir(targetRoot()); QDir dir(targetRoot());
dir.cdUp(); dir.cdUp(); dir.cdUp(); dir.cdUp();
@@ -136,7 +136,7 @@ void MaemoToolChain::setMaddeRoot()
m_maddeRoot = dir.absolutePath(); m_maddeRoot = dir.absolutePath();
} }
void MaemoToolChain::setSimulatorRoot() void MaemoToolChain::setSimulatorRoot() const
{ {
QString target = QDir::cleanPath(targetRoot()); QString target = QDir::cleanPath(targetRoot());
target = target.mid(target.lastIndexOf(QLatin1Char('/')) + 1); target = target.mid(target.lastIndexOf(QLatin1Char('/')) + 1);
@@ -171,7 +171,7 @@ void MaemoToolChain::setSimulatorRoot()
m_simulatorInitialized = true; m_simulatorInitialized = true;
} }
void MaemoToolChain::setSysrootAndToolchain() void MaemoToolChain::setSysrootAndToolchain() const
{ {
QFile file(QDir::cleanPath(targetRoot()) + QLatin1String("/information")); QFile file(QDir::cleanPath(targetRoot()) + QLatin1String("/information"));
if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text)) {

22
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
View File

@@ -63,24 +63,24 @@ protected:
bool equals(ToolChain *other) const; bool equals(ToolChain *other) const;
private: private:
void setMaddeRoot(); void setMaddeRoot() const;
void setSimulatorRoot(); void setSimulatorRoot() const;
void setSysrootAndToolchain(); void setSysrootAndToolchain() const;
private: private:
QString m_maddeRoot; mutable QString m_maddeRoot;
bool m_maddeInitialized; mutable bool m_maddeInitialized;
QString m_sysrootRoot; mutable QString m_sysrootRoot;
bool m_sysrootInitialized; mutable bool m_sysrootInitialized;
QString m_simulatorRoot; mutable QString m_simulatorRoot;
bool m_simulatorInitialized; mutable bool m_simulatorInitialized;
QString m_targetRoot; QString m_targetRoot;
QString m_toolchainRoot; mutable QString m_toolchainRoot;
bool m_toolchainInitialized; mutable bool m_toolchainInitialized;
}; };
} // namespace Internal } // namespace Internal