From 0bc02fd0d61d1e4aed9b39890d28975dff30e822 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Tue, 20 Mar 2012 19:37:07 +0100 Subject: Doc: Prepare for building modular QtCore docs. This change fixes most qdoc errors in QtCore. There are about 900 left. The main thing this change does is moving documentation from qtcore from /doc/src to /src/corelib/doc. Other issues resolved are mis-use of qdoc commands. Change-Id: I002d01edfb13575e8bf27ce91596a577a92562d1 Reviewed-by: Lars Knoll Reviewed-by: Jason McDonald Reviewed-by: Jerome Pasion --- src/corelib/codecs/codecs.qdoc | 14 +++++++------- src/corelib/codecs/qtextcodec.cpp | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/corelib/codecs') diff --git a/src/corelib/codecs/codecs.qdoc b/src/corelib/codecs/codecs.qdoc index 669072f789..05714b2253 100644 --- a/src/corelib/codecs/codecs.qdoc +++ b/src/corelib/codecs/codecs.qdoc @@ -68,8 +68,8 @@ for Qt. \legalese - Copyright (C) 2000 Ming-Che Chuang \BR - Copyright (C) 2002 James Su, Turbolinux Inc. \BR + Copyright (C) 2000 Ming-Che Chuang + Copyright (C) 2002 James Su, Turbolinux Inc. Copyright (C) 2002 Anthony Fok, ThizLinux Laboratory Ltd. Redistribution and use in source and binary forms, with or without @@ -137,9 +137,9 @@ for the various Big5 CharMapML tables. \legalese - Copyright (C) 2000 Ming-Che Chuang \BR - Copyright (C) 2001, 2002 James Su, Turbolinux Inc. \BR - Copyright (C) 2002 WU Yi, HancomLinux Inc. \BR + Copyright (C) 2000 Ming-Che Chuang + Copyright (C) 2001, 2002 James Su, Turbolinux Inc. + Copyright (C) 2002 WU Yi, HancomLinux Inc. Copyright (C) 2001, 2002 Anthony Fok, ThizLinux Laboratory Ltd. Redistribution and use in source and binary forms, with or without @@ -307,8 +307,8 @@ The copyright notice for their code follows: \legalese - Copyright (C) 2000 TurboLinux, Inc. Written by Justin Yu and Sean Chen. \BR - Copyright (C) 2001, 2002 Turbolinux, Inc. Written by James Su. \BR + Copyright (C) 2000 TurboLinux, Inc. Written by Justin Yu and Sean Chen. + Copyright (C) 2001, 2002 Turbolinux, Inc. Written by James Su. Copyright (C) 2001, 2002 ThizLinux Laboratory Ltd. Written by Anthony Fok. Redistribution and use in source and binary forms, with or without diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 784a75bcad..b7939f1f3e 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -818,13 +818,13 @@ QTextCodec::ConverterState::~ConverterState() KOI8-R encoding, and want to convert it to Unicode. The simple way to do it is like this: - \snippet doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp 0 + \snippet code/src_corelib_codecs_qtextcodec.cpp 0 After this, \c string holds the text converted to Unicode. Converting a string from Unicode to the local encoding is just as easy: - \snippet doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp 1 + \snippet code/src_corelib_codecs_qtextcodec.cpp 1 To read or write files in various encodings, use QTextStream and its \l{QTextStream::setCodec()}{setCodec()} function. See the @@ -841,7 +841,7 @@ QTextCodec::ConverterState::~ConverterState() object for the codec and use this QTextDecoder for the whole decoding process, as shown below: - \snippet doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp 2 + \snippet code/src_corelib_codecs_qtextcodec.cpp 2 The QTextDecoder object maintains state between chunks and therefore works correctly even if a multi-byte character is split between -- cgit v1.2.3