From 98804946f289fe8ab866cc7bf3383a29057f9251 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Wed, 15 Aug 2012 06:37:01 +0100 Subject: Make the "\internal" qdoc command stand on its own line The qdoc manual currently claims that the command must stand on its own line. The change follows the consistency with the rest and how the example looks like inside the qdoc manual for this command. Change-Id: I6b653dc95cf9d84e4adf32220dace5d313678419 Reviewed-by: Casper van Donderen --- src/corelib/codecs/qjiscodec.cpp | 16 ++++++--- src/corelib/codecs/qjpunicode.cpp | 72 +++++++++++++++++++++++++++++---------- src/corelib/codecs/qtextcodec.cpp | 6 ++-- 3 files changed, 70 insertions(+), 24 deletions(-) (limited to 'src/corelib/codecs') diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp index 8340b5c290..1bdf8717b8 100644 --- a/src/corelib/codecs/qjiscodec.cpp +++ b/src/corelib/codecs/qjiscodec.cpp @@ -91,13 +91,17 @@ static const char * const Esc_SEQ[] = { Esc_Ascii, Esc_JISX0208_1983, Esc_JISX0212 }; -/*! \internal */ +/*! + \internal +*/ QJisCodec::QJisCodec() : conv(QJpUnicodeConv::newConverter(QJpUnicodeConv::Default)) { } -/*! \internal */ +/*! + \internal +*/ QJisCodec::~QJisCodec() { delete (QJpUnicodeConv*)conv; @@ -340,13 +344,17 @@ QString QJisCodec::convertToUnicode(const char* chars, int len, ConverterState * -/*! \internal */ +/*! + \internal +*/ int QJisCodec::_mibEnum() { return 39; } -/*! \internal */ +/*! + \internal +*/ QByteArray QJisCodec::_name() { return "ISO-2022-JP"; diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp index 284db896cb..19014d8773 100644 --- a/src/corelib/codecs/qjpunicode.cpp +++ b/src/corelib/codecs/qjpunicode.cpp @@ -101,7 +101,9 @@ static uint unicode11ToJisx0212(uint h, uint l); */ -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::asciiToUnicode(uint h, uint l) const { if ((h == 0) && (l < 0x80)) { @@ -110,7 +112,9 @@ uint QJpUnicodeConv::asciiToUnicode(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::jisx0201ToUnicode(uint h, uint l) const { if (h == 0) { @@ -123,7 +127,9 @@ uint QJpUnicodeConv::jisx0201ToUnicode(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::jisx0201LatinToUnicode(uint h, uint l) const { if ((h == 0) && IsLatin(l)) { @@ -132,7 +138,9 @@ uint QJpUnicodeConv::jisx0201LatinToUnicode(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::jisx0201KanaToUnicode(uint h, uint l) const { if ((h == 0) && IsKana(l)) { @@ -141,7 +149,9 @@ uint QJpUnicodeConv::jisx0201KanaToUnicode(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::jisx0208ToUnicode(uint h, uint l) const { if (rule & UDC){ @@ -159,7 +169,9 @@ uint QJpUnicodeConv::jisx0208ToUnicode(uint h, uint l) const return jisx0208ToUnicode11(h, l); } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::jisx0212ToUnicode(uint h, uint l) const { if (rule & UDC){ @@ -178,7 +190,9 @@ uint QJpUnicodeConv::jisx0212ToUnicode(uint h, uint l) const return jisx0212ToUnicode11(h, l); } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::unicodeToAscii(uint h, uint l) const { if ((h == 0) && (l < 0x80)) { @@ -187,7 +201,9 @@ uint QJpUnicodeConv::unicodeToAscii(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::unicodeToJisx0201(uint h, uint l) const { uint jis; @@ -199,7 +215,9 @@ uint QJpUnicodeConv::unicodeToJisx0201(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::unicodeToJisx0201Latin(uint h, uint l) const { uint jis = unicode11ToJisx0201(h, l); @@ -209,7 +227,9 @@ uint QJpUnicodeConv::unicodeToJisx0201Latin(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::unicodeToJisx0201Kana(uint h, uint l) const { uint jis = unicode11ToJisx0201(h, l); @@ -219,7 +239,9 @@ uint QJpUnicodeConv::unicodeToJisx0201Kana(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::unicodeToJisx0208(uint h, uint l) const { if (rule & UDC){ @@ -240,7 +262,9 @@ uint QJpUnicodeConv::unicodeToJisx0208(uint h, uint l) const return jis; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::unicodeToJisx0212(uint h, uint l) const { if (rule & UDC){ @@ -262,7 +286,9 @@ uint QJpUnicodeConv::unicodeToJisx0212(uint h, uint l) const return jis; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::sjisToUnicode(uint h, uint l) const { if (h == 0) { @@ -273,7 +299,9 @@ uint QJpUnicodeConv::sjisToUnicode(uint h, uint l) const return 0x0000; } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv::unicodeToSjis(uint h, uint l) const { uint jis; @@ -357,7 +385,9 @@ uint QJpUnicodeConv_Unicode_ASCII::unicodeToJisx0208(uint h, uint l) const return QJpUnicodeConv::unicodeToJisx0208(h, l); } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv_Unicode_ASCII::unicodeToJisx0212(uint h, uint l) const { if ((h == 0x00) && (l == 0x7e)) { @@ -505,7 +535,9 @@ uint QJpUnicodeConv_JISX0221_ASCII::unicodeToJisx0208(uint h, uint l) const return QJpUnicodeConv::unicodeToJisx0208(h, l); } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv_JISX0221_ASCII::unicodeToJisx0212(uint h, uint l) const { if ((h == 0x00) && (l == 0x7e)) { @@ -589,7 +621,9 @@ uint QJpUnicodeConv_Sun::unicodeToJisx0208(uint h, uint l) const return QJpUnicodeConv::unicodeToJisx0208(h, l); } -/*! \internal */ +/*! + \internal +*/ uint QJpUnicodeConv_Sun::unicodeToJisx0212(uint h, uint l) const { #if 1 @@ -725,7 +759,9 @@ uint QJpUnicodeConv_Microsoft::unicodeToJisx0212(uint h, uint l) const } -/*! \internal */ +/*! + \internal +*/ QJpUnicodeConv *QJpUnicodeConv::newConverter(int rule) { QByteArray env = qgetenv("UNICODEMAP_JP"); diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index fb3151ba81..90b339b056 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -902,7 +902,8 @@ QTextEncoder::~QTextEncoder() { } -/*! \internal +/*! + \internal \since 4.5 Determines whether the eecoder encountered a failure while decoding the input. If an error was encountered, the produced result is undefined, and gets converted as according @@ -1138,7 +1139,8 @@ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba) } -/*! \internal +/*! + \internal \since 4.3 Determines whether the decoder encountered a failure while decoding the input. If an error was encountered, the produced result is undefined, and gets converted as according -- cgit v1.2.3