diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-22 14:17:52 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-23 11:23:36 +0200 |
commit | c5a3e5edd9e63b18abf1838c86a27a662224b02c (patch) | |
tree | 9a367c113d9b586da73439cb100744d616ce6399 /src/corelib/io/qiodevice.cpp | |
parent | 3312ac91692c3a4a033d123eecbf982d3ff10471 (diff) | |
parent | a5df2e7120412dfdedb9f4951cdb061c0f218bf7 (diff) |
Merge remote-tracking branch 'origin/5.3' into 5.4
The isAlwaysAskOption was removed in 38621713150b663355ebeb799a5a50d8e39a3c38
so manually removed code in
src/plugins/bearer/connman/qconnmanengine.cpp
Conflicts:
src/corelib/global/qglobal.h
src/corelib/tools/qcollator_macx.cpp
src/corelib/tools/qstring.cpp
src/gui/kernel/qwindow.cpp
src/gui/kernel/qwindow_p.h
src/gui/text/qtextengine.cpp
src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
src/plugins/platforms/android/qandroidinputcontext.cpp
src/plugins/platforms/xcb/qglxintegration.cpp
src/plugins/platforms/xcb/qglxintegration.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/testlib/qtestcase.cpp
src/testlib/qtestlog.cpp
src/widgets/dialogs/qfiledialog.cpp
src/widgets/kernel/qwindowcontainer.cpp
tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
Diffstat (limited to 'src/corelib/io/qiodevice.cpp')
-rw-r--r-- | src/corelib/io/qiodevice.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 51a574987e..06f7fb17cd 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -217,7 +217,7 @@ QIODevicePrivate::~QIODevicePrivate() \li waitFor....() - Subclasses of QIODevice implement blocking functions for device-specific operations. For example, QProcess - has a function called waitForStarted() which suspends operation in + has a function called \l {QProcess::}{waitForStarted()} which suspends operation in the calling thread until the process has started. \endlist @@ -730,8 +730,7 @@ qint64 QIODevice::bytesAvailable() const return d->buffer.size(); } -/*! - For buffered devices, this function returns the number of bytes +/*! For buffered devices, this function returns the number of bytes waiting to be written. For devices with no buffer, this function returns 0. @@ -943,9 +942,10 @@ qint64 QIODevice::read(char *data, qint64 maxSize) data read as a QByteArray. This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for reading, or that an error occurred. */ + QByteArray QIODevice::read(qint64 maxSize) { Q_D(QIODevice); @@ -994,10 +994,10 @@ QByteArray QIODevice::read(qint64 maxSize) \overload Reads all available data from the device, and returns it as a - QByteArray. + byte array. This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for reading, or that an error occurred. */ QByteArray QIODevice::readAll() @@ -1177,10 +1177,10 @@ qint64 QIODevice::readLine(char *data, qint64 maxSize) \overload Reads a line from the device, but no more than \a maxSize characters, - and returns the result as a QByteArray. + and returns the result as a byte array. This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for reading, or that an error occurred. */ QByteArray QIODevice::readLine(qint64 maxSize) @@ -1531,7 +1531,7 @@ qint64 QIODevice::peek(char *data, qint64 maxSize) \snippet code/src_corelib_io_qiodevice.cpp 5 This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for peeking, or that an error occurred. \sa read() |