From 50a685f8d86f3282f0f47a26210e41204f23755e Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Wed, 22 Apr 2015 12:15:41 +0200
Subject: [PATCH] CPlusPlus: Inline SymbolVisitor functions

Change-Id: I46221428f2c883103839e57c8fc433f05302addd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
 src/libs/3rdparty/cplusplus/SymbolVisitor.cpp | 34 -------------------
 src/libs/3rdparty/cplusplus/SymbolVisitor.h   |  8 ++---
 src/libs/3rdparty/cplusplus/cplusplus.pri     |  1 -
 src/libs/cplusplus/cplusplus.qbs              |  1 -
 4 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 src/libs/3rdparty/cplusplus/SymbolVisitor.cpp

diff --git a/src/libs/3rdparty/cplusplus/SymbolVisitor.cpp b/src/libs/3rdparty/cplusplus/SymbolVisitor.cpp
deleted file mode 100644
index de5c57a2f7c..00000000000
--- a/src/libs/3rdparty/cplusplus/SymbolVisitor.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "SymbolVisitor.h"
-#include "Symbol.h"
-
-using namespace CPlusPlus;
-
-SymbolVisitor::SymbolVisitor()
-{ }
-
-SymbolVisitor::~SymbolVisitor()
-{ }
-
-void SymbolVisitor::accept(Symbol *symbol)
-{ Symbol::visitSymbol(symbol, this); }
-
diff --git a/src/libs/3rdparty/cplusplus/SymbolVisitor.h b/src/libs/3rdparty/cplusplus/SymbolVisitor.h
index 5c96c3d8e58..4311672eca8 100644
--- a/src/libs/3rdparty/cplusplus/SymbolVisitor.h
+++ b/src/libs/3rdparty/cplusplus/SymbolVisitor.h
@@ -21,7 +21,7 @@
 #ifndef SYMBOLVISITOR_H
 #define SYMBOLVISITOR_H
 
-#include "CPlusPlusForwardDeclarations.h"
+#include "Symbol.h"
 
 
 namespace CPlusPlus {
@@ -32,10 +32,10 @@ class CPLUSPLUS_EXPORT SymbolVisitor
     void operator =(const SymbolVisitor &other);
 
 public:
-    SymbolVisitor();
-    virtual ~SymbolVisitor();
+    SymbolVisitor() { }
+    virtual ~SymbolVisitor() { }
 
-    void accept(Symbol *symbol);
+    void accept(Symbol *symbol) { Symbol::visitSymbol(symbol, this); }
 
     virtual bool preVisit(Symbol *) { return true; }
     virtual void postVisit(Symbol *) {}
diff --git a/src/libs/3rdparty/cplusplus/cplusplus.pri b/src/libs/3rdparty/cplusplus/cplusplus.pri
index 14f8ce3a04b..025519ef89c 100644
--- a/src/libs/3rdparty/cplusplus/cplusplus.pri
+++ b/src/libs/3rdparty/cplusplus/cplusplus.pri
@@ -61,7 +61,6 @@ SOURCES += \
     $$PWD/Bind.cpp \
     $$PWD/Symbol.cpp \
     $$PWD/Symbols.cpp \
-    $$PWD/SymbolVisitor.cpp \
     $$PWD/Token.cpp \
     $$PWD/TranslationUnit.cpp \
     $$PWD/Type.cpp \
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 37b1a7c980b..8ac08217eb4 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -69,7 +69,6 @@ QtcLibrary {
             "Scope.h",
             "Symbol.cpp",
             "Symbol.h",
-            "SymbolVisitor.cpp",
             "SymbolVisitor.h",
             "Symbols.cpp",
             "Symbols.h",