Code clean-up in corelib/language/.

- Remove unneeded #includes (particularly from header files).
- Make inline member function implementations less verbose.
- De-QObjectify the Loader class and remove unneeded members & heap
allocations.
- Minor stuff (const issues, unneeded namespace qualifications).

Change-Id: I55f2d7ed98b32faed7582bc6adfa04eb799de874
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/src/lib/corelib/language/evaluator.h b/src/lib/corelib/language/evaluator.h
index 9781f5956..6806ce65c 100644
--- a/src/lib/corelib/language/evaluator.h
+++ b/src/lib/corelib/language/evaluator.h
@@ -33,16 +33,16 @@
 
 #include "forward_decls.h"
 #include "itemobserver.h"
-#include <language/scriptengine.h>
 
 #include <QHash>
 #include <QScriptValue>
 
 namespace qbs {
 namespace Internal {
-class FileTags;
-
 class EvaluatorScriptClass;
+class FileTags;
+class Logger;
+class ScriptEngine;
 
 class Evaluator : private ItemObserver
 {
@@ -52,7 +52,7 @@ public:
     Evaluator(ScriptEngine *scriptEngine, const Logger &logger);
     virtual ~Evaluator();
 
-    ScriptEngine *engine() const;
+    ScriptEngine *engine() const { return m_scriptEngine; }
     QScriptValue property(const Item *item, const QString &name);
 
     QScriptValue value(const Item *item, const QString &name, bool *propertySet = 0);
@@ -82,11 +82,6 @@ private:
     mutable QHash<FileContextConstPtr, QScriptValue> m_fileScopeMap;
 };
 
-inline ScriptEngine *Evaluator::engine() const
-{
-    return m_scriptEngine;
-}
-
 } // namespace Internal
 } // namespace qbs