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

QmlJS: Stop doing significant work in constructors.

Browse Source 
To avoid order-of-initialization problems.

Reviewed-by: Thomas Hartmann
This commit is contained in:
Christian Kamm
2011-05-06 13:31:30 +02:00
parent 6ea355add1
commit d05992d0fa
14 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/libs/qmljs/qmljslink.cpp
View File

@@ -110,8 +110,7 @@ public:
\l{Context} with \l{Link}.
*/
Link::Link(Context *context, const Snapshot &snapshot, const QStringList &importPaths,
QHash<QString, QList<DiagnosticMessage> > *messages)
Link::Link(Context *context, const Snapshot &snapshot, const QStringList &importPaths)
: d_ptr(new LinkPrivate)
{
Q_D(Link);
@@ -120,30 +119,6 @@ Link::Link(Context *context, const Snapshot &snapshot, const QStringList &import
d->importPaths = importPaths;
d->diagnosticMessages = 0;
d->allDiagnosticMessages = messages;
// populate engine with types from C++
ModelManagerInterface *modelManager = ModelManagerInterface::instance();
if (modelManager) {
foreach (const QList<FakeMetaObject::ConstPtr> &cppTypes, modelManager->cppQmlTypes()) {
engine()->cppQmlTypes().load(engine(), cppTypes);
}
}
linkImports();
}
Link::Link(Context *context, const Snapshot &snapshot, const QStringList &importPaths,
const Document::Ptr &doc, QList<DiagnosticMessage> *messages)
: d_ptr(new LinkPrivate)
{
Q_D(Link);
d->context = context;
d->snapshot = snapshot;
d->importPaths = importPaths;
d->doc = doc;
d->diagnosticMessages = messages;
d->allDiagnosticMessages = 0;
// populate engine with types from C++
@@ -153,7 +128,20 @@ Link::Link(Context *context, const Snapshot &snapshot, const QStringList &import
engine()->cppQmlTypes().load(engine(), cppTypes);
}
}
}
void Link::operator()(QHash<QString, QList<DiagnosticMessage> > *messages)
{
Q_D(Link);
d->allDiagnosticMessages = messages;
linkImports();
}
void Link::operator()(const Document::Ptr &doc, QList<DiagnosticMessage> *messages)
{
Q_D(Link);
d->doc = doc;
d->diagnosticMessages = messages;
linkImports();
}