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

IOS: Remove unneeded qualifications

Browse Source 
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 <fawzi.mohamed@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:49:46 +02:00
committed by Orgad Shaneh
parent 4e09ec98c7
commit 2813643cfe
13 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/ios/iosrunconfiguration.cpp
View File

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