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

QmlJS: Store plugin metatypes in LibraryInfo. Rework type loading.

Browse Source
This commit is contained in:
Christian Kamm
2010-06-09 14:27:30 +02:00
parent 206c190e7f
commit e307bc2506
8 changed files with 204 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,40 +512,35 @@ private:
// typing environment
////////////////////////////////////////////////////////////////////////////////
class QMLJS_EXPORT CppQmlTypesLoader : public QObject
class QMLJS_EXPORT CppQmlTypesLoader
{
Q_OBJECT
public:
CppQmlTypesLoader();
static CppQmlTypesLoader *instance();
QHash<QString, FakeMetaObject *> objects;
/** \return an empty list when successful, error messages otherwise. */
QStringList load(const QFileInfoList &xmlFiles);
void loadPluginTypes(const QString &pluginPath);
private slots:
void processDone(int exitCode);
static QStringList load(const QFileInfoList &xmlFiles);
static QList<const FakeMetaObject *> objectsFromXml;
// parses the xml string and fills the newObjects map
static QString parseQmlTypeXml(const QByteArray &xml, QMap<QString, FakeMetaObject *> *newObjects);
private:
void addObjects(QMap<QString, FakeMetaObject *> &newObjects);
QString m_qmldumpPath;
static void setSuperClasses(QMap<QString, FakeMetaObject *> *newObjects);
};
class QMLJS_EXPORT CppQmlTypes
{
public:
void reload(Interpreter::Engine *interpreter);
void load(Interpreter::Engine *interpreter, const QList<const FakeMetaObject *> &objects);
QList<Interpreter::QmlObjectValue *> typesForImport(const QString &prefix, ComponentVersion version) const;
Interpreter::QmlObjectValue *typeForImport(const QString &qualifiedName) const;
bool hasPackage(const QString &package) const;
QHash<QString, QmlObjectValue *> types() const
{ return _typesByFullyQualifiedName; }
private:
QHash<QString, QList<QmlObjectValue *> > _importedTypes;
QHash<QString, QList<QmlObjectValue *> > _typesByPackage;
QHash<QString, QmlObjectValue *> _typesByFullyQualifiedName;
};
class ConvertToNumber: protected ValueVisitor // ECMAScript ToInt()
@@ -695,6 +690,8 @@ public:
QString typeId(const Value *value);
// typing:
CppQmlTypes &cppQmlTypes()
{ return _cppQmlTypes; }
const CppQmlTypes &cppQmlTypes() const
{ return _cppQmlTypes; }