summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2020-06-17 12:33:40 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2020-06-20 02:04:38 +0200
commit18ec53156ee704fdb4977436fccfdc85333e614b (patch)
treedf734ce7893d570f4a90f923fcfe9c80ddc3de05 /src/corelib/doc
parent4455de24d453138411c57bae55af18f3fba58d4b (diff)
Move QTextCodec support out of QtCore
* Assume UTF-8 on all Unix like systems * Export some functions to be able to compile QTextCodec once moved to Qt5Compat. Task-number: QTBUG-75665 Change-Id: I52ec47a848bc0ba72e9c7689668b1bcc5d736c29 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/doc')
-rw-r--r--src/corelib/doc/qtcore.qdocconf3
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_codecs_qtextcodec.cpp75
2 files changed, 1 insertions, 77 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index e930008e47..28b926b732 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -44,8 +44,7 @@ imagedirs += images
excludedirs += snippets
-excludefiles += ../../../examples/widgets/tools/customcompleter/doc/src/customcompleter.qdoc \
- ../../../examples/widgets/tools/codecs/doc/src/codecs.qdoc
+excludefiles += ../../../examples/widgets/tools/customcompleter/doc/src/customcompleter.qdoc
# Included in qttestlib.qdocconf instead
excludefiles += ../kernel/qtestsupport_core.cpp
diff --git a/src/corelib/doc/snippets/code/src_corelib_codecs_qtextcodec.cpp b/src/corelib/doc/snippets/code/src_corelib_codecs_qtextcodec.cpp
deleted file mode 100644
index 9ce9d8d09c..0000000000
--- a/src/corelib/doc/snippets/code/src_corelib_codecs_qtextcodec.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-QByteArray encodedString = "...";
-QTextCodec *codec = QTextCodec::codecForName("KOI8-R");
-QString string = codec->toUnicode(encodedString);
-//! [0]
-
-
-//! [1]
-QString string = "...";
-QTextCodec *codec = QTextCodec::codecForName("KOI8-R");
-QByteArray encodedString = codec->fromUnicode(string);
-//! [1]
-
-
-//! [2]
-QTextCodec *codec = QTextCodec::codecForName("Shift-JIS");
-QTextDecoder *decoder = codec->makeDecoder();
-
-QString string;
-while (new_data_available()) {
- QByteArray chunk = get_new_data();
- string += decoder->toUnicode(chunk);
-}
-delete decoder;
-//! [2]