feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Remove Interpreter namespace.

Browse Source 
The distinction between QmlJS and QmlJS::Interpreter has always been
weak and the extra namespace just added an unnecessary complication.

Change-Id: I4db8ef4bd91b5f6bf610a9d23fdbf55bd60250fc
Reviewed-on: http://codereview.qt.nokia.com/2743
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-08 12:47:49 +02:00
parent ff092f79b3
commit 0e54183d4d
42 changed files with 308 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -51,8 +51,6 @@ namespace QmlJS {
class NameId;
class Document;
namespace Interpreter {
////////////////////////////////////////////////////////////////////////////////
// Forward declarations
////////////////////////////////////////////////////////////////////////////////
@@ -573,10 +571,10 @@ public:
static const QLatin1String cppPackage;
template <typename T>
QList<QmlObjectValue *> load(Interpreter::ValueOwner *interpreter, const T &objects);
QList<QmlObjectValue *> load(ValueOwner *interpreter, const T &objects);
QList<Interpreter::QmlObjectValue *> typesForImport(const QString &prefix, LanguageUtils::ComponentVersion version) const;
Interpreter::QmlObjectValue *typeByCppName(const QString &cppName) const;
QList<QmlObjectValue *> typesForImport(const QString &prefix, LanguageUtils::ComponentVersion version) const;
QmlObjectValue *typeByCppName(const QString &cppName) const;
bool hasPackage(const QString &package) const;
@@ -906,6 +904,6 @@ private:
JSImportScope *_jsImportScope;
};
} } // namespace QmlJS::Interpreter
} // namespace QmlJS
#endif // QMLJS_INTERPRETER_H