diff options
-rw-r--r-- | src/qmlcompiler/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/qmlcompiler/qmlcompiler.pro | 4 | ||||
-rw-r--r-- | src/qmlcompiler/qqmljsstreamwriter.cpp (renamed from src/qmlcompiler/qmlstreamwriter.cpp) | 30 | ||||
-rw-r--r-- | src/qmlcompiler/qqmljsstreamwriter_p.h (renamed from src/qmlcompiler/qmlstreamwriter_p.h) | 10 | ||||
-rw-r--r-- | src/qmltyperegistrar/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/qmltyperegistrar/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/qmltyperegistrar/qmltyperegistrar.pro | 4 | ||||
-rw-r--r-- | src/qmltyperegistrar/qmltypescreator.h | 4 | ||||
-rw-r--r-- | tools/qmlplugindump/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | tools/qmlplugindump/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tools/qmlplugindump/main.cpp | 8 | ||||
-rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 4 |
12 files changed, 37 insertions, 37 deletions
diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt index e08189857d..9ff876595c 100644 --- a/src/qmlcompiler/CMakeLists.txt +++ b/src/qmlcompiler/CMakeLists.txt @@ -10,11 +10,11 @@ qt_add_module(QmlCompiler SOURCES qmljsimporter.cpp qmljsimporter_p.h qmljstypereader.cpp qmljstypereader_p.h - qmlstreamwriter.cpp qmlstreamwriter_p.h qqmljsimportedmembersvisitor.cpp qqmljsimportedmembersvisitor_p.h qqmljsmetatypes_p.h qqmljsresourcefilemapper.cpp qqmljsresourcefilemapper_p.h qqmljsscope.cpp qqmljsscope_p.h + qqmljsstreamwriter.cpp qqmljsstreamwriter_p.h typedescriptionreader.cpp typedescriptionreader_p.h PUBLIC_LIBRARIES Qt::CorePrivate diff --git a/src/qmlcompiler/qmlcompiler.pro b/src/qmlcompiler/qmlcompiler.pro index 1649855458..05fd39c98b 100644 --- a/src/qmlcompiler/qmlcompiler.pro +++ b/src/qmlcompiler/qmlcompiler.pro @@ -10,7 +10,7 @@ SOURCES = \ qmljstypereader.cpp \ qqmljsscope.cpp \ typedescriptionreader.cpp \ - qmlstreamwriter.cpp + qqmljsstreamwriter.cpp HEADERS = \ qqmljsresourcefilemapper_p.h \ @@ -20,6 +20,6 @@ HEADERS = \ qqmljsmetatypes_p.h \ qqmljsscope_p.h \ typedescriptionreader_p.h \ - qmlstreamwriter_p.h + qqmljsstreamwriter_p.h load(qt_module) diff --git a/src/qmlcompiler/qmlstreamwriter.cpp b/src/qmlcompiler/qqmljsstreamwriter.cpp index b5b9ee0d4a..eb11eaa2ae 100644 --- a/src/qmlcompiler/qmlstreamwriter.cpp +++ b/src/qmlcompiler/qqmljsstreamwriter.cpp @@ -26,12 +26,12 @@ ** ****************************************************************************/ -#include "qmlstreamwriter_p.h" +#include "qqmljsstreamwriter_p.h" #include <QtCore/QBuffer> #include <QtCore/QStringList> -QmlStreamWriter::QmlStreamWriter(QByteArray *array) +QQmlJSStreamWriter::QQmlJSStreamWriter(QByteArray *array) : m_indentDepth(0) , m_pendingLineLength(0) , m_maybeOneline(false) @@ -40,15 +40,15 @@ QmlStreamWriter::QmlStreamWriter(QByteArray *array) m_stream->open(QIODevice::WriteOnly); } -void QmlStreamWriter::writeStartDocument() +void QQmlJSStreamWriter::writeStartDocument() { } -void QmlStreamWriter::writeEndDocument() +void QQmlJSStreamWriter::writeEndDocument() { } -void QmlStreamWriter::writeLibraryImport(const QString &uri, int majorVersion, int minorVersion, const QString &as) +void QQmlJSStreamWriter::writeLibraryImport(const QString &uri, int majorVersion, int minorVersion, const QString &as) { m_stream->write(QString::fromLatin1("import %1 %2.%3").arg(uri, QString::number(majorVersion), QString::number(minorVersion)).toUtf8()); if (!as.isEmpty()) @@ -56,7 +56,7 @@ void QmlStreamWriter::writeLibraryImport(const QString &uri, int majorVersion, i m_stream->write("\n"); } -void QmlStreamWriter::writeStartObject(const QString &component) +void QQmlJSStreamWriter::writeStartObject(const QString &component) { flushPotentialLinesWithNewlines(); writeIndent(); @@ -65,7 +65,7 @@ void QmlStreamWriter::writeStartObject(const QString &component) m_maybeOneline = true; } -void QmlStreamWriter::writeEndObject() +void QQmlJSStreamWriter::writeEndObject() { if (m_maybeOneline && !m_pendingLines.isEmpty()) { --m_indentDepth; @@ -87,17 +87,17 @@ void QmlStreamWriter::writeEndObject() } } -void QmlStreamWriter::writeScriptBinding(const QString &name, const QString &rhs) +void QQmlJSStreamWriter::writeScriptBinding(const QString &name, const QString &rhs) { writePotentialLine(QString::fromLatin1("%1: %2").arg(name, rhs).toUtf8()); } -void QmlStreamWriter::writeBooleanBinding(const QString &name, bool value) +void QQmlJSStreamWriter::writeBooleanBinding(const QString &name, bool value) { writeScriptBinding(name, value ? QLatin1String("true") : QLatin1String("false")); } -void QmlStreamWriter::writeArrayBinding(const QString &name, const QStringList &elements) +void QQmlJSStreamWriter::writeArrayBinding(const QString &name, const QStringList &elements) { flushPotentialLinesWithNewlines(); writeIndent(); @@ -133,13 +133,13 @@ void QmlStreamWriter::writeArrayBinding(const QString &name, const QStringList & m_stream->write("]\n"); } -void QmlStreamWriter::write(const QString &data) +void QQmlJSStreamWriter::write(const QString &data) { flushPotentialLinesWithNewlines(); m_stream->write(data.toUtf8()); } -void QmlStreamWriter::writeScriptObjectLiteralBinding(const QString &name, const QList<QPair<QString, QString> > &keyValue) +void QQmlJSStreamWriter::writeScriptObjectLiteralBinding(const QString &name, const QList<QPair<QString, QString> > &keyValue) { flushPotentialLinesWithNewlines(); writeIndent(); @@ -161,12 +161,12 @@ void QmlStreamWriter::writeScriptObjectLiteralBinding(const QString &name, const m_stream->write("}\n"); } -void QmlStreamWriter::writeIndent() +void QQmlJSStreamWriter::writeIndent() { m_stream->write(QByteArray(m_indentDepth * 4, ' ')); } -void QmlStreamWriter::writePotentialLine(const QByteArray &line) +void QQmlJSStreamWriter::writePotentialLine(const QByteArray &line) { m_pendingLines.append(line); m_pendingLineLength += line.size(); @@ -175,7 +175,7 @@ void QmlStreamWriter::writePotentialLine(const QByteArray &line) } } -void QmlStreamWriter::flushPotentialLinesWithNewlines() +void QQmlJSStreamWriter::flushPotentialLinesWithNewlines() { if (m_maybeOneline) m_stream->write("\n"); diff --git a/src/qmlcompiler/qmlstreamwriter_p.h b/src/qmlcompiler/qqmljsstreamwriter_p.h index 260923feed..b6a71775f0 100644 --- a/src/qmlcompiler/qmlstreamwriter_p.h +++ b/src/qmlcompiler/qqmljsstreamwriter_p.h @@ -26,8 +26,8 @@ ** ****************************************************************************/ -#ifndef QMLSTREAMWRITER_H -#define QMLSTREAMWRITER_H +#ifndef QQMLJSSTREAMWRITER_P_H +#define QQMLJSSTREAMWRITER_P_H // // W A R N I N G @@ -45,10 +45,10 @@ #include <QtCore/QScopedPointer> #include <QtCore/QPair> -class QmlStreamWriter +class QQmlJSStreamWriter { public: - QmlStreamWriter(QByteArray *array); + QQmlJSStreamWriter(QByteArray *array); void writeStartDocument(); void writeEndDocument(); @@ -74,4 +74,4 @@ private: QScopedPointer<QIODevice> m_stream; }; -#endif // QMLSTREAMWRITER_H +#endif // QQMLJSSTREAMWRITER_P_H diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt index 7c2bfe5de7..5d77e64c67 100644 --- a/src/qmltyperegistrar/.prev_CMakeLists.txt +++ b/src/qmltyperegistrar/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ qt_get_tool_target_name(target_name qmltyperegistrar) qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" SOURCES - ../qmlcompiler/qmlstreamwriter.cpp ../qmlcompiler/qmlstreamwriter_p.h + ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h qmltyperegistrar.cpp qmltypesclassdescription.cpp qmltypesclassdescription.h qmltypescreator.cpp qmltypescreator.h diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt index 5f6568ac37..1269461c3a 100644 --- a/src/qmltyperegistrar/CMakeLists.txt +++ b/src/qmltyperegistrar/CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" TOOLS_TARGET Qml # special case SOURCES - ../qmlcompiler/qmlstreamwriter.cpp ../qmlcompiler/qmlstreamwriter_p.h + ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h qmltyperegistrar.cpp qmltypesclassdescription.cpp qmltypesclassdescription.h qmltypescreator.cpp qmltypescreator.h diff --git a/src/qmltyperegistrar/qmltyperegistrar.pro b/src/qmltyperegistrar/qmltyperegistrar.pro index eafaab6559..eaee9b6eb4 100644 --- a/src/qmltyperegistrar/qmltyperegistrar.pro +++ b/src/qmltyperegistrar/qmltyperegistrar.pro @@ -11,13 +11,13 @@ QMAKE_TARGET_DESCRIPTION = QML Types Registrar INCLUDEPATH += $$PWD/../qmlcompiler SOURCES += \ - ../qmlcompiler/qmlstreamwriter.cpp \ + ../qmlcompiler/qqmljsstreamwriter.cpp \ qmltyperegistrar.cpp \ qmltypesclassdescription.cpp \ qmltypescreator.cpp HEADERS += \ - ../qmlcompiler/qmlstreamwriter_p.h \ + ../qmlcompiler/qqmljsstreamwriter_p.h \ qmltypesclassdescription.h \ qmltypescreator.h diff --git a/src/qmltyperegistrar/qmltypescreator.h b/src/qmltyperegistrar/qmltypescreator.h index 9fc62f9a9e..2216a8a967 100644 --- a/src/qmltyperegistrar/qmltypescreator.h +++ b/src/qmltyperegistrar/qmltypescreator.h @@ -30,7 +30,7 @@ #define QMLTYPESCREATOR_H #include "qmltypesclassdescription.h" -#include "qmlstreamwriter_p.h" +#include "qqmljsstreamwriter_p.h" #include <QtCore/qstring.h> #include <QtCore/qset.h> @@ -58,7 +58,7 @@ private: void writeComponents(); QByteArray m_output; - QmlStreamWriter m_qml; + QQmlJSStreamWriter m_qml; QVector<QJsonObject> m_ownTypes; QVector<QJsonObject> m_foreignTypes; QString m_module; diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt index bf65d71c49..997f0ca446 100644 --- a/tools/qmlplugindump/.prev_CMakeLists.txt +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ qt_get_tool_target_name(target_name qmlplugindump) qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" SOURCES - ../../src/qmlcompiler/qmlstreamwriter.cpp ../../src/qmlcompiler/qmlstreamwriter_p.h + ../../src/qmlcompiler/qqmljsstreamwriter.cpp ../../src/qmlcompiler/qqmljsstreamwriter_p.h main.cpp qmltypereader.cpp qmltypereader.h INCLUDE_DIRECTORIES diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt index d8fdaeee8c..111f7dda24 100644 --- a/tools/qmlplugindump/CMakeLists.txt +++ b/tools/qmlplugindump/CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" TOOLS_TARGET Qml # special case SOURCES - ../../src/qmlcompiler/qmlstreamwriter.cpp ../../src/qmlcompiler/qmlstreamwriter_p.h + ../../src/qmlcompiler/qqmljsstreamwriter.cpp ../../src/qmlcompiler/qqmljsstreamwriter_p.h main.cpp qmltypereader.cpp qmltypereader.h INCLUDE_DIRECTORIES diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index bfc78f2974..aa78a9c6bc 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -60,7 +60,7 @@ #include <algorithm> #include "qmltypereader.h" -#include "qmlstreamwriter_p.h" +#include "qqmljsstreamwriter_p.h" #ifdef QT_SIMULATOR #include <QtGui/private/qsimulatorconnection_p.h> @@ -360,11 +360,11 @@ public: class Dumper { - QmlStreamWriter *qml; + QQmlJSStreamWriter *qml; QString relocatableModuleUri; public: - Dumper(QmlStreamWriter *qml) : qml(qml) {} + Dumper(QQmlJSStreamWriter *qml) : qml(qml) {} void setRelocatableModuleUri(const QString &uri) { @@ -1346,7 +1346,7 @@ int main(int argc, char *argv[]) // start dumping data QByteArray bytes; - QmlStreamWriter qml(&bytes); + QQmlJSStreamWriter qml(&bytes); qml.writeStartDocument(); qml.writeLibraryImport(QLatin1String("QtQuick.tooling"), 1, 2); diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 217fe23bbe..2e6e793157 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -11,12 +11,12 @@ QTPLUGIN.platforms = qminimal INCLUDEPATH += $$PWD/../../src/qmlcompiler SOURCES += \ - ../../src/qmlcompiler/qmlstreamwriter.cpp \ + ../../src/qmlcompiler/qqmljsstreamwriter.cpp \ main.cpp \ qmltypereader.cpp HEADERS += \ - ../../src/qmlcompiler/qmlstreamwriter_p.h \ + ../../src/qmlcompiler/qqmljsstreamwriter_p.h \ qmltypereader.h macx { |