QQmlEngine: some more cleanup

Remove dead code, initialize members inline, write "emit" when emitting
signals.

Change-Id: If7ba5a9235abb9b605194db727847a7e035e5529
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 2 insertions, 22 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 7c2c3648df..22b5ef8df3 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -240,26 +240,6 @@ QQmlImageProviderBase::~QQmlImageProviderBase()
 {
 }
 
-
-QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e)
-: propertyCapture(nullptr), rootContext(nullptr),
-#if QT_CONFIG(qml_debug)
-  profiler(nullptr),
-#endif
-  outputWarningsToMsgLog(true),
-  erroredBindings(nullptr), inProgressCreations(0),
-#if QT_CONFIG(qml_worker_script)
-  workerScriptEngine(nullptr),
-#endif
-  activeObjectCreator(nullptr),
-#if QT_CONFIG(qml_network)
-  networkAccessManager(nullptr), networkAccessManagerFactory(nullptr),
-#endif
-  scarceResourcesRefCount(0), importDatabase(e), typeLoader(e),
-  uniqueId(1), incubatorCount(0), incubationController(nullptr)
-{
-}
-
 QQmlEnginePrivate::~QQmlEnginePrivate()
 {
     if (inProgressCreations)
@@ -1445,7 +1425,7 @@ static void dumpwarning(const QList<QQmlError> &errors)
 void QQmlEnginePrivate::warning(const QQmlError &error)
 {
     Q_Q(QQmlEngine);
-    q->warnings(QList<QQmlError>() << error);
+    emit q->warnings(QList<QQmlError>({error}));
     if (outputWarningsToMsgLog)
         dumpwarning(error);
 }
@@ -1453,7 +1433,7 @@ void QQmlEnginePrivate::warning(const QQmlError &error)
 void QQmlEnginePrivate::warning(const QList<QQmlError> &errors)
 {
     Q_Q(QQmlEngine);
-    q->warnings(errors);
+    emit q->warnings(errors);
     if (outputWarningsToMsgLog)
         dumpwarning(errors);
 }