diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-02-04 17:01:07 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-02-04 15:27:22 +0000 |
| commit | 65e7db42b85cfbc7e41d249ee757b45c84daae59 (patch) | |
| tree | b0c775fbf5537b23c2d5e69895d9b2ce269fa95c /src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp | |
| parent | f5225c0928c1591c1d996d973742097e74b18c55 (diff) | |
| download | qt-creator-65e7db42b85cfbc7e41d249ee757b45c84daae59.tar.gz | |
C++: 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: I6fbe13ddc1485efe95c3156097bf41d90c0febac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp index 3068f91db2..a324a583de 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp +++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp @@ -128,12 +128,12 @@ public: : m_params(params) {} - IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) Q_DECL_OVERRIDE + IAssistProposal *immediateProposal(const AssistInterface *) Q_DECL_OVERRIDE { QTC_ASSERT(m_params.function, return 0); AssistProposalItem *hintItem - = new VirtualFunctionProposalItem(TextEditor::TextEditorWidget::Link()); + = new VirtualFunctionProposalItem(TextEditorWidget::Link()); hintItem->setText(QCoreApplication::translate("VirtualFunctionsAssistProcessor", "...searching overrides")); hintItem->setOrder(-1000); @@ -180,8 +180,7 @@ private: AssistProposalItem *itemFromFunction(Function *func) const { - const TextEditor::TextEditorWidget::Link link - = CppTools::linkToSymbol(maybeDefinitionFor(func)); + const TextEditorWidget::Link link = CppTools::linkToSymbol(maybeDefinitionFor(func)); QString text = m_overview.prettyName(LookupContext::fullyQualifiedName(func)); if (func->isPureVirtual()) text += QLatin1String(" = 0"); @@ -196,7 +195,7 @@ private: VirtualFunctionAssistProvider::Parameters m_params; Overview m_overview; Icons m_icons; - mutable CppTools::SymbolFinder m_finder; + mutable SymbolFinder m_finder; }; VirtualFunctionAssistProvider::VirtualFunctionAssistProvider() |