diff options
| author | Orgad Shaneh <[email protected]> | 2015-02-03 23:49:46 +0200 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2015-02-05 16:40:42 +0000 |
| commit | 2813643cfe45aa679045738e11be3aa05b508793 (patch) | |
| tree | c2abe7e03593f1edc786958bfc2e28cb7ff44991 /src/plugins/ios/iosrunconfiguration.cpp | |
| parent | 4e09ec98c7d0d757693717a276ec324d76c8daf1 (diff) | |
IOS: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
next if file =~ %r{src/shared/qbs|/qmljs/}
s = File.read(file)
s.scan(/^using namespace (.*);$/) {
ns = $1
t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
before = $1
char = $2
if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
m
else
before + char
end
}
if t != s
puts file
File.open(file, 'w').write(t)
end
}
}
Change-Id: I8ef73f4861069dcd7edf5e73b397d60609d4b476
Reviewed-by: Fawzi Mohamed <[email protected]>
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/ios/iosrunconfiguration.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 25d8a401673..5bbc61d9c5b 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -132,7 +132,7 @@ void IosRunConfiguration::deviceChanges() { enabledCheck(); } -void IosRunConfiguration::proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, +void IosRunConfiguration::proFileUpdated(QmakeProFileNode *pro, bool success, bool parseInProgress) { if (m_profilePath != pro->path()) @@ -151,7 +151,7 @@ QWidget *IosRunConfiguration::createConfigurationWidget() return new IosRunConfigurationWidget(this); } -Utils::OutputFormatter *IosRunConfiguration::createOutputFormatter() const +OutputFormatter *IosRunConfiguration::createOutputFormatter() const { return new QtSupport::QtOutputFormatter(target()->project()); } @@ -211,9 +211,9 @@ QString IosRunConfiguration::applicationName() const return QString(); } -Utils::FileName IosRunConfiguration::bundleDirectory() const +FileName IosRunConfiguration::bundleDirectory() const { - Utils::FileName res; + FileName res; Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target()->kit()); bool isDevice = (devType == Constants::IOS_DEVICE_TYPE); if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) { @@ -259,7 +259,7 @@ Utils::FileName IosRunConfiguration::bundleDirectory() const return res; } -Utils::FileName IosRunConfiguration::localExecutable() const +FileName IosRunConfiguration::localExecutable() const { return bundleDirectory().appendPath(applicationName()); } @@ -405,7 +405,7 @@ IosRunConfigurationWidget::~IosRunConfigurationWidget() QString IosRunConfigurationWidget::argListToString(const QStringList &args) const { - return Utils::QtcProcess::joinArgs(args); + return QtcProcess::joinArgs(args); } QStringList IosRunConfigurationWidget::stringToArgList(const QString &args) const |