Misc: 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: I919da493d0629b719d328e5e71c96a29d230dfd1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/libs/glsl/glslengine.cpp b/src/libs/glsl/glslengine.cpp
index cefc453e30..f5bcfcc447 100644
--- a/src/libs/glsl/glslengine.cpp
+++ b/src/libs/glsl/glslengine.cpp
@@ -231,7 +231,7 @@ bool DiagnosticMessage::isError() const
     return _kind == Error;
 }
 
-bool GLSL::DiagnosticMessage::isWarning() const
+bool DiagnosticMessage::isWarning() const
 {
     return _kind == Warning;
 }
diff --git a/src/libs/glsl/glslsemantic.cpp b/src/libs/glsl/glslsemantic.cpp
index 9d7989cc00..ccfb788c2c 100644
--- a/src/libs/glsl/glslsemantic.cpp
+++ b/src/libs/glsl/glslsemantic.cpp
@@ -378,8 +378,8 @@ bool Semantic::visit(FunctionCallExpressionAST *ast)
                 _engine->error(ast->lineno, QString::fromLatin1("too many arguments"));
             _expr.type = funTy->returnType();
         } else if (const OverloadSet *overloads = id.type->asOverloadSetType()) {
-            QVector<GLSL::Function *> candidates;
-            foreach (GLSL::Function *f, overloads->functions()) {
+            QVector<Function *> candidates;
+            foreach (Function *f, overloads->functions()) {
                 if (f->argumentCount() == actuals.size()) {
                     int argc = 0;
                     for (; argc < actuals.size(); ++argc) {