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

14
src/plugins/ios/iosdeploystep.cpp
View File

@@ -65,14 +65,14 @@ namespace Internal {
const Core::Id IosDeployStep::Id("Qt4ProjectManager.IosDeployStep");
IosDeployStep::IosDeployStep(ProjectExplorer::BuildStepList *parent)
IosDeployStep::IosDeployStep(BuildStepList *parent)
: BuildStep(parent, Id)
, m_expectFail(false)
{
ctor();
}
IosDeployStep::IosDeployStep(ProjectExplorer::BuildStepList *parent,
IosDeployStep::IosDeployStep(BuildStepList *parent,
IosDeployStep *other)
: BuildStep(parent, other)
, m_expectFail(false)
@@ -96,8 +96,8 @@ void IosDeployStep::ctor()
void IosDeployStep::updateDisplayNames()
{
ProjectExplorer::IDevice::ConstPtr dev =
ProjectExplorer::DeviceKitInformation::device(target()->kit());
IDevice::ConstPtr dev =
DeviceKitInformation::device(target()->kit());
const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName();
setDefaultDisplayName(tr("Deploy to %1").arg(devName));
setDisplayName(tr("Deploy to %1").arg(devName));
@@ -106,7 +106,7 @@ void IosDeployStep::updateDisplayNames()
bool IosDeployStep::init()
{
QTC_ASSERT(m_transferStatus == NoTransfer, return false);
m_device = ProjectExplorer::DeviceKitInformation::device(target()->kit());
m_device = DeviceKitInformation::device(target()->kit());
IosRunConfiguration * runConfig = qobject_cast<IosRunConfiguration *>(
this->target()->activeRunConfiguration());
QTC_ASSERT(runConfig, return false);
@@ -229,12 +229,12 @@ BuildStepConfigWidget *IosDeployStep::createConfigWidget()
bool IosDeployStep::fromMap(const QVariantMap &map)
{
return ProjectExplorer::BuildStep::fromMap(map);
return BuildStep::fromMap(map);
}
QVariantMap IosDeployStep::toMap() const
{
QVariantMap map = ProjectExplorer::BuildStep::toMap();
QVariantMap map = BuildStep::toMap();
return map;
}