Changeset 846 for trunk/src/corelib/io/qiodevice.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/qiodevice.cpp (modified) (5 diffs)

trunk/src/corelib/io/qiodevice.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])
@@ -396 +396 @@
 
 /*!
-    Destructs the QIODevice object.
+  The destructor is virtual, and QIODevice is an abstract base
+  class. This destructor does not call close(), but the subclass
+  destructor might. If you are in doubt, call close() before
+  destroying the QIODevice.
 */
 QIODevice::~QIODevice()
@@ -1443 +1446 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*! \fn bool QIODevice::getChar(char *c)
 
@@ -1477 +1509 @@
 qint64 QIODevice::peek(char *data, qint64 maxSize)
 {
-    qint64 readBytes = read(data, maxSize);
-    int i = readBytes;
-    while (i > 0)
-        ungetChar(data[i-- - 1]);
-    return readBytes;
+    return d_func()->peek(data, maxSize);
 }
 
@@ -1503 +1531 @@
 QByteArray QIODevice::peek(qint64 maxSize)
 {
-    QByteArray result = read(maxSize);
-    int i = result.size();
-    const char *data = result.constData();
-    while (i > 0)
-        ungetChar(data[i-- - 1]);
-    return result;
+    return d_func()->peek(maxSize);
 }