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

QmlDesigner: 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: I492792bb9e5655c55795e938031efc557c9a462f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:48:57 +02:00
committed by Orgad Shaneh
parent 42af154c77
commit b6de2d1bd8
55 changed files with 319 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
View File

@@ -81,11 +81,11 @@ QmlApplicationWizard::QmlApplicationWizard()
QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
setDisplayName(tr("Qt Quick UI"));
setDescription(tr("Creates a Qt Quick UI project."));
setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT)
| Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK));
setRequiredFeatures(Feature(QtSupport::Constants::FEATURE_QMLPROJECT)
| Feature(QtSupport::Constants::FEATURE_QT_QUICK));
}
Core::BaseFileWizard *QmlApplicationWizard::create(QWidget *parent, const WizardDialogParameters &parameters) const
BaseFileWizard *QmlApplicationWizard::create(QWidget *parent, const WizardDialogParameters &parameters) const
{
QmlApplicationWizardDialog *wizardDialog = new QmlApplicationWizardDialog(parent, parameters);
@@ -113,7 +113,7 @@ GeneratedFiles QmlApplicationWizard::generateFiles(const QWizard *w,
bool QmlApplicationWizard::postGenerateFiles(const QWizard * /*wizard*/, const GeneratedFiles &l,
QString *errorMessage)
{
return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage);
return CustomProjectWizard::postGenerateOpen(l, errorMessage);
}
} // namespace Internal

18
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -89,18 +89,18 @@ QmlProject::~QmlProject()
delete m_rootNode;
}
void QmlProject::addedTarget(ProjectExplorer::Target *target)
void QmlProject::addedTarget(Target *target)
{
connect(target, SIGNAL(addedRunConfiguration(ProjectExplorer::RunConfiguration*)),
this, SLOT(addedRunConfiguration(ProjectExplorer::RunConfiguration*)));
foreach (ProjectExplorer::RunConfiguration *rc, target->runConfigurations())
foreach (RunConfiguration *rc, target->runConfigurations())
addedRunConfiguration(rc);
}
void QmlProject::onActiveTargetChanged(ProjectExplorer::Target *target)
void QmlProject::onActiveTargetChanged(Target *target)
{
if (m_activeTarget)
disconnect(m_activeTarget, &ProjectExplorer::Target::kitChanged, this, &QmlProject::onKitChanged);
disconnect(m_activeTarget, &Target::kitChanged, this, &QmlProject::onKitChanged);
m_activeTarget = target;
if (m_activeTarget)
connect(target, SIGNAL(kitChanged()), this, SLOT(onKitChanged()));
@@ -115,7 +115,7 @@ void QmlProject::onKitChanged()
refresh(Configuration);
}
void QmlProject::addedRunConfiguration(ProjectExplorer::RunConfiguration *rc)
void QmlProject::addedRunConfiguration(RunConfiguration *rc)
{
// The enabled state of qml runconfigurations can only be decided after
// they have been added to a project
@@ -297,14 +297,14 @@ IDocument *QmlProject::document() const
return m_file;
}
ProjectExplorer::IProjectManager *QmlProject::projectManager() const
IProjectManager *QmlProject::projectManager() const
{
return m_manager;
}
bool QmlProject::supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) const
bool QmlProject::supportsKit(Kit *k, QString *errorMessage) const
{
Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k);
Id deviceType = DeviceTypeKitInformation::deviceTypeId(k);
if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
if (errorMessage)
*errorMessage = tr("Device type is not desktop.");
@@ -333,7 +333,7 @@ bool QmlProject::supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) con
return true;
}
ProjectExplorer::ProjectNode *QmlProject::rootProjectNode() const
ProjectNode *QmlProject::rootProjectNode() const
{
return m_rootNode;
}