diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-02-03 23:52:10 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-02-04 13:22:55 +0000 |
| commit | 620d1c36e5a811a269a482edca5eeaa89dbd1ada (patch) | |
| tree | 2bdc30381d2106f03bc3047f2f3cfe1ea1a7c413 /src/plugins/mercurial | |
| parent | 6bbee89653f442550ad2e20f25b4fb5b89b07e34 (diff) | |
VCS: 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: I061c7bdcade96961aed226a8348f8ab07ee95f5f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/mercurial')
| -rw-r--r-- | src/plugins/mercurial/commiteditor.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index ec722b4b31..ddaa647c73 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -71,7 +71,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra if (item.flags == QLatin1String("Untracked")) shouldTrack.append(item.file); else - fileModel->addFile(item.file, item.flags, VcsBase::Unchecked); + fileModel->addFile(item.file, item.flags, Unchecked); } VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repositoryRoot.absoluteFilePath(), @@ -80,7 +80,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra foreach (const QString &track, shouldTrack) { foreach (const VcsBaseClient::StatusItem &item, repoStatus) { if (item.file == track) - fileModel->addFile(item.file, item.flags, VcsBase::Unchecked); + fileModel->addFile(item.file, item.flags, Unchecked); } } diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 3902d14284..99e15a0f2a 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -252,7 +252,7 @@ QString MercurialClient::shortDescriptionSync(const QString &workingDirectory, QByteArray outputData; if (!vcsFullySynchronousExec(workingDirectory, args, &outputData)) return revision; - description = Utils::SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(outputData)); + description = SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(outputData)); if (description.endsWith(QLatin1Char('\n'))) description.truncate(description.size() - 1); return description; diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 8bbc6e4d7d..96f4566280 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -555,7 +555,7 @@ void MercurialPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &s } // Start new temp file - Utils::TempFileSaver saver; + TempFileSaver saver; // Keep the file alive, else it removes self and forgets its name saver.setAutoRemove(false); if (!saver.finalize()) { |