qmlplugindump: adding writeBooleanBinding to write booleans

Change-Id: I13077ad0d6522d91af0dab7d7bc30346b188ee4b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

3 files changed, 11 insertions, 17 deletions

diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index e53d8c2800..165f0a8d5f 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -429,11 +429,11 @@ public:
         qml->writeArrayBinding(QLatin1String("exports"), QStringList() << exportString);
         qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), QStringList() << QString::number(compositeType->minorVersion()));
 
-        if (compositeType->isCreatable())
-            qml->writeIsCreatable(false);
+        if (!compositeType->isCreatable())
+            qml->writeBooleanBinding(QLatin1String("isCreatable"), false);
 
         if (compositeType->isSingleton())
-            qml->writeIsSingleton(true);
+            qml->writeBooleanBinding(QLatin1String("isSingleton"), true);
 
         for (int index = mainMeta->classInfoCount() - 1 ; index >= 0 ; --index) {
             QMetaClassInfo classInfo = mainMeta->classInfo(index);
@@ -499,10 +499,10 @@ public:
             qml->writeArrayBinding(QLatin1String("exports"), exportStrings);
 
             if (isUncreatable)
-                qml->writeIsCreatable(false);
+                qml->writeBooleanBinding(QLatin1String("isCreatable"), false);
 
             if (isSingleton)
-                qml->writeIsSingleton(true);
+                qml->writeBooleanBinding(QLatin1String("isSingleton"), true);
 
             // write meta object revisions
             QStringList metaObjectRevisions;
diff --git a/tools/qmlplugindump/qmlstreamwriter.cpp b/tools/qmlplugindump/qmlstreamwriter.cpp
index 44bdcfea74..6fa7e10978 100644
--- a/tools/qmlplugindump/qmlstreamwriter.cpp
+++ b/tools/qmlplugindump/qmlstreamwriter.cpp
@@ -105,6 +105,11 @@ void QmlStreamWriter::writeScriptBinding(const QString &name, const QString &rhs
     writePotentialLine(QString("%1: %2").arg(name, rhs).toUtf8());
 }
 
+void QmlStreamWriter::writeBooleanBinding(const QString &name, bool value)
+{
+    writeScriptBinding(name, value ? QLatin1String("true") : QLatin1String("false"));
+}
+
 void QmlStreamWriter::writeArrayBinding(const QString &name, const QStringList &elements)
 {
     flushPotentialLinesWithNewlines();
@@ -183,16 +188,6 @@ void QmlStreamWriter::writePotentialLine(const QByteArray &line)
     }
 }
 
-void QmlStreamWriter::writeIsCreatable(bool isCreatable) {
-  writeIndent();
-  m_stream->write(QString("isCreatable: %1\n").arg(isCreatable ? "true" : "false").toUtf8());
-}
-
-void QmlStreamWriter::writeIsSingleton(bool isSingleton) {
-  writeIndent();
-  m_stream->write(QString("isSingleton: %1\n").arg(isSingleton ? "true" : "false").toUtf8());
-}
-
 void QmlStreamWriter::flushPotentialLinesWithNewlines()
 {
     if (m_maybeOneline)
diff --git a/tools/qmlplugindump/qmlstreamwriter.h b/tools/qmlplugindump/qmlstreamwriter.h
index ee5740a48b..456175b606 100644
--- a/tools/qmlplugindump/qmlstreamwriter.h
+++ b/tools/qmlplugindump/qmlstreamwriter.h
@@ -63,8 +63,7 @@ public:
     void writeScriptObjectLiteralBinding(const QString &name, const QList<QPair<QString, QString> > &keyValue);
     void writeArrayBinding(const QString &name, const QStringList &elements);
     void write(const QString &data);
-    void writeIsCreatable(bool isCreatable);
-    void writeIsSingleton(bool isSingleton);
+    void writeBooleanBinding(const QString &name, bool value);
 
 private:
     void writeIndent();