Changeset 846 for trunk/src/corelib/io/qtextstream.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/io/qtextstream.cpp (modified) (6 diffs)

trunk/src/corelib/io/qtextstream.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -71 +71 @@
     that as long as stdin doesn't give any input to the QTextStream, \c atEnd()
     will return true even if the stdin is open and waiting for more characters.
-    
+
     Besides using QTextStream's constructors, you can also set the
     device or string QTextStream operates on by calling setDevice() or
@@ -1197 +1197 @@
         delete d->readConverterSavedState;
         d->readConverterSavedState = 0;
+
 #endif
         return true;
@@ -1991 +1992 @@
     buf[i] = '\0';
 
-    // backward-compatibility. Old implmentation supported +nan/-nan
+    // backward-compatibility. Old implmentation supported +nan/-nan
     // for some reason. QLocale only checks for lower-case
     // nan/+inf/-inf, so here we also check for uppercase and mixed
@@ -3019 +3020 @@
 
 /*!
-    Returns true if automatic Unicode detection is enabled; otherwise
-    returns false.
+    Returns true if automatic Unicode detection is enabled otherwise
+    returns false.
 
     \sa setAutoDetectUnicode(), setCodec()
@@ -3051 +3052 @@
 /*!
     Returns true if QTextStream is set to generate the UTF BOM (Byte Order
-    Mark) when using a UTF codec; otherwise returns false.
+    Mark) when using a UTF codec; otherwise returns false. UTF BOM generation is
+    set to false by default.
 
     \sa setGenerateByteOrderMark()