diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-12-12 18:32:19 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-26 20:59:50 +0000 |
commit | a6b697ca13945a174cff9f3e9b1af1cf61c0bea5 (patch) | |
tree | 78d5fad97ff8e89f079df29cc5a75b4e7197bfc7 /src | |
parent | 657894624521b580f59ff5f58b9c0e9be159dc1c (diff) |
Create corelib/serialization and move existing file formats into it
This is in preparation to adding CBOR support. We don't need yet another
dir for CBOR and placing it in src/corelib/json is just wrong.
Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/corelib.pro | 3 | ||||
-rw-r--r-- | src/corelib/io/io.pri | 6 | ||||
-rw-r--r-- | src/corelib/json/json.pri | 17 | ||||
-rw-r--r-- | src/corelib/serialization/.gitignore (renamed from src/corelib/xml/.gitignore) | 0 | ||||
-rwxr-xr-x | src/corelib/serialization/make-xml-parser.sh (renamed from src/corelib/xml/make-parser.sh) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qdatastream.cpp (renamed from src/corelib/io/qdatastream.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qdatastream.h (renamed from src/corelib/io/qdatastream.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qdatastream_p.h (renamed from src/corelib/io/qdatastream_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjson.cpp (renamed from src/corelib/json/qjson.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjson_p.h (renamed from src/corelib/json/qjson_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonarray.cpp (renamed from src/corelib/json/qjsonarray.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonarray.h (renamed from src/corelib/json/qjsonarray.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsondocument.cpp (renamed from src/corelib/json/qjsondocument.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsondocument.h (renamed from src/corelib/json/qjsondocument.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonobject.cpp (renamed from src/corelib/json/qjsonobject.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonobject.h (renamed from src/corelib/json/qjsonobject.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonparser.cpp (renamed from src/corelib/json/qjsonparser.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonparser_p.h (renamed from src/corelib/json/qjsonparser_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonvalue.cpp (renamed from src/corelib/json/qjsonvalue.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonvalue.h (renamed from src/corelib/json/qjsonvalue.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonwriter.cpp (renamed from src/corelib/json/qjsonwriter.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonwriter_p.h (renamed from src/corelib/json/qjsonwriter_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qtextstream.cpp (renamed from src/corelib/io/qtextstream.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qtextstream.h (renamed from src/corelib/io/qtextstream.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qtextstream_p.h (renamed from src/corelib/io/qtextstream_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlstream.cpp (renamed from src/corelib/xml/qxmlstream.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlstream.g (renamed from src/corelib/xml/qxmlstream.g) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlstream.h (renamed from src/corelib/xml/qxmlstream.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlstream_p.h (renamed from src/corelib/xml/qxmlstream_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlutils.cpp (renamed from src/corelib/xml/qxmlutils.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlutils_p.h (renamed from src/corelib/xml/qxmlutils_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/serialization/serialization.pri | 30 | ||||
-rw-r--r-- | src/corelib/xml/xml.pri | 10 | ||||
-rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 22 |
34 files changed, 42 insertions, 46 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 6dc4af1bfe..4cce7c0df3 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -35,13 +35,12 @@ include(thread/thread.pri) include(tools/tools.pri) include(io/io.pri) include(itemmodels/itemmodels.pri) -include(json/json.pri) include(plugin/plugin.pri) include(kernel/kernel.pri) include(codecs/codecs.pri) +include(serialization/serialization.pri) include(statemachine/statemachine.pri) include(mimetypes/mimetypes.pri) -include(xml/xml.pri) win32 { LIBS_PRIVATE += -lws2_32 diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 4614fe2a6b..c6a5973306 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -3,8 +3,6 @@ HEADERS += \ io/qabstractfileengine_p.h \ io/qbuffer.h \ - io/qdatastream.h \ - io/qdatastream_p.h \ io/qdataurl_p.h \ io/qdebug.h \ io/qdebug_p.h \ @@ -22,8 +20,6 @@ HEADERS += \ io/qlockfile.h \ io/qlockfile_p.h \ io/qnoncontiguousbytedevice_p.h \ - io/qtextstream.h \ - io/qtextstream_p.h \ io/qtemporarydir.h \ io/qtemporaryfile.h \ io/qtemporaryfile_p.h \ @@ -57,7 +53,6 @@ HEADERS += \ SOURCES += \ io/qabstractfileengine.cpp \ io/qbuffer.cpp \ - io/qdatastream.cpp \ io/qdataurl.cpp \ io/qtldurl.cpp \ io/qdebug.cpp \ @@ -71,7 +66,6 @@ SOURCES += \ io/qlockfile.cpp \ io/qnoncontiguousbytedevice.cpp \ io/qstorageinfo.cpp \ - io/qtextstream.cpp \ io/qtemporarydir.cpp \ io/qtemporaryfile.cpp \ io/qresource.cpp \ diff --git a/src/corelib/json/json.pri b/src/corelib/json/json.pri deleted file mode 100644 index 1a4e2a72bf..0000000000 --- a/src/corelib/json/json.pri +++ /dev/null @@ -1,17 +0,0 @@ -HEADERS += \ - json/qjson_p.h \ - json/qjsondocument.h \ - json/qjsonobject.h \ - json/qjsonvalue.h \ - json/qjsonarray.h \ - json/qjsonwriter_p.h \ - json/qjsonparser_p.h - -SOURCES += \ - json/qjson.cpp \ - json/qjsondocument.cpp \ - json/qjsonobject.cpp \ - json/qjsonarray.cpp \ - json/qjsonvalue.cpp \ - json/qjsonwriter.cpp \ - json/qjsonparser.cpp diff --git a/src/corelib/xml/.gitignore b/src/corelib/serialization/.gitignore index 89f9ac04aa..89f9ac04aa 100644 --- a/src/corelib/xml/.gitignore +++ b/src/corelib/serialization/.gitignore diff --git a/src/corelib/xml/make-parser.sh b/src/corelib/serialization/make-xml-parser.sh index 0296e4c22b..0296e4c22b 100755 --- a/src/corelib/xml/make-parser.sh +++ b/src/corelib/serialization/make-xml-parser.sh diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 8f419a4a46..8f419a4a46 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp diff --git a/src/corelib/io/qdatastream.h b/src/corelib/serialization/qdatastream.h index 1f1b13686c..1f1b13686c 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h diff --git a/src/corelib/io/qdatastream_p.h b/src/corelib/serialization/qdatastream_p.h index 3ca0ae840e..3ca0ae840e 100644 --- a/src/corelib/io/qdatastream_p.h +++ b/src/corelib/serialization/qdatastream_p.h diff --git a/src/corelib/json/qjson.cpp b/src/corelib/serialization/qjson.cpp index e4bca3bcd0..e4bca3bcd0 100644 --- a/src/corelib/json/qjson.cpp +++ b/src/corelib/serialization/qjson.cpp diff --git a/src/corelib/json/qjson_p.h b/src/corelib/serialization/qjson_p.h index 131528376b..131528376b 100644 --- a/src/corelib/json/qjson_p.h +++ b/src/corelib/serialization/qjson_p.h diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index c5a5aaf39d..c5a5aaf39d 100644 --- a/src/corelib/json/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp diff --git a/src/corelib/json/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index 8d41138c97..8d41138c97 100644 --- a/src/corelib/json/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 9794bca60d..9794bca60d 100644 --- a/src/corelib/json/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp diff --git a/src/corelib/json/qjsondocument.h b/src/corelib/serialization/qjsondocument.h index b784890c54..b784890c54 100644 --- a/src/corelib/json/qjsondocument.h +++ b/src/corelib/serialization/qjsondocument.h diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index 4a316c8a6f..4a316c8a6f 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp diff --git a/src/corelib/json/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index 610bce694c..610bce694c 100644 --- a/src/corelib/json/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h diff --git a/src/corelib/json/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp index 39738b90a8..39738b90a8 100644 --- a/src/corelib/json/qjsonparser.cpp +++ b/src/corelib/serialization/qjsonparser.cpp diff --git a/src/corelib/json/qjsonparser_p.h b/src/corelib/serialization/qjsonparser_p.h index 379256847f..379256847f 100644 --- a/src/corelib/json/qjsonparser_p.h +++ b/src/corelib/serialization/qjsonparser_p.h diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index 33707b6ec3..33707b6ec3 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 96538ebbf9..96538ebbf9 100644 --- a/src/corelib/json/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h diff --git a/src/corelib/json/qjsonwriter.cpp b/src/corelib/serialization/qjsonwriter.cpp index 12ce20ef09..12ce20ef09 100644 --- a/src/corelib/json/qjsonwriter.cpp +++ b/src/corelib/serialization/qjsonwriter.cpp diff --git a/src/corelib/json/qjsonwriter_p.h b/src/corelib/serialization/qjsonwriter_p.h index 76a8460449..76a8460449 100644 --- a/src/corelib/json/qjsonwriter_p.h +++ b/src/corelib/serialization/qjsonwriter_p.h diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp index ee3cb4efcb..ee3cb4efcb 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/serialization/qtextstream.cpp diff --git a/src/corelib/io/qtextstream.h b/src/corelib/serialization/qtextstream.h index ee0b09419d..ee0b09419d 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/serialization/qtextstream.h diff --git a/src/corelib/io/qtextstream_p.h b/src/corelib/serialization/qtextstream_p.h index a642beddc4..a642beddc4 100644 --- a/src/corelib/io/qtextstream_p.h +++ b/src/corelib/serialization/qtextstream_p.h diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 9b5295a17e..9b5295a17e 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/serialization/qxmlstream.g index fd69a6e4af..fd69a6e4af 100644 --- a/src/corelib/xml/qxmlstream.g +++ b/src/corelib/serialization/qxmlstream.g diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/serialization/qxmlstream.h index 2350d12dd6..2350d12dd6 100644 --- a/src/corelib/xml/qxmlstream.h +++ b/src/corelib/serialization/qxmlstream.h diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h index 5645d812eb..5645d812eb 100644 --- a/src/corelib/xml/qxmlstream_p.h +++ b/src/corelib/serialization/qxmlstream_p.h diff --git a/src/corelib/xml/qxmlutils.cpp b/src/corelib/serialization/qxmlutils.cpp index 01c84251fd..01c84251fd 100644 --- a/src/corelib/xml/qxmlutils.cpp +++ b/src/corelib/serialization/qxmlutils.cpp diff --git a/src/corelib/xml/qxmlutils_p.h b/src/corelib/serialization/qxmlutils_p.h index db6bddd5be..db6bddd5be 100644 --- a/src/corelib/xml/qxmlutils_p.h +++ b/src/corelib/serialization/qxmlutils_p.h diff --git a/src/corelib/serialization/serialization.pri b/src/corelib/serialization/serialization.pri new file mode 100644 index 0000000000..3d039dc30f --- /dev/null +++ b/src/corelib/serialization/serialization.pri @@ -0,0 +1,30 @@ +# Qt data formats core module + +HEADERS += \ + serialization/qdatastream.h \ + serialization/qdatastream_p.h \ + serialization/qjson_p.h \ + serialization/qjsondocument.h \ + serialization/qjsonobject.h \ + serialization/qjsonvalue.h \ + serialization/qjsonarray.h \ + serialization/qjsonwriter_p.h \ + serialization/qjsonparser_p.h \ + serialization/qtextstream.h \ + serialization/qtextstream_p.h \ + serialization/qxmlstream.h \ + serialization/qxmlstream_p.h \ + serialization/qxmlutils_p.h + +SOURCES += \ + serialization/qdatastream.cpp \ + serialization/qjson.cpp \ + serialization/qjsondocument.cpp \ + serialization/qjsonobject.cpp \ + serialization/qjsonarray.cpp \ + serialization/qjsonvalue.cpp \ + serialization/qjsonwriter.cpp \ + serialization/qjsonparser.cpp \ + serialization/qtextstream.cpp \ + serialization/qxmlstream.cpp \ + serialization/qxmlutils.cpp diff --git a/src/corelib/xml/xml.pri b/src/corelib/xml/xml.pri deleted file mode 100644 index 2401c09ab7..0000000000 --- a/src/corelib/xml/xml.pri +++ /dev/null @@ -1,10 +0,0 @@ -# Qt xml core module - -HEADERS += \ - xml/qxmlstream.h \ - xml/qxmlstream_p.h \ - xml/qxmlutils_p.h - -SOURCES += \ - xml/qxmlstream.cpp \ - xml/qxmlutils.cpp diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index a88333f03a..a45382106a 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -32,7 +32,6 @@ SOURCES += \ ../../corelib/global/qrandom.cpp \ ../../corelib/io/qabstractfileengine.cpp \ ../../corelib/io/qbuffer.cpp \ - ../../corelib/io/qdatastream.cpp \ ../../corelib/io/qdebug.cpp \ ../../corelib/io/qdir.cpp \ ../../corelib/io/qdiriterator.cpp \ @@ -47,7 +46,6 @@ SOURCES += \ ../../corelib/io/qresource.cpp \ ../../corelib/io/qtemporarydir.cpp \ ../../corelib/io/qtemporaryfile.cpp \ - ../../corelib/io/qtextstream.cpp \ ../../corelib/io/qsavefile.cpp \ ../../corelib/io/qstandardpaths.cpp \ ../../corelib/io/qloggingcategory.cpp \ @@ -58,6 +56,17 @@ SOURCES += \ ../../corelib/kernel/qvariant.cpp \ ../../corelib/kernel/qsystemerror.cpp \ ../../corelib/plugin/quuid.cpp \ + ../../corelib/serialization/qdatastream.cpp \ + ../../corelib/serialization/qjson.cpp \ + ../../corelib/serialization/qjsondocument.cpp \ + ../../corelib/serialization/qjsonobject.cpp \ + ../../corelib/serialization/qjsonarray.cpp \ + ../../corelib/serialization/qjsonvalue.cpp \ + ../../corelib/serialization/qjsonparser.cpp \ + ../../corelib/serialization/qjsonwriter.cpp \ + ../../corelib/serialization/qtextstream.cpp \ + ../../corelib/serialization/qxmlutils.cpp \ + ../../corelib/serialization/qxmlstream.cpp \ ../../corelib/tools/qbitarray.cpp \ ../../corelib/tools/qbytearray.cpp \ ../../corelib/tools/qarraydata.cpp \ @@ -84,15 +93,6 @@ SOURCES += \ ../../corelib/tools/qstringlist.cpp \ ../../corelib/tools/qversionnumber.cpp \ ../../corelib/tools/qvsnprintf.cpp \ - ../../corelib/xml/qxmlutils.cpp \ - ../../corelib/xml/qxmlstream.cpp \ - ../../corelib/json/qjson.cpp \ - ../../corelib/json/qjsondocument.cpp \ - ../../corelib/json/qjsonobject.cpp \ - ../../corelib/json/qjsonarray.cpp \ - ../../corelib/json/qjsonvalue.cpp \ - ../../corelib/json/qjsonparser.cpp \ - ../../corelib/json/qjsonwriter.cpp \ ../../xml/dom/qdom.cpp \ ../../xml/sax/qxml.cpp |