summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2010-09-27 15:11:26 +0100
committerdt <qtc-committer@nokia.com>2010-09-27 15:56:37 +0100
commit99293bb20414e2b3bd1a9a110a002a54e7b472e3 (patch)
tree4ac651e84bcc716dbd44d7bf220c9483475254dd /src/plugins/qt4projectmanager
parentf5326043ddc41b38c84f392fbb19ff8feb06de7b (diff)
downloadqt-creator-99293bb20414e2b3bd1a9a110a002a54e7b472e3.tar.gz
RunConfigurations: Rename a few misnamed functions
Diffstat (limited to 'src/plugins/qt4projectmanager')
-rw-r--r--src/plugins/qt4projectmanager/qt4runconfiguration.cpp16
-rw-r--r--src/plugins/qt4projectmanager/qt4runconfiguration.h8
2 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index be286be1ab..2be6dcff72 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -379,7 +379,7 @@ void Qt4RunConfigurationWidget::workDirectoryEdited()
if (m_ignoreChange)
return;
m_ignoreChange = true;
- m_qt4RunConfiguration->setWorkingDirectory(m_workingDirectoryEdit->rawPath());
+ m_qt4RunConfiguration->setBaseWorkingDirectory(m_workingDirectoryEdit->rawPath());
m_ignoreChange = false;
}
@@ -387,13 +387,13 @@ void Qt4RunConfigurationWidget::workingDirectoryReseted()
{
// This emits a signal connected to workingDirectoryChanged()
// that sets the m_workingDirectoryEdit
- m_qt4RunConfiguration->setWorkingDirectory("");
+ m_qt4RunConfiguration->setBaseWorkingDirectory("");
}
void Qt4RunConfigurationWidget::argumentsEdited(const QString &args)
{
m_ignoreChange = true;
- m_qt4RunConfiguration->setArguments(args);
+ m_qt4RunConfiguration->setBaseCommandLineArguments(args);
m_ignoreChange = false;
}
@@ -610,23 +610,23 @@ void Qt4RunConfiguration::setUserEnvironmentChanges(const QList<Utils::Environme
}
}
-void Qt4RunConfiguration::setWorkingDirectory(const QString &wd)
+void Qt4RunConfiguration::setBaseWorkingDirectory(const QString &wd)
{
if (wd.isEmpty()) {
m_userSetWokingDirectory = false;
m_userWorkingDirectory.clear();
- emit workingDirectoryChanged(workingDirectory());
+ emit baseWorkingDirectoryChanged(workingDirectory());
} else {
m_userSetWokingDirectory = true;
m_userWorkingDirectory = wd;
- emit workingDirectoryChanged(m_userWorkingDirectory);
+ emit baseWorkingDirectoryChanged(m_userWorkingDirectory);
}
}
-void Qt4RunConfiguration::setArguments(const QString &argumentsString)
+void Qt4RunConfiguration::setBaseCommandLineArguments(const QString &argumentsString)
{
m_commandLineArguments = Utils::Environment::parseCombinedArgString(argumentsString);
- emit commandLineArgumentsChanged(argumentsString);
+ emit baseCommandLineArgumentsChanged(argumentsString);
}
void Qt4RunConfiguration::setRunMode(RunMode runMode)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 27580201b5..0e3850e318 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -97,8 +97,8 @@ public:
ProjectExplorer::OutputFormatter *createOutputFormatter() const;
signals:
- void commandLineArgumentsChanged(const QString&);
- void workingDirectoryChanged(const QString&);
+ void baseCommandLineArgumentsChanged(const QString&);
+ void baseWorkingDirectoryChanged(const QString&);
void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
void usingDyldImageSuffixChanged(bool);
void baseEnvironmentChanged();
@@ -116,9 +116,9 @@ protected:
private:
void setRunMode(RunMode runMode);
- void setWorkingDirectory(const QString &workingDirectory);
+ void setBaseWorkingDirectory(const QString &workingDirectory);
QString baseWorkingDirectory() const;
- void setArguments(const QString &argumentsString);
+ void setBaseCommandLineArguments(const QString &argumentsString);
QStringList baseCommandLineArguments() const;
enum BaseEnvironmentBase { CleanEnvironmentBase = 0,
SystemEnvironmentBase = 1,