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

Remove setPrependPath() and prependPath() from qtversion

Browse Source 
They aren't used anymore.
This commit is contained in:
dt
2009-04-23 13:48:05 +02:00
parent b6114dfa49
commit 7074769387
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/qtversionmanager.cpp
View File

@@ -78,7 +78,6 @@ QtVersionManager::QtVersionManager()
id, id,
s->value("IsSystemVersion", false).toBool()); s->value("IsSystemVersion", false).toBool());
version->setMingwDirectory(s->value("MingwDirectory").toString()); version->setMingwDirectory(s->value("MingwDirectory").toString());
version->setPrependPath(s->value("PrependPath").toString());
version->setMsvcVersion(s->value("msvcVersion").toString()); version->setMsvcVersion(s->value("msvcVersion").toString());
m_versions.append(version); m_versions.append(version);
} }
@@ -151,7 +150,6 @@ void QtVersionManager::writeVersionsIntoSettings()
s->setValue("Path", m_versions.at(i)->path()); s->setValue("Path", m_versions.at(i)->path());
s->setValue("Id", m_versions.at(i)->uniqueId()); s->setValue("Id", m_versions.at(i)->uniqueId());
s->setValue("MingwDirectory", m_versions.at(i)->mingwDirectory()); s->setValue("MingwDirectory", m_versions.at(i)->mingwDirectory());
s->setValue("PrependPath", m_versions.at(i)->prependPath());
s->setValue("msvcVersion", m_versions.at(i)->msvcVersion()); s->setValue("msvcVersion", m_versions.at(i)->msvcVersion());
s->setValue("IsSystemVersion", m_versions.at(i)->isSystemVersion()); s->setValue("IsSystemVersion", m_versions.at(i)->isSystemVersion());
} }
@@ -202,8 +200,6 @@ void QtVersionManager::addNewVersionsFromInstaller()
QtVersion *version = new QtVersion(newVersionData[0], newVersionData[1], m_idcount++ ); QtVersion *version = new QtVersion(newVersionData[0], newVersionData[1], m_idcount++ );
if (newVersionData.count() >= 3) if (newVersionData.count() >= 3)
version->setMingwDirectory(newVersionData[2]); version->setMingwDirectory(newVersionData[2]);
if (newVersionData.count() >= 4)
version->setPrependPath(newVersionData[3]);
bool versionWasAlreadyInList = false; bool versionWasAlreadyInList = false;
foreach(const QtVersion * const it, m_versions) { foreach(const QtVersion * const it, m_versions) {
@@ -871,16 +867,6 @@ void QtVersion::setMingwDirectory(const QString &directory)
m_mingwDirectory = directory; m_mingwDirectory = directory;
} }
QString QtVersion::prependPath() const
{
return m_prependPath;
}
void QtVersion::setPrependPath(const QString &directory)
{
m_prependPath = directory;
}
QString QtVersion::msvcVersion() const QString QtVersion::msvcVersion() const
{ {
return m_msvcVersion; return m_msvcVersion;

4
src/plugins/projectexplorer/qtversionmanager.h
View File

@@ -71,12 +71,11 @@ public:
QString mingwDirectory() const; QString mingwDirectory() const;
void setMingwDirectory(const QString &directory); void setMingwDirectory(const QString &directory);
QString prependPath() const;
void setPrependPath(const QString &string);
QString msvcVersion() const; QString msvcVersion() const;
QString wincePlatform() const; QString wincePlatform() const;
void setMsvcVersion(const QString &version); void setMsvcVersion(const QString &version);
void addToEnvironment(ProjectExplorer::Environment &env); void addToEnvironment(ProjectExplorer::Environment &env);
bool hasDebuggingHelper() const; bool hasDebuggingHelper() const;
// Builds a debugging library // Builds a debugging library
// returns the output of the commands // returns the output of the commands
@@ -95,6 +94,7 @@ public:
QString dumperLibrary() const; QString dumperLibrary() const;
private: private:
static int getUniqueId(); static int getUniqueId();
// Also used by QtOptionsPageWidget
void setName(const QString &name); void setName(const QString &name);
void setPath(const QString &path); void setPath(const QString &path);
void updateSourcePath(); void updateSourcePath();