From 65e7db42b85cfbc7e41d249ee757b45c84daae59 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 4 Feb 2015 17:01:07 +0200 Subject: 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 --- src/plugins/cpptools/cpprefactoringchanges.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp') diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index b9608c977f..2ea6e57493 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -40,9 +40,10 @@ #include using namespace CPlusPlus; -using namespace CppTools; -class CppTools::CppRefactoringChangesData : public TextEditor::RefactoringChangesData +namespace CppTools { + +class CppRefactoringChangesData : public TextEditor::RefactoringChangesData { public: CppRefactoringChangesData(const Snapshot &snapshot) @@ -262,3 +263,5 @@ void CppRefactoringFile::fileChanged() m_cppDocument.clear(); RefactoringFile::fileChanged(); } + +} // namespace CppTools -- cgit v1.2.1