diff options
Diffstat (limited to 'src/corelib/io')
64 files changed, 657 insertions, 6046 deletions
diff --git a/src/corelib/io/QTEMPORARYFILE_LICENSE.txt b/src/corelib/io/QTEMPORARYFILE_LICENSE.txt deleted file mode 100644 index f5f1a2e05e..0000000000 --- a/src/corelib/io/QTEMPORARYFILE_LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 1987, 1993 - The Regents of the University of California. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 24f27f6b24..d138ab2f00 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -3,8 +3,6 @@ HEADERS += \ io/qabstractfileengine_p.h \ io/qbuffer.h \ - io/qdatastream.h \ - io/qdatastream_p.h \ io/qdataurl_p.h \ io/qdebug.h \ io/qdebug_p.h \ @@ -22,8 +20,6 @@ HEADERS += \ io/qlockfile.h \ io/qlockfile_p.h \ io/qnoncontiguousbytedevice_p.h \ - io/qtextstream.h \ - io/qtextstream_p.h \ io/qtemporarydir.h \ io/qtemporaryfile.h \ io/qtemporaryfile_p.h \ @@ -57,7 +53,6 @@ HEADERS += \ SOURCES += \ io/qabstractfileengine.cpp \ io/qbuffer.cpp \ - io/qdatastream.cpp \ io/qdataurl.cpp \ io/qtldurl.cpp \ io/qdebug.cpp \ @@ -71,7 +66,6 @@ SOURCES += \ io/qlockfile.cpp \ io/qnoncontiguousbytedevice.cpp \ io/qstorageinfo.cpp \ - io/qtextstream.cpp \ io/qtemporarydir.cpp \ io/qtemporaryfile.cpp \ io/qresource.cpp \ diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp index 86dd737809..e0b9c41323 100644 --- a/src/corelib/io/qbuffer.cpp +++ b/src/corelib/io/qbuffer.cpp @@ -60,8 +60,8 @@ public: QByteArray *buf; QByteArray defaultBuf; - virtual qint64 peek(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - virtual QByteArray peek(qint64 maxSize) Q_DECL_OVERRIDE; + virtual qint64 peek(char *data, qint64 maxSize) override; + virtual QByteArray peek(qint64 maxSize) override; #ifndef QT_NO_QOBJECT // private slots diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h index fd05dff311..39e1e7b39d 100644 --- a/src/corelib/io/qbuffer.h +++ b/src/corelib/io/qbuffer.h @@ -57,8 +57,8 @@ class Q_CORE_EXPORT QBuffer : public QIODevice public: #ifndef QT_NO_QOBJECT - explicit QBuffer(QObject *parent = Q_NULLPTR); - QBuffer(QByteArray *buf, QObject *parent = Q_NULLPTR); + explicit QBuffer(QObject *parent = nullptr); + QBuffer(QByteArray *buf, QObject *parent = nullptr); #else QBuffer(); explicit QBuffer(QByteArray *buf); @@ -73,22 +73,22 @@ public: inline void setData(const char *data, int len); const QByteArray &data() const; - bool open(OpenMode openMode) Q_DECL_OVERRIDE; + bool open(OpenMode openMode) override; - void close() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; - bool seek(qint64 off) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; + void close() override; + qint64 size() const override; + qint64 pos() const override; + bool seek(qint64 off) override; + bool atEnd() const override; + bool canReadLine() const override; protected: #ifndef QT_NO_QOBJECT - void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; - void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &) override; + void disconnectNotify(const QMetaMethod &) override; #endif - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: Q_DECLARE_PRIVATE(QBuffer) diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp deleted file mode 100644 index 1486d3630c..0000000000 --- a/src/corelib/io/qdatastream.cpp +++ /dev/null @@ -1,1399 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qdatastream.h" -#include "qdatastream_p.h" - -#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) -#include "qbuffer.h" -#include "qfloat16.h" -#include "qstring.h" -#include <stdio.h> -#include <ctype.h> -#include <stdlib.h> -#include "qendian.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QDataStream - \inmodule QtCore - \reentrant - \brief The QDataStream class provides serialization of binary data - to a QIODevice. - - \ingroup io - - - A data stream is a binary stream of encoded information which is - 100% independent of the host computer's operating system, CPU or - byte order. For example, a data stream that is written by a PC - under Windows can be read by a Sun SPARC running Solaris. - - You can also use a data stream to read/write \l{raw}{raw - unencoded binary data}. If you want a "parsing" input stream, see - QTextStream. - - The QDataStream class implements the serialization of C++'s basic - data types, like \c char, \c short, \c int, \c{char *}, etc. - Serialization of more complex data is accomplished by breaking up - the data into primitive units. - - A data stream cooperates closely with a QIODevice. A QIODevice - represents an input/output medium one can read data from and write - data to. The QFile class is an example of an I/O device. - - Example (write binary data to a stream): - - \snippet code/src_corelib_io_qdatastream.cpp 0 - - Example (read binary data from a stream): - - \snippet code/src_corelib_io_qdatastream.cpp 1 - - Each item written to the stream is written in a predefined binary - format that varies depending on the item's type. Supported Qt - types include QBrush, QColor, QDateTime, QFont, QPixmap, QString, - QVariant and many others. For the complete list of all Qt types - supporting data streaming see \l{Serializing Qt Data Types}. - - For integers it is best to always cast to a Qt integer type for - writing, and to read back into the same Qt integer type. This - ensures that you get integers of the size you want and insulates - you from compiler and platform differences. - - To take one example, a \c{char *} string is written as a 32-bit - integer equal to the length of the string including the '\\0' byte, - followed by all the characters of the string including the - '\\0' byte. When reading a \c{char *} string, 4 bytes are read to - create the 32-bit length value, then that many characters for the - \c {char *} string including the '\\0' terminator are read. - - The initial I/O device is usually set in the constructor, but can be - changed with setDevice(). If you've reached the end of the data - (or if there is no I/O device set) atEnd() will return true. - - \section1 Versioning - - QDataStream's binary format has evolved since Qt 1.0, and is - likely to continue evolving to reflect changes done in Qt. When - inputting or outputting complex types, it's very important to - make sure that the same version of the stream (version()) is used - for reading and writing. If you need both forward and backward - compatibility, you can hardcode the version number in the - application: - - \snippet code/src_corelib_io_qdatastream.cpp 2 - - If you are producing a new binary data format, such as a file - format for documents created by your application, you could use a - QDataStream to write the data in a portable format. Typically, you - would write a brief header containing a magic string and a version - number to give yourself room for future expansion. For example: - - \snippet code/src_corelib_io_qdatastream.cpp 3 - - Then read it in with: - - \snippet code/src_corelib_io_qdatastream.cpp 4 - - You can select which byte order to use when serializing data. The - default setting is big endian (MSB first). Changing it to little - endian breaks the portability (unless the reader also changes to - little endian). We recommend keeping this setting unless you have - special requirements. - - \target raw - \section1 Reading and Writing Raw Binary Data - - You may wish to read/write your own raw binary data to/from the - data stream directly. Data may be read from the stream into a - preallocated \c{char *} using readRawData(). Similarly data can be - written to the stream using writeRawData(). Note that any - encoding/decoding of the data must be done by you. - - A similar pair of functions is readBytes() and writeBytes(). These - differ from their \e raw counterparts as follows: readBytes() - reads a quint32 which is taken to be the length of the data to be - read, then that number of bytes is read into the preallocated - \c{char *}; writeBytes() writes a quint32 containing the length of the - data, followed by the data. Note that any encoding/decoding of - the data (apart from the length quint32) must be done by you. - - \section1 Reading and Writing Qt Collection Classes - - The Qt container classes can also be serialized to a QDataStream. - These include QList, QLinkedList, QVector, QSet, QHash, and QMap. - The stream operators are declared as non-members of the classes. - - \target Serializing Qt Classes - \section1 Reading and Writing Other Qt Classes - - In addition to the overloaded stream operators documented here, - any Qt classes that you might want to serialize to a QDataStream - will have appropriate stream operators declared as non-member of - the class: - - \code - QDataStream &operator<<(QDataStream &, const QXxx &); - QDataStream &operator>>(QDataStream &, QXxx &); - \endcode - - For example, here are the stream operators declared as non-members - of the QImage class: - - \code - QDataStream & operator<< (QDataStream& stream, const QImage& image); - QDataStream & operator>> (QDataStream& stream, QImage& image); - \endcode - - To see if your favorite Qt class has similar stream operators - defined, check the \b {Related Non-Members} section of the - class's documentation page. - - \section1 Using Read Transactions - - When a data stream operates on an asynchronous device, the chunks of data - can arrive at arbitrary points in time. The QDataStream class implements - a transaction mechanism that provides the ability to read the data - atomically with a series of stream operators. As an example, you can - handle incomplete reads from a socket by using a transaction in a slot - connected to the readyRead() signal: - - \snippet code/src_corelib_io_qdatastream.cpp 6 - - If no full packet is received, this code restores the stream to the - initial position, after which you need to wait for more data to arrive. - - \sa QTextStream, QVariant -*/ - -/*! - \enum QDataStream::ByteOrder - - The byte order used for reading/writing the data. - - \value BigEndian Most significant byte first (the default) - \value LittleEndian Least significant byte first -*/ - -/*! - \enum QDataStream::FloatingPointPrecision - - The precision of floating point numbers used for reading/writing the data. This will only have - an effect if the version of the data stream is Qt_4_6 or higher. - - \warning The floating point precision must be set to the same value on the object that writes - and the object that reads the data stream. - - \value SinglePrecision All floating point numbers in the data stream have 32-bit precision. - \value DoublePrecision All floating point numbers in the data stream have 64-bit precision. - - \sa setFloatingPointPrecision(), floatingPointPrecision() -*/ - -/*! - \enum QDataStream::Status - - This enum describes the current status of the data stream. - - \value Ok The data stream is operating normally. - \value ReadPastEnd The data stream has read past the end of the - data in the underlying device. - \value ReadCorruptData The data stream has read corrupt data. - \value WriteFailed The data stream cannot write to the underlying device. -*/ - -/***************************************************************************** - QDataStream member functions - *****************************************************************************/ - -#define Q_VOID - -#undef CHECK_STREAM_PRECOND -#ifndef QT_NO_DEBUG -#define CHECK_STREAM_PRECOND(retVal) \ - if (!dev) { \ - qWarning("QDataStream: No device"); \ - return retVal; \ - } -#else -#define CHECK_STREAM_PRECOND(retVal) \ - if (!dev) { \ - return retVal; \ - } -#endif - -#define CHECK_STREAM_WRITE_PRECOND(retVal) \ - CHECK_STREAM_PRECOND(retVal) \ - if (q_status != Ok) \ - return retVal; - -#define CHECK_STREAM_TRANSACTION_PRECOND(retVal) \ - if (!d || d->transactionDepth == 0) { \ - qWarning("QDataStream: No transaction in progress"); \ - return retVal; \ - } - -/*! - Constructs a data stream that has no I/O device. - - \sa setDevice() -*/ - -QDataStream::QDataStream() -{ - dev = 0; - owndev = false; - byteorder = BigEndian; - ver = Qt_DefaultCompiledVersion; - noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian; - q_status = Ok; -} - -/*! - Constructs a data stream that uses the I/O device \a d. - - \sa setDevice(), device() -*/ - -QDataStream::QDataStream(QIODevice *d) -{ - dev = d; // set device - owndev = false; - byteorder = BigEndian; // default byte order - ver = Qt_DefaultCompiledVersion; - noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian; - q_status = Ok; -} - -/*! - \fn QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode mode) - - Constructs a data stream that operates on a byte array, \a a. The - \a mode describes how the device is to be used. - - Alternatively, you can use QDataStream(const QByteArray &) if you - just want to read from a byte array. - - Since QByteArray is not a QIODevice subclass, internally a QBuffer - is created to wrap the byte array. -*/ - -QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode flags) -{ - QBuffer *buf = new QBuffer(a); -#ifndef QT_NO_QOBJECT - buf->blockSignals(true); -#endif - buf->open(flags); - dev = buf; - owndev = true; - byteorder = BigEndian; - ver = Qt_DefaultCompiledVersion; - noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian; - q_status = Ok; -} - -/*! - Constructs a read-only data stream that operates on byte array \a a. - Use QDataStream(QByteArray*, int) if you want to write to a byte - array. - - Since QByteArray is not a QIODevice subclass, internally a QBuffer - is created to wrap the byte array. -*/ -QDataStream::QDataStream(const QByteArray &a) -{ - QBuffer *buf = new QBuffer; -#ifndef QT_NO_QOBJECT - buf->blockSignals(true); -#endif - buf->setData(a); - buf->open(QIODevice::ReadOnly); - dev = buf; - owndev = true; - byteorder = BigEndian; - ver = Qt_DefaultCompiledVersion; - noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian; - q_status = Ok; -} - -/*! - Destroys the data stream. - - The destructor will not affect the current I/O device, unless it is - an internal I/O device (e.g. a QBuffer) processing a QByteArray - passed in the \e constructor, in which case the internal I/O device - is destroyed. -*/ - -QDataStream::~QDataStream() -{ - if (owndev) - delete dev; -} - - -/*! - \fn QIODevice *QDataStream::device() const - - Returns the I/O device currently set, or 0 if no - device is currently set. - - \sa setDevice() -*/ - -/*! - void QDataStream::setDevice(QIODevice *d) - - Sets the I/O device to \a d, which can be 0 - to unset to current I/O device. - - \sa device() -*/ - -void QDataStream::setDevice(QIODevice *d) -{ - if (owndev) { - delete dev; - owndev = false; - } - dev = d; -} - -/*! - \obsolete - Unsets the I/O device. - Use setDevice(0) instead. -*/ - -void QDataStream::unsetDevice() -{ - setDevice(0); -} - - -/*! - \fn bool QDataStream::atEnd() const - - Returns \c true if the I/O device has reached the end position (end of - the stream or file) or if there is no I/O device set; otherwise - returns \c false. - - \sa QIODevice::atEnd() -*/ - -bool QDataStream::atEnd() const -{ - return dev ? dev->atEnd() : true; -} - -/*! - Returns the floating point precision of the data stream. - - \since 4.6 - - \sa FloatingPointPrecision, setFloatingPointPrecision() -*/ -QDataStream::FloatingPointPrecision QDataStream::floatingPointPrecision() const -{ - return d == 0 ? QDataStream::DoublePrecision : d->floatingPointPrecision; -} - -/*! - Sets the floating point precision of the data stream to \a precision. If the floating point precision is - DoublePrecision and the version of the data stream is Qt_4_6 or higher, all floating point - numbers will be written and read with 64-bit precision. If the floating point precision is - SinglePrecision and the version is Qt_4_6 or higher, all floating point numbers will be written - and read with 32-bit precision. - - For versions prior to Qt_4_6, the precision of floating point numbers in the data stream depends - on the stream operator called. - - The default is DoublePrecision. - - Note that this property does not affect the serialization or deserialization of \c qfloat16 - instances. - - \warning This property must be set to the same value on the object that writes and the object - that reads the data stream. - - \since 4.6 -*/ -void QDataStream::setFloatingPointPrecision(QDataStream::FloatingPointPrecision precision) -{ - if (d == 0) - d.reset(new QDataStreamPrivate()); - d->floatingPointPrecision = precision; -} - -/*! - Returns the status of the data stream. - - \sa Status, setStatus(), resetStatus() -*/ - -QDataStream::Status QDataStream::status() const -{ - return q_status; -} - -/*! - Resets the status of the data stream. - - \sa Status, status(), setStatus() -*/ -void QDataStream::resetStatus() -{ - q_status = Ok; -} - -/*! - Sets the status of the data stream to the \a status given. - - Subsequent calls to setStatus() are ignored until resetStatus() - is called. - - \sa Status, status(), resetStatus() -*/ -void QDataStream::setStatus(Status status) -{ - if (q_status == Ok) - q_status = status; -} - -/*! - \fn int QDataStream::byteOrder() const - - Returns the current byte order setting -- either BigEndian or - LittleEndian. - - \sa setByteOrder() -*/ - -/*! - Sets the serialization byte order to \a bo. - - The \a bo parameter can be QDataStream::BigEndian or - QDataStream::LittleEndian. - - The default setting is big endian. We recommend leaving this - setting unless you have special requirements. - - \sa byteOrder() -*/ - -void QDataStream::setByteOrder(ByteOrder bo) -{ - byteorder = bo; - if (QSysInfo::ByteOrder == QSysInfo::BigEndian) - noswap = (byteorder == BigEndian); - else - noswap = (byteorder == LittleEndian); -} - - -/*! - \enum QDataStream::Version - - This enum provides symbolic synonyms for the data serialization - format version numbers. - - \value Qt_1_0 Version 1 (Qt 1.x) - \value Qt_2_0 Version 2 (Qt 2.0) - \value Qt_2_1 Version 3 (Qt 2.1, 2.2, 2.3) - \value Qt_3_0 Version 4 (Qt 3.0) - \value Qt_3_1 Version 5 (Qt 3.1, 3.2) - \value Qt_3_3 Version 6 (Qt 3.3) - \value Qt_4_0 Version 7 (Qt 4.0, Qt 4.1) - \value Qt_4_1 Version 7 (Qt 4.0, Qt 4.1) - \value Qt_4_2 Version 8 (Qt 4.2) - \value Qt_4_3 Version 9 (Qt 4.3) - \value Qt_4_4 Version 10 (Qt 4.4) - \value Qt_4_5 Version 11 (Qt 4.5) - \value Qt_4_6 Version 12 (Qt 4.6, Qt 4.7, Qt 4.8) - \value Qt_4_7 Same as Qt_4_6. - \value Qt_4_8 Same as Qt_4_6. - \value Qt_4_9 Same as Qt_4_6. - \value Qt_5_0 Version 13 (Qt 5.0) - \value Qt_5_1 Version 14 (Qt 5.1) - \value Qt_5_2 Version 15 (Qt 5.2) - \value Qt_5_3 Same as Qt_5_2 - \value Qt_5_4 Version 16 (Qt 5.4) - \value Qt_5_5 Same as Qt_5_4 - \value Qt_5_6 Version 17 (Qt 5.6) - \value Qt_5_7 Same as Qt_5_6 - \value Qt_5_8 Same as Qt_5_6 - \value Qt_5_9 Same as Qt_5_6 - \value Qt_5_10 Same as Qt_5_6 - \omitvalue Qt_DefaultCompiledVersion - - \sa setVersion(), version() -*/ - -/*! - \fn int QDataStream::version() const - - Returns the version number of the data serialization format. - - \sa setVersion(), Version -*/ - -/*! - \fn void QDataStream::setVersion(int v) - - Sets the version number of the data serialization format to \a v, - a value of the \l Version enum. - - You don't \e have to set a version if you are using the current - version of Qt, but for your own custom binary formats we - recommend that you do; see \l{Versioning} in the Detailed - Description. - - To accommodate new functionality, the datastream serialization - format of some Qt classes has changed in some versions of Qt. If - you want to read data that was created by an earlier version of - Qt, or write data that can be read by a program that was compiled - with an earlier version of Qt, use this function to modify the - serialization format used by QDataStream. - - The \l Version enum provides symbolic constants for the different - versions of Qt. For example: - - \snippet code/src_corelib_io_qdatastream.cpp 5 - - \sa version(), Version -*/ - -/*! - \since 5.7 - - Starts a new read transaction on the stream. - - Defines a restorable point within the sequence of read operations. For - sequential devices, read data will be duplicated internally to allow - recovery in case of incomplete reads. For random-access devices, - this function saves the current position of the stream. Call - commitTransaction(), rollbackTransaction(), or abortTransaction() to - finish the current transaction. - - Once a transaction is started, subsequent calls to this function will make - the transaction recursive. Inner transactions act as agents of the - outermost transaction (i.e., report the status of read operations to the - outermost transaction, which can restore the position of the stream). - - \note Restoring to the point of the nested startTransaction() call is not - supported. - - When an error occurs during a transaction (including an inner transaction - failing), reading from the data stream is suspended (all subsequent read - operations return empty/zero values) and subsequent inner transactions are - forced to fail. Starting a new outermost transaction recovers from this - state. This behavior makes it unnecessary to error-check every read - operation separately. - - \sa commitTransaction(), rollbackTransaction(), abortTransaction() -*/ - -void QDataStream::startTransaction() -{ - CHECK_STREAM_PRECOND(Q_VOID) - - if (d == 0) - d.reset(new QDataStreamPrivate()); - - if (++d->transactionDepth == 1) { - dev->startTransaction(); - resetStatus(); - } -} - -/*! - \since 5.7 - - Completes a read transaction. Returns \c true if no read errors have - occurred during the transaction; otherwise returns \c false. - - If called on an inner transaction, committing will be postponed until - the outermost commitTransaction(), rollbackTransaction(), or - abortTransaction() call occurs. - - Otherwise, if the stream status indicates reading past the end of the - data, this function restores the stream data to the point of the - startTransaction() call. When this situation occurs, you need to wait for - more data to arrive, after which you start a new transaction. If the data - stream has read corrupt data or any of the inner transactions was aborted, - this function aborts the transaction. - - \sa startTransaction(), rollbackTransaction(), abortTransaction() -*/ - -bool QDataStream::commitTransaction() -{ - CHECK_STREAM_TRANSACTION_PRECOND(false) - if (--d->transactionDepth == 0) { - CHECK_STREAM_PRECOND(false) - - if (q_status == ReadPastEnd) { - dev->rollbackTransaction(); - return false; - } - dev->commitTransaction(); - } - return q_status == Ok; -} - -/*! - \since 5.7 - - Reverts a read transaction. - - This function is commonly used to rollback the transaction when an - incomplete read was detected prior to committing the transaction. - - If called on an inner transaction, reverting is delegated to the outermost - transaction, and subsequently started inner transactions are forced to - fail. - - For the outermost transaction, restores the stream data to the point of - the startTransaction() call. If the data stream has read corrupt data or - any of the inner transactions was aborted, this function aborts the - transaction. - - If the preceding stream operations were successful, sets the status of the - data stream to \value ReadPastEnd. - - \sa startTransaction(), commitTransaction(), abortTransaction() -*/ - -void QDataStream::rollbackTransaction() -{ - setStatus(ReadPastEnd); - - CHECK_STREAM_TRANSACTION_PRECOND(Q_VOID) - if (--d->transactionDepth != 0) - return; - - CHECK_STREAM_PRECOND(Q_VOID) - if (q_status == ReadPastEnd) - dev->rollbackTransaction(); - else - dev->commitTransaction(); -} - -/*! - \since 5.7 - - Aborts a read transaction. - - This function is commonly used to discard the transaction after - higher-level protocol errors or loss of stream synchronization. - - If called on an inner transaction, aborting is delegated to the outermost - transaction, and subsequently started inner transactions are forced to - fail. - - For the outermost transaction, discards the restoration point and any - internally duplicated data of the stream. Will not affect the current - read position of the stream. - - Sets the status of the data stream to \value ReadCorruptData. - - \sa startTransaction(), commitTransaction(), rollbackTransaction() -*/ - -void QDataStream::abortTransaction() -{ - q_status = ReadCorruptData; - - CHECK_STREAM_TRANSACTION_PRECOND(Q_VOID) - if (--d->transactionDepth != 0) - return; - - CHECK_STREAM_PRECOND(Q_VOID) - dev->commitTransaction(); -} - -/***************************************************************************** - QDataStream read functions - *****************************************************************************/ - -/*! - \internal -*/ - -int QDataStream::readBlock(char *data, int len) -{ - // Disable reads on failure in transacted stream - if (q_status != Ok && dev->isTransactionStarted()) - return -1; - - const int readResult = dev->read(data, len); - if (readResult != len) - setStatus(ReadPastEnd); - return readResult; -} - -/*! - \fn QDataStream &QDataStream::operator>>(std::nullptr &ptr) - \since 5.9 - \overload - - Simulates reading a \c{std::nullptr_t} from the stream into \a ptr and - returns a reference to the stream. This function does not actually read - anything from the stream, as \c{std::nullptr_t} values are stored as 0 - bytes. -*/ - -/*! - \fn QDataStream &QDataStream::operator>>(quint8 &i) - \overload - - Reads an unsigned byte from the stream into \a i, and returns a - reference to the stream. -*/ - -/*! - Reads a signed byte from the stream into \a i, and returns a - reference to the stream. -*/ - -QDataStream &QDataStream::operator>>(qint8 &i) -{ - i = 0; - CHECK_STREAM_PRECOND(*this) - char c; - if (readBlock(&c, 1) == 1) - i = qint8(c); - return *this; -} - - -/*! - \fn QDataStream &QDataStream::operator>>(quint16 &i) - \overload - - Reads an unsigned 16-bit integer from the stream into \a i, and - returns a reference to the stream. -*/ - -/*! - \overload - - Reads a signed 16-bit integer from the stream into \a i, and - returns a reference to the stream. -*/ - -QDataStream &QDataStream::operator>>(qint16 &i) -{ - i = 0; - CHECK_STREAM_PRECOND(*this) - if (readBlock(reinterpret_cast<char *>(&i), 2) != 2) { - i = 0; - } else { - if (!noswap) { - i = qbswap(i); - } - } - return *this; -} - - -/*! - \fn QDataStream &QDataStream::operator>>(quint32 &i) - \overload - - Reads an unsigned 32-bit integer from the stream into \a i, and - returns a reference to the stream. -*/ - -/*! - \overload - - Reads a signed 32-bit integer from the stream into \a i, and - returns a reference to the stream. -*/ - -QDataStream &QDataStream::operator>>(qint32 &i) -{ - i = 0; - CHECK_STREAM_PRECOND(*this) - if (readBlock(reinterpret_cast<char *>(&i), 4) != 4) { - i = 0; - } else { - if (!noswap) { - i = qbswap(i); - } - } - return *this; -} - -/*! - \fn QDataStream &QDataStream::operator>>(quint64 &i) - \overload - - Reads an unsigned 64-bit integer from the stream, into \a i, and - returns a reference to the stream. -*/ - -/*! - \overload - - Reads a signed 64-bit integer from the stream into \a i, and - returns a reference to the stream. -*/ - -QDataStream &QDataStream::operator>>(qint64 &i) -{ - i = qint64(0); - CHECK_STREAM_PRECOND(*this) - if (version() < 6) { - quint32 i1, i2; - *this >> i2 >> i1; - i = ((quint64)i1 << 32) + i2; - } else { - if (readBlock(reinterpret_cast<char *>(&i), 8) != 8) { - i = qint64(0); - } else { - if (!noswap) { - i = qbswap(i); - } - } - } - return *this; -} - -/*! - Reads a boolean value from the stream into \a i. Returns a - reference to the stream. -*/ -QDataStream &QDataStream::operator>>(bool &i) -{ - qint8 v; - *this >> v; - i = !!v; - return *this; -} - -/*! - \overload - - Reads a floating point number from the stream into \a f, - using the standard IEEE 754 format. Returns a reference to the - stream. - - \sa setFloatingPointPrecision() -*/ - -QDataStream &QDataStream::operator>>(float &f) -{ - if (version() >= QDataStream::Qt_4_6 - && floatingPointPrecision() == QDataStream::DoublePrecision) { - double d; - *this >> d; - f = d; - return *this; - } - - f = 0.0f; - CHECK_STREAM_PRECOND(*this) - if (readBlock(reinterpret_cast<char *>(&f), 4) != 4) { - f = 0.0f; - } else { - if (!noswap) { - union { - float val1; - quint32 val2; - } x; - x.val2 = qbswap(*reinterpret_cast<quint32 *>(&f)); - f = x.val1; - } - } - return *this; -} - -/*! - \overload - - Reads a floating point number from the stream into \a f, - using the standard IEEE 754 format. Returns a reference to the - stream. - - \sa setFloatingPointPrecision() -*/ - -QDataStream &QDataStream::operator>>(double &f) -{ - if (version() >= QDataStream::Qt_4_6 - && floatingPointPrecision() == QDataStream::SinglePrecision) { - float d; - *this >> d; - f = d; - return *this; - } - - f = 0.0; - CHECK_STREAM_PRECOND(*this) - if (readBlock(reinterpret_cast<char *>(&f), 8) != 8) { - f = 0.0; - } else { - if (!noswap) { - union { - double val1; - quint64 val2; - } x; - x.val2 = qbswap(*reinterpret_cast<quint64 *>(&f)); - f = x.val1; - } - } - return *this; -} - - -/*! - \overload - \since 5.9 - - Reads a floating point number from the stream into \a f, - using the standard IEEE 754 format. Returns a reference to the - stream. -*/ -QDataStream &QDataStream::operator>>(qfloat16 &f) -{ - return *this >> reinterpret_cast<qint16&>(f); -} - - -/*! - \overload - - Reads the '\\0'-terminated string \a s from the stream and returns - a reference to the stream. - - The string is deserialized using \c{readBytes()}. - - Space for the string is allocated using \c{new []} -- the caller must - destroy it with \c{delete []}. - - \sa readBytes(), readRawData() -*/ - -QDataStream &QDataStream::operator>>(char *&s) -{ - uint len = 0; - return readBytes(s, len); -} - - -/*! - Reads the buffer \a s from the stream and returns a reference to - the stream. - - The buffer \a s is allocated using \c{new []}. Destroy it with the - \c{delete []} operator. - - The \a l parameter is set to the length of the buffer. If the - string read is empty, \a l is set to 0 and \a s is set to - a null pointer. - - The serialization format is a quint32 length specifier first, - then \a l bytes of data. - - \sa readRawData(), writeBytes() -*/ - -QDataStream &QDataStream::readBytes(char *&s, uint &l) -{ - s = 0; - l = 0; - CHECK_STREAM_PRECOND(*this) - - quint32 len; - *this >> len; - if (len == 0) - return *this; - - const quint32 Step = 1024 * 1024; - quint32 allocated = 0; - char *prevBuf = 0; - char *curBuf = 0; - - do { - int blockSize = qMin(Step, len - allocated); - prevBuf = curBuf; - curBuf = new char[allocated + blockSize + 1]; - if (prevBuf) { - memcpy(curBuf, prevBuf, allocated); - delete [] prevBuf; - } - if (readBlock(curBuf + allocated, blockSize) != blockSize) { - delete [] curBuf; - return *this; - } - allocated += blockSize; - } while (allocated < len); - - s = curBuf; - s[len] = '\0'; - l = (uint)len; - return *this; -} - -/*! - Reads at most \a len bytes from the stream into \a s and returns the number of - bytes read. If an error occurs, this function returns -1. - - The buffer \a s must be preallocated. The data is \e not encoded. - - \sa readBytes(), QIODevice::read(), writeRawData() -*/ - -int QDataStream::readRawData(char *s, int len) -{ - CHECK_STREAM_PRECOND(-1) - return readBlock(s, len); -} - - -/***************************************************************************** - QDataStream write functions - *****************************************************************************/ - -/*! - \fn QDataStream &QDataStream::operator<<(std::nullptr ptr) - \since 5.9 - \overload - - Simulates writing a \c{std::nullptr_t}, \a ptr, to the stream and returns a - reference to the stream. This function does not actually write anything to - the stream, as \c{std::nullptr_t} values are stored as 0 bytes. -*/ - -/*! - \fn QDataStream &QDataStream::operator<<(quint8 i) - \overload - - Writes an unsigned byte, \a i, to the stream and returns a - reference to the stream. -*/ - -/*! - Writes a signed byte, \a i, to the stream and returns a reference - to the stream. -*/ - -QDataStream &QDataStream::operator<<(qint8 i) -{ - CHECK_STREAM_WRITE_PRECOND(*this) - if (!dev->putChar(i)) - q_status = WriteFailed; - return *this; -} - - -/*! - \fn QDataStream &QDataStream::operator<<(quint16 i) - \overload - - Writes an unsigned 16-bit integer, \a i, to the stream and returns - a reference to the stream. -*/ - -/*! - \overload - - Writes a signed 16-bit integer, \a i, to the stream and returns a - reference to the stream. -*/ - -QDataStream &QDataStream::operator<<(qint16 i) -{ - CHECK_STREAM_WRITE_PRECOND(*this) - if (!noswap) { - i = qbswap(i); - } - if (dev->write((char *)&i, sizeof(qint16)) != sizeof(qint16)) - q_status = WriteFailed; - return *this; -} - -/*! - \overload - - Writes a signed 32-bit integer, \a i, to the stream and returns a - reference to the stream. -*/ - -QDataStream &QDataStream::operator<<(qint32 i) -{ - CHECK_STREAM_WRITE_PRECOND(*this) - if (!noswap) { - i = qbswap(i); - } - if (dev->write((char *)&i, sizeof(qint32)) != sizeof(qint32)) - q_status = WriteFailed; - return *this; -} - -/*! - \fn QDataStream &QDataStream::operator<<(quint64 i) - \overload - - Writes an unsigned 64-bit integer, \a i, to the stream and returns a - reference to the stream. -*/ - -/*! - \overload - - Writes a signed 64-bit integer, \a i, to the stream and returns a - reference to the stream. -*/ - -QDataStream &QDataStream::operator<<(qint64 i) -{ - CHECK_STREAM_WRITE_PRECOND(*this) - if (version() < 6) { - quint32 i1 = i & 0xffffffff; - quint32 i2 = i >> 32; - *this << i2 << i1; - } else { - if (!noswap) { - i = qbswap(i); - } - if (dev->write((char *)&i, sizeof(qint64)) != sizeof(qint64)) - q_status = WriteFailed; - } - return *this; -} - -/*! - \fn QDataStream &QDataStream::operator<<(quint32 i) - \overload - - Writes an unsigned integer, \a i, to the stream as a 32-bit - unsigned integer (quint32). Returns a reference to the stream. -*/ - -/*! - Writes a boolean value, \a i, to the stream. Returns a reference - to the stream. -*/ - -QDataStream &QDataStream::operator<<(bool i) -{ - CHECK_STREAM_WRITE_PRECOND(*this) - if (!dev->putChar(qint8(i))) - q_status = WriteFailed; - return *this; -} - -/*! - \overload - - Writes a floating point number, \a f, to the stream using - the standard IEEE 754 format. Returns a reference to the stream. - - \sa setFloatingPointPrecision() -*/ - -QDataStream &QDataStream::operator<<(float f) -{ - if (version() >= QDataStream::Qt_4_6 - && floatingPointPrecision() == QDataStream::DoublePrecision) { - *this << double(f); - return *this; - } - - CHECK_STREAM_WRITE_PRECOND(*this) - float g = f; // fixes float-on-stack problem - if (!noswap) { - union { - float val1; - quint32 val2; - } x; - x.val1 = g; - x.val2 = qbswap(x.val2); - - if (dev->write((char *)&x.val2, sizeof(float)) != sizeof(float)) - q_status = WriteFailed; - return *this; - } - - if (dev->write((char *)&g, sizeof(float)) != sizeof(float)) - q_status = WriteFailed; - return *this; -} - - -/*! - \overload - - Writes a floating point number, \a f, to the stream using - the standard IEEE 754 format. Returns a reference to the stream. - - \sa setFloatingPointPrecision() -*/ - -QDataStream &QDataStream::operator<<(double f) -{ - if (version() >= QDataStream::Qt_4_6 - && floatingPointPrecision() == QDataStream::SinglePrecision) { - *this << float(f); - return *this; - } - - CHECK_STREAM_WRITE_PRECOND(*this) - if (noswap) { - if (dev->write((char *)&f, sizeof(double)) != sizeof(double)) - q_status = WriteFailed; - } else { - union { - double val1; - quint64 val2; - } x; - x.val1 = f; - x.val2 = qbswap(x.val2); - if (dev->write((char *)&x.val2, sizeof(double)) != sizeof(double)) - q_status = WriteFailed; - } - return *this; -} - - -/*! - \fn QDataStream &QDataStream::operator<<(qfloat16 f) - \overload - \since 5.9 - - Writes a floating point number, \a f, to the stream using - the standard IEEE 754 format. Returns a reference to the stream. -*/ -QDataStream &QDataStream::operator<<(qfloat16 f) -{ - return *this << reinterpret_cast<qint16&>(f); -} - -/*! - \overload - - Writes the '\\0'-terminated string \a s to the stream and returns a - reference to the stream. - - The string is serialized using \c{writeBytes()}. - - \sa writeBytes(), writeRawData() -*/ - -QDataStream &QDataStream::operator<<(const char *s) -{ - if (!s) { - *this << (quint32)0; - return *this; - } - uint len = qstrlen(s) + 1; // also write null terminator - *this << (quint32)len; // write length specifier - writeRawData(s, len); - return *this; -} - -/*! - Writes the length specifier \a len and the buffer \a s to the - stream and returns a reference to the stream. - - The \a len is serialized as a quint32, followed by \a len bytes - from \a s. Note that the data is \e not encoded. - - \sa writeRawData(), readBytes() -*/ - -QDataStream &QDataStream::writeBytes(const char *s, uint len) -{ - CHECK_STREAM_WRITE_PRECOND(*this) - *this << (quint32)len; // write length specifier - if (len) - writeRawData(s, len); - return *this; -} - - -/*! - Writes \a len bytes from \a s to the stream. Returns the - number of bytes actually written, or -1 on error. - The data is \e not encoded. - - \sa writeBytes(), QIODevice::write(), readRawData() -*/ - -int QDataStream::writeRawData(const char *s, int len) -{ - CHECK_STREAM_WRITE_PRECOND(-1) - int ret = dev->write(s, len); - if (ret != len) - q_status = WriteFailed; - return ret; -} - -/*! - \since 4.1 - - Skips \a len bytes from the device. Returns the number of bytes - actually skipped, or -1 on error. - - This is equivalent to calling readRawData() on a buffer of length - \a len and ignoring the buffer. - - \sa QIODevice::seek() -*/ -int QDataStream::skipRawData(int len) -{ - CHECK_STREAM_PRECOND(-1) - if (q_status != Ok && dev->isTransactionStarted()) - return -1; - - const int skipResult = dev->skip(len); - if (skipResult != len) - setStatus(ReadPastEnd); - return skipResult; -} - -QT_END_NAMESPACE - -#endif // QT_NO_DATASTREAM diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h deleted file mode 100644 index 0a429d091a..0000000000 --- a/src/corelib/io/qdatastream.h +++ /dev/null @@ -1,465 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDATASTREAM_H -#define QDATASTREAM_H - -#include <QtCore/qscopedpointer.h> -#include <QtCore/qiodevice.h> -#include <QtCore/qpair.h> - -#ifdef Status -#error qdatastream.h must be included before any header file that defines Status -#endif - -QT_BEGIN_NAMESPACE - -class qfloat16; -class QByteArray; -class QIODevice; - -template <typename T> class QList; -template <typename T> class QLinkedList; -template <typename T> class QVector; -template <typename T> class QSet; -template <class Key, class T> class QHash; -template <class Key, class T> class QMap; - -#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) -class QDataStreamPrivate; -namespace QtPrivate { -class StreamStateSaver; -} -class Q_CORE_EXPORT QDataStream -{ -public: - enum Version { - Qt_1_0 = 1, - Qt_2_0 = 2, - Qt_2_1 = 3, - Qt_3_0 = 4, - Qt_3_1 = 5, - Qt_3_3 = 6, - Qt_4_0 = 7, - Qt_4_1 = Qt_4_0, - Qt_4_2 = 8, - Qt_4_3 = 9, - Qt_4_4 = 10, - Qt_4_5 = 11, - Qt_4_6 = 12, - Qt_4_7 = Qt_4_6, - Qt_4_8 = Qt_4_7, - Qt_4_9 = Qt_4_8, - Qt_5_0 = 13, - Qt_5_1 = 14, - Qt_5_2 = 15, - Qt_5_3 = Qt_5_2, - Qt_5_4 = 16, - Qt_5_5 = Qt_5_4, - Qt_5_6 = 17, - Qt_5_7 = Qt_5_6, - Qt_5_8 = Qt_5_7, - Qt_5_9 = Qt_5_8, - Qt_5_10 = Qt_5_9, -#if QT_VERSION >= 0x050b00 -#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion -#endif - Qt_DefaultCompiledVersion = Qt_5_10 - }; - - enum ByteOrder { - BigEndian = QSysInfo::BigEndian, - LittleEndian = QSysInfo::LittleEndian - }; - - enum Status { - Ok, - ReadPastEnd, - ReadCorruptData, - WriteFailed - }; - - enum FloatingPointPrecision { - SinglePrecision, - DoublePrecision - }; - - QDataStream(); - explicit QDataStream(QIODevice *); - QDataStream(QByteArray *, QIODevice::OpenMode flags); - QDataStream(const QByteArray &); - ~QDataStream(); - - QIODevice *device() const; - void setDevice(QIODevice *); - void unsetDevice(); - - bool atEnd() const; - - Status status() const; - void setStatus(Status status); - void resetStatus(); - - FloatingPointPrecision floatingPointPrecision() const; - void setFloatingPointPrecision(FloatingPointPrecision precision); - - ByteOrder byteOrder() const; - void setByteOrder(ByteOrder); - - int version() const; - void setVersion(int); - - QDataStream &operator>>(qint8 &i); - QDataStream &operator>>(quint8 &i); - QDataStream &operator>>(qint16 &i); - QDataStream &operator>>(quint16 &i); - QDataStream &operator>>(qint32 &i); - QDataStream &operator>>(quint32 &i); - QDataStream &operator>>(qint64 &i); - QDataStream &operator>>(quint64 &i); - QDataStream &operator>>(std::nullptr_t &ptr) { ptr = nullptr; return *this; } - - QDataStream &operator>>(bool &i); - QDataStream &operator>>(qfloat16 &f); - QDataStream &operator>>(float &f); - QDataStream &operator>>(double &f); - QDataStream &operator>>(char *&str); - - QDataStream &operator<<(qint8 i); - QDataStream &operator<<(quint8 i); - QDataStream &operator<<(qint16 i); - QDataStream &operator<<(quint16 i); - QDataStream &operator<<(qint32 i); - QDataStream &operator<<(quint32 i); - QDataStream &operator<<(qint64 i); - QDataStream &operator<<(quint64 i); - QDataStream &operator<<(std::nullptr_t) { return *this; } - QDataStream &operator<<(bool i); - QDataStream &operator<<(qfloat16 f); - QDataStream &operator<<(float f); - QDataStream &operator<<(double f); - QDataStream &operator<<(const char *str); - - QDataStream &readBytes(char *&, uint &len); - int readRawData(char *, int len); - - QDataStream &writeBytes(const char *, uint len); - int writeRawData(const char *, int len); - - int skipRawData(int len); - - void startTransaction(); - bool commitTransaction(); - void rollbackTransaction(); - void abortTransaction(); - -private: - Q_DISABLE_COPY(QDataStream) - - QScopedPointer<QDataStreamPrivate> d; - - QIODevice *dev; - bool owndev; - bool noswap; - ByteOrder byteorder; - int ver; - Status q_status; - - int readBlock(char *data, int len); - friend class QtPrivate::StreamStateSaver; -}; - -namespace QtPrivate { - -class StreamStateSaver -{ -public: - inline StreamStateSaver(QDataStream *s) : stream(s), oldStatus(s->status()) - { - if (!stream->dev || !stream->dev->isTransactionStarted()) - stream->resetStatus(); - } - inline ~StreamStateSaver() - { - if (oldStatus != QDataStream::Ok) { - stream->resetStatus(); - stream->setStatus(oldStatus); - } - } - -private: - QDataStream *stream; - QDataStream::Status oldStatus; -}; - -template <typename Container> -QDataStream &readArrayBasedContainer(QDataStream &s, Container &c) -{ - StreamStateSaver stateSaver(&s); - - c.clear(); - quint32 n; - s >> n; - c.reserve(n); - for (quint32 i = 0; i < n; ++i) { - typename Container::value_type t; - s >> t; - if (s.status() != QDataStream::Ok) { - c.clear(); - break; - } - c.append(t); - } - - return s; -} - -template <typename Container> -QDataStream &readListBasedContainer(QDataStream &s, Container &c) -{ - StreamStateSaver stateSaver(&s); - - c.clear(); - quint32 n; - s >> n; - for (quint32 i = 0; i < n; ++i) { - typename Container::value_type t; - s >> t; - if (s.status() != QDataStream::Ok) { - c.clear(); - break; - } - c << t; - } - - return s; -} - -template <typename Container> -QDataStream &readAssociativeContainer(QDataStream &s, Container &c) -{ - StreamStateSaver stateSaver(&s); - - c.clear(); - quint32 n; - s >> n; - for (quint32 i = 0; i < n; ++i) { - typename Container::key_type k; - typename Container::mapped_type t; - s >> k >> t; - if (s.status() != QDataStream::Ok) { - c.clear(); - break; - } - c.insertMulti(k, t); - } - - return s; -} - -template <typename Container> -QDataStream &writeSequentialContainer(QDataStream &s, const Container &c) -{ - s << quint32(c.size()); - for (const typename Container::value_type &t : c) - s << t; - - return s; -} - -template <typename Container> -QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c) -{ - s << quint32(c.size()); - // Deserialization should occur in the reverse order. - // Otherwise, value() will return the least recently inserted - // value instead of the most recently inserted one. - auto it = c.constEnd(); - auto begin = c.constBegin(); - while (it != begin) { - --it; - s << it.key() << it.value(); - } - - return s; -} - -} // QtPrivate namespace - -/***************************************************************************** - QDataStream inline functions - *****************************************************************************/ - -inline QIODevice *QDataStream::device() const -{ return dev; } - -inline QDataStream::ByteOrder QDataStream::byteOrder() const -{ return byteorder; } - -inline int QDataStream::version() const -{ return ver; } - -inline void QDataStream::setVersion(int v) -{ ver = v; } - -inline QDataStream &QDataStream::operator>>(quint8 &i) -{ return *this >> reinterpret_cast<qint8&>(i); } - -inline QDataStream &QDataStream::operator>>(quint16 &i) -{ return *this >> reinterpret_cast<qint16&>(i); } - -inline QDataStream &QDataStream::operator>>(quint32 &i) -{ return *this >> reinterpret_cast<qint32&>(i); } - -inline QDataStream &QDataStream::operator>>(quint64 &i) -{ return *this >> reinterpret_cast<qint64&>(i); } - -inline QDataStream &QDataStream::operator<<(quint8 i) -{ return *this << qint8(i); } - -inline QDataStream &QDataStream::operator<<(quint16 i) -{ return *this << qint16(i); } - -inline QDataStream &QDataStream::operator<<(quint32 i) -{ return *this << qint32(i); } - -inline QDataStream &QDataStream::operator<<(quint64 i) -{ return *this << qint64(i); } - -template <typename Enum> -inline QDataStream &operator<<(QDataStream &s, QFlags<Enum> e) -{ return s << e.i; } - -template <typename Enum> -inline QDataStream &operator>>(QDataStream &s, QFlags<Enum> &e) -{ return s >> e.i; } - -template <typename T> -inline QDataStream &operator>>(QDataStream &s, QList<T> &l) -{ - return QtPrivate::readArrayBasedContainer(s, l); -} - -template <typename T> -inline QDataStream &operator<<(QDataStream &s, const QList<T> &l) -{ - return QtPrivate::writeSequentialContainer(s, l); -} - -template <typename T> -inline QDataStream &operator>>(QDataStream &s, QLinkedList<T> &l) -{ - return QtPrivate::readListBasedContainer(s, l); -} - -template <typename T> -inline QDataStream &operator<<(QDataStream &s, const QLinkedList<T> &l) -{ - return QtPrivate::writeSequentialContainer(s, l); -} - -template<typename T> -inline QDataStream &operator>>(QDataStream &s, QVector<T> &v) -{ - return QtPrivate::readArrayBasedContainer(s, v); -} - -template<typename T> -inline QDataStream &operator<<(QDataStream &s, const QVector<T> &v) -{ - return QtPrivate::writeSequentialContainer(s, v); -} - -template <typename T> -inline QDataStream &operator>>(QDataStream &s, QSet<T> &set) -{ - return QtPrivate::readListBasedContainer(s, set); -} - -template <typename T> -inline QDataStream &operator<<(QDataStream &s, const QSet<T> &set) -{ - return QtPrivate::writeSequentialContainer(s, set); -} - -template <class Key, class T> -inline QDataStream &operator>>(QDataStream &s, QHash<Key, T> &hash) -{ - return QtPrivate::readAssociativeContainer(s, hash); -} - -template <class Key, class T> -inline QDataStream &operator<<(QDataStream &s, const QHash<Key, T> &hash) -{ - return QtPrivate::writeAssociativeContainer(s, hash); -} - -template <class Key, class T> -inline QDataStream &operator>>(QDataStream &s, QMap<Key, T> &map) -{ - return QtPrivate::readAssociativeContainer(s, map); -} - -template <class Key, class T> -inline QDataStream &operator<<(QDataStream &s, const QMap<Key, T> &map) -{ - return QtPrivate::writeAssociativeContainer(s, map); -} - -#ifndef QT_NO_DATASTREAM -template <class T1, class T2> -inline QDataStream& operator>>(QDataStream& s, QPair<T1, T2>& p) -{ - s >> p.first >> p.second; - return s; -} - -template <class T1, class T2> -inline QDataStream& operator<<(QDataStream& s, const QPair<T1, T2>& p) -{ - s << p.first << p.second; - return s; -} -#endif - -#endif // QT_NO_DATASTREAM - -QT_END_NAMESPACE - -#endif // QDATASTREAM_H diff --git a/src/corelib/io/qdatastream_p.h b/src/corelib/io/qdatastream_p.h deleted file mode 100644 index 3ca0ae840e..0000000000 --- a/src/corelib/io/qdatastream_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDATASTREAM_P_H -#define QDATASTREAM_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/private/qglobal_p.h> -#include <qdatastream.h> - -QT_BEGIN_NAMESPACE - -#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) -class QDataStreamPrivate -{ -public: - QDataStreamPrivate() : floatingPointPrecision(QDataStream::DoublePrecision), - transactionDepth(0) { } - - QDataStream::FloatingPointPrecision floatingPointPrecision; - int transactionDepth; -}; -#endif - -QT_END_NAMESPACE - -#endif // QDATASTREAM_P_H diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 341400fd93..0d9a6c8749 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -121,15 +121,15 @@ using QtMiscUtils::fromHex; */ /*! - \fn QDebug::QDebug(QtMsgType type) + \fn QDebug::QDebug(QtMsgType t) - Constructs a debug stream that writes to the handler for the message type specified by \a type. + Constructs a debug stream that writes to the handler for the message type \a t. */ /*! - \fn QDebug::QDebug(const QDebug &other) + \fn QDebug::QDebug(const QDebug &o) - Constructs a copy of the \a other debug stream. + Constructs a copy of the other debug stream \a o. */ /*! @@ -501,79 +501,79 @@ QDebug &QDebug::resetFormat() */ /*! - \fn QDebug &QDebug::operator<<(signed short i) + \fn QDebug &QDebug::operator<<(signed short t) - Writes the signed short integer, \a i, to the stream and returns a reference + Writes the signed short integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(unsigned short i) + \fn QDebug &QDebug::operator<<(unsigned short t) - Writes then unsigned short integer, \a i, to the stream and returns a + Writes then unsigned short integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(signed int i) + \fn QDebug &QDebug::operator<<(signed int t) - Writes the signed integer, \a i, to the stream and returns a reference + Writes the signed integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(unsigned int i) + \fn QDebug &QDebug::operator<<(unsigned int t) - Writes then unsigned integer, \a i, to the stream and returns a reference to + Writes then unsigned integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(signed long l) + \fn QDebug &QDebug::operator<<(signed long t) - Writes the signed long integer, \a l, to the stream and returns a reference + Writes the signed long integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(unsigned long l) + \fn QDebug &QDebug::operator<<(unsigned long t) - Writes then unsigned long integer, \a l, to the stream and returns a reference + Writes then unsigned long integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(qint64 i) + \fn QDebug &QDebug::operator<<(qint64 t) - Writes the signed 64-bit integer, \a i, to the stream and returns a reference + Writes the signed 64-bit integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(quint64 i) + \fn QDebug &QDebug::operator<<(quint64 t) - Writes then unsigned 64-bit integer, \a i, to the stream and returns a + Writes then unsigned 64-bit integer, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(float f) + \fn QDebug &QDebug::operator<<(float t) - Writes the 32-bit floating point number, \a f, to the stream and returns a + Writes the 32-bit floating point number, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(double f) + \fn QDebug &QDebug::operator<<(double t) - Writes the 64-bit floating point number, \a f, to the stream and returns a + Writes the 64-bit floating point number, \a t, to the stream and returns a reference to the stream. */ /*! - \fn QDebug &QDebug::operator<<(const char *s) + \fn QDebug &QDebug::operator<<(const char *t) - Writes the '\\0'-terminated string, \a s, to the stream and returns a + Writes the '\\0'-terminated string, \a t, to the stream and returns a reference to the stream. The string is never quoted nor transformed to the output, but note that some QDebug backends might not be 8-bit clean. */ @@ -595,9 +595,9 @@ QDebug &QDebug::resetFormat() */ /*! - \fn QDebug &QDebug::operator<<(const QString &s) + \fn QDebug &QDebug::operator<<(const QString &t) - Writes the string, \a s, to the stream and returns a reference to the + Writes the string, \a t, to the stream and returns a reference to the stream. Normally, QDebug prints the string inside quotes and transforms non-printable characters to their Unicode values (\\u1234). @@ -634,9 +634,9 @@ QDebug &QDebug::resetFormat() */ /*! - \fn QDebug &QDebug::operator<<(const QStringRef &s) + \fn QDebug &QDebug::operator<<(const QStringRef &t) - Writes the string, \a s, to the stream and returns a reference to the + Writes the string, \a t, to the stream and returns a reference to the stream. Normally, QDebug prints the string inside quotes and transforms non-printable characters to their Unicode values (\\u1234). @@ -663,9 +663,9 @@ QDebug &QDebug::resetFormat() */ /*! - \fn QDebug &QDebug::operator<<(QLatin1String s) + \fn QDebug &QDebug::operator<<(QLatin1String t) - Writes the string, \a s, to the stream and returns a reference to the + Writes the string, \a t, to the stream and returns a reference to the stream. Normally, QDebug prints the string inside quotes and transforms non-printable characters to their Unicode values (\\u1234). @@ -677,9 +677,9 @@ QDebug &QDebug::resetFormat() */ /*! - \fn QDebug &QDebug::operator<<(const QByteArray &b) + \fn QDebug &QDebug::operator<<(const QByteArray &t) - Writes the byte array, \a b, to the stream and returns a reference to the + Writes the byte array, \a t, to the stream and returns a reference to the stream. Normally, QDebug prints the array inside quotes and transforms control or non-US-ASCII characters to their C escape sequences (\\xAB). This way, the output is always 7-bit clean and the string can be copied from the @@ -716,9 +716,9 @@ QDebug &QDebug::resetFormat() */ /*! - \fn QDebug &QDebug::operator<<(const void *p) + \fn QDebug &QDebug::operator<<(const void *t) - Writes a pointer, \a p, to the stream and returns a reference to the stream. + Writes a pointer, \a t, to the stream and returns a reference to the stream. */ /*! @@ -732,99 +732,99 @@ QDebug &QDebug::resetFormat() */ /*! - \fn QDebug operator<<(QDebug stream, const QList<T> &list) + \fn template <class T> QDebug operator<<(QDebug debug, const QList<T> &list) \relates QDebug - Writes the contents of \a list to \a stream. \c T needs to + Writes the contents of \a list to \a debug. \c T needs to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const std::list<T, Alloc> &list) + \fn template <typename T, typename Alloc> QDebug operator<<(QDebug debug, const std::list<T, Alloc> &vec) \relates QDebug \since 5.7 - Writes the contents of \a list to \a stream. \c T needs to + Writes the contents of list \a vec to \a debug. \c T needs to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const QVector<T> &vector) + \fn template <typename T> QDebug operator<<(QDebug debug, const QVector<T> &vec) \relates QDebug - Writes the contents of \a vector to \a stream. \c T needs to + Writes the contents of vector \a vec to \a debug. \c T needs to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const std::vector<T, Alloc> &vector) + \fn template <typename T, typename Alloc> QDebug operator<<(QDebug debug, const std::vector<T, Alloc> &vec) \relates QDebug \since 5.7 - Writes the contents of \a vector to \a stream. \c T needs to + Writes the contents of vector \a vec to \a debug. \c T needs to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const QSet<T> &set) + \fn template <typename T> QDebug operator<<(QDebug debug, const QSet<T> &set) \relates QDebug - Writes the contents of \a set to \a stream. \c T needs to + Writes the contents of \a set to \a debug. \c T needs to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const QMap<Key, T> &map) + \fn template <class Key, class T> QDebug operator<<(QDebug debug, const QMap<Key, T> &map) \relates QDebug - Writes the contents of \a map to \a stream. Both \c Key and + Writes the contents of \a map to \a debug. Both \c Key and \c T need to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const std::map<Key, T, Compare, Alloc> &map) + \fn template <typename Key, typename T, typename Compare, typename Alloc> QDebug operator<<(QDebug debug, const std::map<Key, T, Compare, Alloc> &map) \relates QDebug \since 5.7 - Writes the contents of \a map to \a stream. Both \c Key and + Writes the contents of \a map to \a debug. Both \c Key and \c T need to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const std::multimap<Key, T, Compare, Alloc> &map) + \fn template <typename Key, typename T, typename Compare, typename Alloc> QDebug operator<<(QDebug debug, const std::multimap<Key, T, Compare, Alloc> &map) \relates QDebug \since 5.7 - Writes the contents of \a map to \a stream. Both \c Key and + Writes the contents of \a map to \a debug. Both \c Key and \c T need to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const QHash<Key, T> &hash) + \fn template <class Key, class T> QDebug operator<<(QDebug debug, const QHash<Key, T> &hash) \relates QDebug - Writes the contents of \a hash to \a stream. Both \c Key and + Writes the contents of \a hash to \a debug. Both \c Key and \c T need to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const QPair<T1, T2> &pair) + \fn template <class T1, class T2> QDebug operator<<(QDebug debug, const QPair<T1, T2> &pair) \relates QDebug - Writes the contents of \a pair to \a stream. Both \c T1 and + Writes the contents of \a pair to \a debug. Both \c T1 and \c T2 need to support streaming into QDebug. */ /*! - \fn QDebug operator<<(QDebug stream, const QFlags<T> &flag) + \fn template<typename T> QDebug operator<<(QDebug debug, const QFlags<T> &flags) \relates QDebug \since 4.7 - Writes \a flag to \a stream. + Writes \a flags to \a debug. */ /*! - \fn QDebug operator<<(QDebug debug, const QSharedPointer<T> &ptr) + \fn template<typename T> QDebug operator<<(QDebug debug, const QSharedPointer<T> &ptr) \relates QSharedPointer \since 5.7 @@ -835,6 +835,11 @@ QDebug &QDebug::resetFormat() */ /*! + \fn QDebug &QDebug::operator<<(std::nullptr_t) + \internal + */ + +/*! \class QDebugStateSaver \inmodule QtCore \brief Convenience class for custom QDebug operators diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 6d144cb65d..520f98b18f 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2087,6 +2087,7 @@ bool QDir::match(const QString &filter, const QString &fileName) #endif // QT_NO_REGEXP /*! + \internal Returns \a path with redundant directory separators removed, and "."s and ".."s resolved (as far as possible). diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index e4888e9523..33b0b2eb66 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -893,9 +893,9 @@ bool QFile::open(OpenMode mode) qWarning("QFile::open: File (%s) already open", qPrintable(fileName())); return false; } - if (mode & Append) + // Either Append or NewOnly implies WriteOnly + if (mode & (Append | NewOnly)) mode |= WriteOnly; - unsetError(); if ((mode & (ReadOnly | WriteOnly)) == 0) { qWarning("QIODevice::open: File access not specified"); @@ -965,7 +965,8 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags) qWarning("QFile::open: File (%s) already open", qPrintable(fileName())); return false; } - if (mode & Append) + // Either Append or NewOnly implies WriteOnly + if (mode & (Append | NewOnly)) mode |= WriteOnly; unsetError(); if ((mode & (ReadOnly | WriteOnly)) == 0) { @@ -1023,7 +1024,8 @@ bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags) qWarning("QFile::open: File (%s) already open", qPrintable(fileName())); return false; } - if (mode & Append) + // Either Append or NewOnly implies WriteOnly + if (mode & (Append | NewOnly)) mode |= WriteOnly; unsetError(); if ((mode & (ReadOnly | WriteOnly)) == 0) { diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index c5819e8076..e6f3d942fe 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -70,7 +70,7 @@ public: #endif ~QFile(); - QString fileName() const Q_DECL_OVERRIDE; + QString fileName() const override; void setFileName(const QString &name); #if defined(Q_OS_DARWIN) @@ -124,25 +124,25 @@ public: bool copy(const QString &newName); static bool copy(const QString &fileName, const QString &newName); - bool open(OpenMode flags) Q_DECL_OVERRIDE; + bool open(OpenMode flags) override; bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); - qint64 size() const Q_DECL_OVERRIDE; + qint64 size() const override; - bool resize(qint64 sz) Q_DECL_OVERRIDE; + bool resize(qint64 sz) override; static bool resize(const QString &filename, qint64 sz); - Permissions permissions() const Q_DECL_OVERRIDE; + Permissions permissions() const override; static Permissions permissions(const QString &filename); - bool setPermissions(Permissions permissionSpec) Q_DECL_OVERRIDE; + bool setPermissions(Permissions permissionSpec) override; static bool setPermissions(const QString &filename, Permissions permissionSpec); protected: #ifdef QT_NO_QOBJECT QFile(QFilePrivate &dd); #else - QFile(QFilePrivate &dd, QObject *parent = Q_NULLPTR); + QFile(QFilePrivate &dd, QObject *parent = nullptr); #endif private: diff --git a/src/corelib/io/qfiledevice.h b/src/corelib/io/qfiledevice.h index e941781c25..af41bec2f6 100644 --- a/src/corelib/io/qfiledevice.h +++ b/src/corelib/io/qfiledevice.h @@ -100,19 +100,19 @@ public: FileError error() const; void unsetError(); - virtual void close() Q_DECL_OVERRIDE; + virtual void close() override; - bool isSequential() const Q_DECL_OVERRIDE; + bool isSequential() const override; int handle() const; virtual QString fileName() const; - qint64 pos() const Q_DECL_OVERRIDE; - bool seek(qint64 offset) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; + qint64 pos() const override; + bool seek(qint64 offset) override; + bool atEnd() const override; bool flush(); - qint64 size() const Q_DECL_OVERRIDE; + qint64 size() const override; virtual bool resize(qint64 sz); virtual Permissions permissions() const; @@ -136,12 +136,12 @@ protected: QFileDevice(QFileDevicePrivate &dd); #else explicit QFileDevice(QObject *parent); - QFileDevice(QFileDevicePrivate &dd, QObject *parent = Q_NULLPTR); + QFileDevice(QFileDevicePrivate &dd, QObject *parent = nullptr); #endif - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; - qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; + qint64 readLineData(char *data, qint64 maxlen) override; private: Q_DISABLE_COPY(QFileDevice) diff --git a/src/corelib/io/qfiledevice_p.h b/src/corelib/io/qfiledevice_p.h index 60c51afb7e..47053d01b7 100644 --- a/src/corelib/io/qfiledevice_p.h +++ b/src/corelib/io/qfiledevice_p.h @@ -69,7 +69,7 @@ protected: inline bool ensureFlushed() const; - bool putCharHelper(char c) Q_DECL_OVERRIDE; + bool putCharHelper(char c) override; void setError(QFileDevice::FileError err); void setError(QFileDevice::FileError err, const QString &errorString); diff --git a/src/corelib/io/qfileselector.h b/src/corelib/io/qfileselector.h index fafb7f7609..c9c2f564f6 100644 --- a/src/corelib/io/qfileselector.h +++ b/src/corelib/io/qfileselector.h @@ -50,7 +50,7 @@ class Q_CORE_EXPORT QFileSelector : public QObject { Q_OBJECT public: - explicit QFileSelector(QObject *parent = Q_NULLPTR); + explicit QFileSelector(QObject *parent = nullptr); ~QFileSelector(); QString select(const QString &filePath) const; diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp index 0d1438f137..a9acf542d4 100644 --- a/src/corelib/io/qfilesystemiterator_unix.cpp +++ b/src/corelib/io/qfilesystemiterator_unix.cpp @@ -77,12 +77,19 @@ bool QFileSystemIterator::advance(QFileSystemEntry &fileEntry, QFileSystemMetaDa if (!dir) return false; - dirEntry = QT_READDIR(dir); + for (;;) { + dirEntry = QT_READDIR(dir); - if (dirEntry) { - fileEntry = QFileSystemEntry(nativePath + QByteArray(dirEntry->d_name), QFileSystemEntry::FromNativePath()); - metaData.fillFromDirEnt(*dirEntry); - return true; + if (dirEntry) { + // process entries with correct UTF-8 names only + if (QFile::encodeName(QFile::decodeName(dirEntry->d_name)) == dirEntry->d_name) { + fileEntry = QFileSystemEntry(nativePath + QByteArray(dirEntry->d_name), QFileSystemEntry::FromNativePath()); + metaData.fillFromDirEnt(*dirEntry); + return true; + } + } else { + break; + } } lastError = errno; diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index 09d4e8e65e..057a20672c 100644 --- a/src/corelib/io/qfilesystemwatcher.h +++ b/src/corelib/io/qfilesystemwatcher.h @@ -55,8 +55,8 @@ class Q_CORE_EXPORT QFileSystemWatcher : public QObject Q_DECLARE_PRIVATE(QFileSystemWatcher) public: - QFileSystemWatcher(QObject *parent = Q_NULLPTR); - QFileSystemWatcher(const QStringList &paths, QObject *parent = Q_NULLPTR); + QFileSystemWatcher(QObject *parent = nullptr); + QFileSystemWatcher(const QStringList &paths, QObject *parent = nullptr); ~QFileSystemWatcher(); bool addPath(const QString &file); diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm index b4517cbac7..792ea387ac 100644 --- a/src/corelib/io/qfilesystemwatcher_fsevents.mm +++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm @@ -336,7 +336,7 @@ QStringList QFseventsFileSystemWatcherEngine::addPaths(const QStringList &paths, QMutexLocker locker(&lock); - bool wasRunning = stream != Q_NULLPTR; + bool wasRunning = stream != nullptr; bool needsRestart = false; WatchingState oldState = watchingState; diff --git a/src/corelib/io/qfilesystemwatcher_inotify_p.h b/src/corelib/io/qfilesystemwatcher_inotify_p.h index 777d62dc8a..0c873466c8 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify_p.h +++ b/src/corelib/io/qfilesystemwatcher_inotify_p.h @@ -70,8 +70,8 @@ public: static QInotifyFileSystemWatcherEngine *create(QObject *parent); - QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; - QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; + QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override; + QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override; private Q_SLOTS: void readFromInotify(); diff --git a/src/corelib/io/qfilesystemwatcher_polling_p.h b/src/corelib/io/qfilesystemwatcher_polling_p.h index 6dff08ac05..4c46633fdf 100644 --- a/src/corelib/io/qfilesystemwatcher_polling_p.h +++ b/src/corelib/io/qfilesystemwatcher_polling_p.h @@ -110,8 +110,8 @@ class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine public: QPollingFileSystemWatcherEngine(QObject *parent); - QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; - QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; + QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override; + QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override; private Q_SLOTS: void timeout(); diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index b7a5440224..387990ed79 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -165,6 +165,35 @@ QFSFileEngine::QFSFileEngine(QFSFileEnginePrivate &dd) } /*! + \internal +*/ +bool QFSFileEngine::processOpenModeFlags(QIODevice::OpenMode *mode) +{ + QIODevice::OpenMode &openMode = *mode; + if ((openMode & QFile::NewOnly) && (openMode & QFile::ExistingOnly)) { + qWarning("NewOnly and ExistingOnly are mutually exclusive"); + setError(QFile::OpenError, QLatin1String("NewOnly and ExistingOnly are mutually exclusive")); + return false; + } + + if ((openMode & QFile::ExistingOnly) && !(openMode & (QFile::ReadOnly | QFile::WriteOnly))) { + qWarning("ExistingOnly must be specified alongside ReadOnly, WriteOnly, or ReadWrite"); + setError(QFile::OpenError, QLatin1String("ExistingOnly must be specified alongside ReadOnly, WriteOnly, or ReadWrite")); + return false; + } + + // Either Append or NewOnly implies WriteOnly + if (openMode & (QFile::Append | QFile::NewOnly)) + openMode |= QFile::WriteOnly; + + // WriteOnly implies Truncate when ReadOnly, Append, and NewOnly are not set. + if ((openMode & QFile::WriteOnly) && !(openMode & (QFile::ReadOnly | QFile::Append | QFile::NewOnly))) + openMode |= QFile::Truncate; + + return true; +} + +/*! Destructs the QFSFileEngine. */ QFSFileEngine::~QFSFileEngine() @@ -205,13 +234,8 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode) return false; } - // Append implies WriteOnly. - if (openMode & QFile::Append) - openMode |= QFile::WriteOnly; - - // WriteOnly implies Truncate if neither ReadOnly nor Append are sent. - if ((openMode & QFile::WriteOnly) && !(openMode & (QFile::ReadOnly | QFile::Append))) - openMode |= QFile::Truncate; + if (!processOpenModeFlags(&openMode)) + return false; d->openMode = openMode; d->lastFlushFailed = false; @@ -238,13 +262,8 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh, QFile::FileHand Q_D(QFSFileEngine); - // Append implies WriteOnly. - if (openMode & QFile::Append) - openMode |= QFile::WriteOnly; - - // WriteOnly implies Truncate if neither ReadOnly nor Append are sent. - if ((openMode & QFile::WriteOnly) && !(openMode & (QFile::ReadOnly | QFile::Append))) - openMode |= QFile::Truncate; + if (!processOpenModeFlags(&openMode)) + return false; d->openMode = openMode; d->lastFlushFailed = false; @@ -302,13 +321,8 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd, QFile::FileHandle { Q_D(QFSFileEngine); - // Append implies WriteOnly. - if (openMode & QFile::Append) - openMode |= QFile::WriteOnly; - - // WriteOnly implies Truncate if neither ReadOnly nor Append are sent. - if ((openMode & QFile::WriteOnly) && !(openMode & (QFile::ReadOnly | QFile::Append))) - openMode |= QFile::Truncate; + if (!processOpenModeFlags(&openMode)) + return false; d->openMode = openMode; d->lastFlushFailed = false; @@ -915,11 +929,11 @@ bool QFSFileEngine::supportsExtension(Extension extension) const For Unix, the list contains just the root path "/". */ -/*! \fn QString QFSFileEngine::fileName(FileName file) const +/*! \fn QString QFSFileEngine::fileName(QAbstractFileEngine::FileName file) const \reimp */ -/*! \fn bool QFSFileEngine::setFileTime(const QDateTime &newDate, FileTime time) +/*! \fn bool QFSFileEngine::setFileTime(const QDateTime &newDate, QAbstractFileEngine::FileTime time) \reimp */ @@ -945,7 +959,7 @@ bool QFSFileEngine::supportsExtension(Extension extension) const \reimp */ -/*! \fn uint QFSFileEngine::ownerId(FileOwner own) const +/*! \fn uint QFSFileEngine::ownerId(QAbstractFileEngine::FileOwner own) const In Unix, if stat() is successful, the \c uid is returned if \a own is the owner. Otherwise the \c gid is returned. If stat() is unsuccessful, -2 is reuturned. @@ -953,7 +967,7 @@ bool QFSFileEngine::supportsExtension(Extension extension) const For Windows, -2 is always returned. */ -/*! \fn QString QFSFileEngine::owner(FileOwner own) const +/*! \fn QString QFSFileEngine::owner(QAbstractFileEngine::FileOwner own) const \reimp */ diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h index 7f094ba9d7..bde00bf578 100644 --- a/src/corelib/io/qfsfileengine_iterator_p.h +++ b/src/corelib/io/qfsfileengine_iterator_p.h @@ -68,11 +68,11 @@ public: QFSFileEngineIterator(QDir::Filters filters, const QStringList &filterNames); ~QFSFileEngineIterator(); - QString next() Q_DECL_OVERRIDE; - bool hasNext() const Q_DECL_OVERRIDE; + QString next() override; + bool hasNext() const override; - QString currentFileName() const Q_DECL_OVERRIDE; - QFileInfo currentFileInfo() const Q_DECL_OVERRIDE; + QString currentFileName() const override; + QFileInfo currentFileInfo() const override; private: void advance() const; diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index faef84cbe2..6b091a8eef 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -71,52 +71,52 @@ public: explicit QFSFileEngine(const QString &file); ~QFSFileEngine(); - bool open(QIODevice::OpenMode openMode) Q_DECL_OVERRIDE; + bool open(QIODevice::OpenMode openMode) override; bool open(QIODevice::OpenMode flags, FILE *fh); - bool close() Q_DECL_OVERRIDE; - bool flush() Q_DECL_OVERRIDE; - bool syncToDisk() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; - bool seek(qint64) Q_DECL_OVERRIDE; - bool isSequential() const Q_DECL_OVERRIDE; - bool remove() Q_DECL_OVERRIDE; - bool copy(const QString &newName) Q_DECL_OVERRIDE; - bool rename(const QString &newName) Q_DECL_OVERRIDE; - bool renameOverwrite(const QString &newName) Q_DECL_OVERRIDE; - bool link(const QString &newName) Q_DECL_OVERRIDE; - bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE; - bool rmdir(const QString &dirName, bool recurseParentDirectories) const Q_DECL_OVERRIDE; - bool setSize(qint64 size) Q_DECL_OVERRIDE; - bool caseSensitive() const Q_DECL_OVERRIDE; - bool isRelativePath() const Q_DECL_OVERRIDE; - QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const Q_DECL_OVERRIDE; - FileFlags fileFlags(FileFlags type) const Q_DECL_OVERRIDE; - bool setPermissions(uint perms) Q_DECL_OVERRIDE; + bool close() override; + bool flush() override; + bool syncToDisk() override; + qint64 size() const override; + qint64 pos() const override; + bool seek(qint64) override; + bool isSequential() const override; + bool remove() override; + bool copy(const QString &newName) override; + bool rename(const QString &newName) override; + bool renameOverwrite(const QString &newName) override; + bool link(const QString &newName) override; + bool mkdir(const QString &dirName, bool createParentDirectories) const override; + bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; + bool setSize(qint64 size) override; + bool caseSensitive() const override; + bool isRelativePath() const override; + QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; + FileFlags fileFlags(FileFlags type) const override; + bool setPermissions(uint perms) override; QByteArray id() const override; - QString fileName(FileName file) const Q_DECL_OVERRIDE; - uint ownerId(FileOwner) const Q_DECL_OVERRIDE; - QString owner(FileOwner) const Q_DECL_OVERRIDE; - bool setFileTime(const QDateTime &newDate, FileTime time) Q_DECL_OVERRIDE; - QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE; - void setFileName(const QString &file) Q_DECL_OVERRIDE; - int handle() const Q_DECL_OVERRIDE; + QString fileName(FileName file) const override; + uint ownerId(FileOwner) const override; + QString owner(FileOwner) const override; + bool setFileTime(const QDateTime &newDate, FileTime time) override; + QDateTime fileTime(FileTime time) const override; + void setFileName(const QString &file) override; + int handle() const override; #ifndef QT_NO_FILESYSTEMITERATOR - Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE; - Iterator *endEntryList() Q_DECL_OVERRIDE; + Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + Iterator *endEntryList() override; #endif - qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 readLine(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 read(char *data, qint64 maxlen) override; + qint64 readLine(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; bool cloneTo(QAbstractFileEngine *target) override; virtual bool isUnnamedFile() const { return false; } - bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE; - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; + bool supportsExtension(Extension extension) const override; //FS only!! bool open(QIODevice::OpenMode flags, int fd); @@ -131,6 +131,9 @@ public: protected: QFSFileEngine(QFSFileEnginePrivate &dd); + +private: + inline bool processOpenModeFlags(QIODevice::OpenMode *mode); }; class Q_AUTOTEST_EXPORT QFSFileEnginePrivate : public QAbstractFileEnginePrivate @@ -219,6 +222,12 @@ public: int sysOpen(const QString &, int flags); #endif + static bool openModeCanCreate(QIODevice::OpenMode openMode) + { + // WriteOnly can create, but only when ExistingOnly isn't specified. + // ReadOnly by itself never creates. + return (openMode & QFile::WriteOnly) && !(openMode & QFile::ExistingOnly); + } protected: QFSFileEnginePrivate(); diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index e406fb4447..bc39ea73ee 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -74,11 +74,13 @@ static inline int openModeToOpenFlags(QIODevice::OpenMode mode) oflags |= QT_OPEN_LARGEFILE; #endif - if ((mode & QFile::ReadWrite) == QFile::ReadWrite) { - oflags = QT_OPEN_RDWR | QT_OPEN_CREAT; - } else if (mode & QFile::WriteOnly) { - oflags = QT_OPEN_WRONLY | QT_OPEN_CREAT; - } + if ((mode & QFile::ReadWrite) == QFile::ReadWrite) + oflags = QT_OPEN_RDWR; + else if (mode & QFile::WriteOnly) + oflags = QT_OPEN_WRONLY; + + if (QFSFileEnginePrivate::openModeCanCreate(mode)) + oflags |= QT_OPEN_CREAT; if (mode & QFile::Append) { oflags |= QT_OPEN_APPEND; @@ -87,6 +89,9 @@ static inline int openModeToOpenFlags(QIODevice::OpenMode mode) oflags |= QT_OPEN_TRUNC; } + if (mode & QFile::NewOnly) + oflags |= QT_OPEN_EXCL; + return oflags; } diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 759effe632..8199f6a846 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -117,9 +117,12 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode) if (openMode & QIODevice::WriteOnly) accessRights |= GENERIC_WRITE; - // WriteOnly can create files, ReadOnly cannot. - DWORD creationDisp = (openMode & QIODevice::WriteOnly) ? OPEN_ALWAYS : OPEN_EXISTING; + DWORD creationDisp = (openMode & QIODevice::NewOnly) + ? CREATE_NEW + : openModeCanCreate(openMode) + ? OPEN_ALWAYS + : OPEN_EXISTING; // Create the file handle. #ifndef Q_OS_WINRT SECURITY_ATTRIBUTES securityAtts = { sizeof(SECURITY_ATTRIBUTES), NULL, FALSE }; diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 7d46898911..95a5fb27cf 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -324,6 +324,23 @@ QIODevicePrivate::~QIODevicePrivate() terminators are translated to the local encoding, for example '\\r\\n' for Win32. \value Unbuffered Any buffer in the device is bypassed. + \value NewOnly Fail if the file to be opened already exists. Create and + open the file only if it does not exist. There is a + guarantee from the operating system that you are the only + one creating and opening the file. Note that this mode + implies WriteOnly, and combining it with ReadWrite is + allowed. This flag currently only affects QFile. Other + classes might use this flag in the future, but until then + using this flag with any classes other than QFile may + result in undefined behavior. + \value ExistingOnly Fail if the file to be opened does not exist. This flag + must be specified alongside ReadOnly, WriteOnly, or + ReadWrite. Note that using this flag with ReadOnly alone + is redundant, as ReadOnly already fails when the file does + not exist. This flag currently only affects QFile. Other + classes might use this flag in the future, but until then + using this flag with any classes other than QFile may + result in undefined behavior. Certain flags, such as \c Unbuffered and \c Truncate, are meaningless when used with some subclasses. Some of these diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index e64a4d0bb1..2e4debe339 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -76,7 +76,9 @@ public: Append = 0x0004, Truncate = 0x0008, Text = 0x0010, - Unbuffered = 0x0020 + Unbuffered = 0x0020, + NewOnly = 0x0040, + ExistingOnly = 0x0080 }; Q_DECLARE_FLAGS(OpenMode, OpenModeFlag) @@ -161,7 +163,7 @@ protected: #ifdef QT_NO_QOBJECT QIODevice(QIODevicePrivate &dd); #else - QIODevice(QIODevicePrivate &dd, QObject *parent = Q_NULLPTR); + QIODevice(QIODevicePrivate &dd, QObject *parent = nullptr); #endif virtual qint64 readData(char *data, qint64 maxlen) = 0; virtual qint64 readLineData(char *data, qint64 maxlen); diff --git a/src/corelib/io/qiodevice_p.h b/src/corelib/io/qiodevice_p.h index de2aa1597e..15a53a67dc 100644 --- a/src/corelib/io/qiodevice_p.h +++ b/src/corelib/io/qiodevice_p.h @@ -88,14 +88,14 @@ public: class QRingBufferRef { QRingBuffer *m_buf; - inline QRingBufferRef() : m_buf(Q_NULLPTR) { } + inline QRingBufferRef() : m_buf(nullptr) { } friend class QIODevicePrivate; public: // wrap functions from QRingBuffer inline void setChunkSize(int size) { Q_ASSERT(m_buf); m_buf->setChunkSize(size); } inline int chunkSize() const { Q_ASSERT(m_buf); return m_buf->chunkSize(); } inline qint64 nextDataBlockSize() const { return (m_buf ? m_buf->nextDataBlockSize() : Q_INT64_C(0)); } - inline const char *readPointer() const { return (m_buf ? m_buf->readPointer() : Q_NULLPTR); } + inline const char *readPointer() const { return (m_buf ? m_buf->readPointer() : nullptr); } inline const char *readPointerAtPosition(qint64 pos, qint64 &length) const { Q_ASSERT(m_buf); return m_buf->readPointerAtPosition(pos, length); } inline void free(qint64 bytes) { Q_ASSERT(m_buf); m_buf->free(bytes); } inline char *reserve(qint64 bytes) { Q_ASSERT(m_buf); return m_buf->reserve(bytes); } diff --git a/src/corelib/io/qlockfile.cpp b/src/corelib/io/qlockfile.cpp index 129cf01b63..aa84ce6bc1 100644 --- a/src/corelib/io/qlockfile.cpp +++ b/src/corelib/io/qlockfile.cpp @@ -56,6 +56,8 @@ struct LockFileInfo qint64 pid; QString appname; QString hostname; + QByteArray hostid; + QByteArray bootid; }; } @@ -331,13 +333,15 @@ QByteArray QLockFilePrivate::lockFileContents() const // Use operator% from the fast builder to avoid multiple memory allocations. return QByteArray::number(QCoreApplication::applicationPid()) % '\n' % processNameByPid(QCoreApplication::applicationPid()).toUtf8() % '\n' - % machineName().toUtf8() % '\n'; + % machineName().toUtf8() % '\n' + % QSysInfo::machineUniqueId() % '\n' + % QSysInfo::bootUniqueId() % '\n'; } static bool getLockInfo_helper(const QString &fileName, LockFileInfo *info) { QFile reader(fileName); - if (!reader.open(QIODevice::ReadOnly)) + if (!reader.open(QIODevice::ReadOnly | QIODevice::Text)) return false; QByteArray pidLine = reader.readLine(); @@ -349,9 +353,17 @@ static bool getLockInfo_helper(const QString &fileName, LockFileInfo *info) QByteArray hostNameLine = reader.readLine(); hostNameLine.chop(1); + // prior to Qt 5.10, only the lines above were recorded + QByteArray hostId = reader.readLine(); + hostId.chop(1); + QByteArray bootId = reader.readLine(); + bootId.chop(1); + bool ok; info->appname = QString::fromUtf8(appNameLine); info->hostname = QString::fromUtf8(hostNameLine); + info->hostid = hostId; + info->bootid = bootId; info->pid = pidLine.toLongLong(&ok); return ok && info->pid > 0; } @@ -360,7 +372,20 @@ bool QLockFilePrivate::isApparentlyStale() const { LockFileInfo info; if (getLockInfo_helper(fileName, &info)) { - if (info.hostname.isEmpty() || info.hostname == machineName()) { + bool sameHost = info.hostname.isEmpty() || info.hostname == machineName(); + if (!info.hostid.isEmpty()) { + // Override with the host ID, if we know it. + QByteArray ourHostId = QSysInfo::machineUniqueId(); + if (!ourHostId.isEmpty()) + sameHost = (ourHostId == info.hostid); + } + + if (sameHost) { + if (!info.bootid.isEmpty()) { + // If we've rebooted, then the lock is definitely stale. + if (info.bootid != QSysInfo::bootUniqueId()) + return true; + } if (!isProcessRunning(info.pid, info.appname)) return true; } diff --git a/src/corelib/io/qlockfile_p.h b/src/corelib/io/qlockfile_p.h index b41dfb38ad..5b69347206 100644 --- a/src/corelib/io/qlockfile_p.h +++ b/src/corelib/io/qlockfile_p.h @@ -55,7 +55,10 @@ #include <QtCore/qlockfile.h> #include <QtCore/qfile.h> +#include <qplatformdefs.h> + #ifdef Q_OS_WIN +#include <io.h> #include <qt_windows.h> #endif @@ -96,6 +99,19 @@ public: int staleLockTime; // "int milliseconds" is big enough for 24 days QLockFile::LockError lockError; bool isLocked; + + static int getLockFileHandle(QLockFile *f) + { + int fd; +#ifdef Q_OS_WIN + // Use of this function on Windows WILL leak a file descriptor. + fd = _open_osfhandle(intptr_t(f->d_func()->fileHandle), 0); +#else + fd = f->d_func()->fileHandle; +#endif + QT_LSEEK(fd, 0, SEEK_SET); + return fd; + } }; QT_END_NAMESPACE diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp index fc01f83e80..418b7d22ba 100644 --- a/src/corelib/io/qlockfile_unix.cpp +++ b/src/corelib/io/qlockfile_unix.cpp @@ -147,7 +147,7 @@ static bool setNativeLocks(int fd) QLockFile::LockError QLockFilePrivate::tryLock_sys() { const QByteArray lockFileName = QFile::encodeName(fileName); - const int fd = qt_safe_open(lockFileName.constData(), O_WRONLY | O_CREAT | O_EXCL, 0666); + const int fd = qt_safe_open(lockFileName.constData(), O_RDWR | O_CREAT | O_EXCL, 0666); if (fd < 0) { switch (errno) { case EEXIST: diff --git a/src/corelib/io/qlockfile_win.cpp b/src/corelib/io/qlockfile_win.cpp index de64ec0432..6b8028460c 100644 --- a/src/corelib/io/qlockfile_win.cpp +++ b/src/corelib/io/qlockfile_win.cpp @@ -68,7 +68,7 @@ QLockFile::LockError QLockFilePrivate::tryLock_sys() #ifndef Q_OS_WINRT SECURITY_ATTRIBUTES securityAtts = { sizeof(SECURITY_ATTRIBUTES), NULL, FALSE }; HANDLE fh = CreateFile((const wchar_t*)fileEntry.nativeFilePath().utf16(), - GENERIC_WRITE, + GENERIC_READ | GENERIC_WRITE, dwShareMode, &securityAtts, CREATE_NEW, // error if already exists @@ -76,7 +76,7 @@ QLockFile::LockError QLockFilePrivate::tryLock_sys() NULL); #else // !Q_OS_WINRT HANDLE fh = CreateFile2((const wchar_t*)fileEntry.nativeFilePath().utf16(), - GENERIC_WRITE, + GENERIC_READ | GENERIC_WRITE, dwShareMode, CREATE_NEW, // error if already exists NULL); diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h index bb0b533831..ebed1120db 100644 --- a/src/corelib/io/qnoncontiguousbytedevice_p.h +++ b/src/corelib/io/qnoncontiguousbytedevice_p.h @@ -105,12 +105,12 @@ class QNonContiguousByteDeviceByteArrayImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceByteArrayImpl(QByteArray *ba); ~QNonContiguousByteDeviceByteArrayImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; + qint64 pos() const override; protected: QByteArray* byteArray; qint64 currentPosition; @@ -121,12 +121,12 @@ class QNonContiguousByteDeviceRingBufferImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb); ~QNonContiguousByteDeviceRingBufferImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; + qint64 pos() const override; protected: QSharedPointer<QRingBuffer> ringBuffer; qint64 currentPosition; @@ -139,12 +139,12 @@ class QNonContiguousByteDeviceIoDeviceImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d); ~QNonContiguousByteDeviceIoDeviceImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; + qint64 pos() const override; protected: QIODevice* device; QByteArray* currentReadBuffer; @@ -162,11 +162,11 @@ class QNonContiguousByteDeviceBufferImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceBufferImpl(QBuffer *b); ~QNonContiguousByteDeviceBufferImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; protected: QBuffer* buffer; QByteArray byteArray; @@ -179,13 +179,13 @@ class QByteDeviceWrappingIoDevice : public QIODevice public: QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd); ~QByteDeviceWrappingIoDevice (); - virtual bool isSequential () const Q_DECL_OVERRIDE; - virtual bool atEnd () const Q_DECL_OVERRIDE; - virtual bool reset () Q_DECL_OVERRIDE; - virtual qint64 size () const Q_DECL_OVERRIDE; + virtual bool isSequential () const override; + virtual bool atEnd () const override; + virtual bool reset () override; + virtual qint64 size () const override; protected: - virtual qint64 readData ( char * data, qint64 maxSize ) Q_DECL_OVERRIDE; - virtual qint64 writeData ( const char * data, qint64 maxSize ) Q_DECL_OVERRIDE; + virtual qint64 readData ( char * data, qint64 maxSize ) override; + virtual qint64 writeData ( const char * data, qint64 maxSize ) override; QNonContiguousByteDevice *byteDevice; }; diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 64a59bc2c3..2ee680a7c6 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1094,10 +1094,9 @@ bool QProcessPrivate::_q_canReadStandardError() */ bool QProcessPrivate::_q_canWrite() { - if (stdinChannel.notifier) - stdinChannel.notifier->setEnabled(false); - if (writeBuffer.isEmpty()) { + if (stdinChannel.notifier) + stdinChannel.notifier->setEnabled(false); #if defined QPROCESS_DEBUG qDebug("QProcessPrivate::canWrite(), not writing anything (empty write buffer)."); #endif @@ -1106,10 +1105,10 @@ bool QProcessPrivate::_q_canWrite() const bool writeSucceeded = writeToStdin(); - if (stdinChannel.notifier && !writeBuffer.isEmpty()) - stdinChannel.notifier->setEnabled(true); if (writeBuffer.isEmpty() && stdinChannel.closed) closeWriteChannel(); + else if (stdinChannel.notifier) + stdinChannel.notifier->setEnabled(!writeBuffer.isEmpty()); return writeSucceeded; } diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index c8aef2f0b1..474fc87de8 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -155,7 +155,7 @@ public: }; Q_ENUM(ExitStatus) - explicit QProcess(QObject *parent = Q_NULLPTR); + explicit QProcess(QObject *parent = nullptr); virtual ~QProcess(); void start(const QString &program, const QStringList &arguments, OpenMode mode = ReadWrite); @@ -164,7 +164,7 @@ public: #endif void start(OpenMode mode = ReadWrite); bool startDetached(qint64 *pid = nullptr); - bool open(OpenMode mode = ReadWrite) Q_DECL_OVERRIDE; + bool open(OpenMode mode = ReadWrite) override; QString program() const; void setProgram(const QString &program); @@ -227,8 +227,8 @@ public: qint64 processId() const; bool waitForStarted(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; + bool waitForBytesWritten(int msecs = 30000) override; bool waitForFinished(int msecs = 30000); QByteArray readAllStandardOutput(); @@ -238,12 +238,12 @@ public: QProcess::ExitStatus exitStatus() const; // QIODevice - qint64 bytesAvailable() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override - qint64 bytesToWrite() const Q_DECL_OVERRIDE; - bool isSequential() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override - void close() Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override + qint64 bytesAvailable() const override; // ### Qt6: remove trivial override + qint64 bytesToWrite() const override; + bool isSequential() const override; + bool canReadLine() const override; // ### Qt6: remove trivial override + void close() override; + bool atEnd() const override; // ### Qt6: remove trivial override static int execute(const QString &program, const QStringList &arguments); static int execute(const QString &command); @@ -253,7 +253,7 @@ public: #if defined(Q_QDOC) = QString() #endif - , qint64 *pid = Q_NULLPTR); + , qint64 *pid = nullptr); #if !defined(Q_QDOC) static bool startDetached(const QString &program, const QStringList &arguments); // ### Qt6: merge overloads #endif @@ -286,8 +286,8 @@ protected: virtual void setupChildProcess(); // QIODevice - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: Q_DECLARE_PRIVATE(QProcess) diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index deb29dca0a..aa7ecbe91d 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -352,7 +352,7 @@ public: #if defined(Q_OS_UNIX) void execChild(const char *workingDirectory, char **argv, char **envp); #endif - bool processStarted(QString *errorMessage = Q_NULLPTR); + bool processStarted(QString *errorMessage = nullptr); void terminateProcess(); void killProcess(); void findExitCode(); diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 15752f84b2..68b7a8bf9b 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -885,7 +885,7 @@ bool QProcessPrivate::waitForDeadChild() // read the process information from our fd forkfd_info info; int ret; - EINTR_LOOP(ret, forkfd_wait(forkfd, &info, Q_NULLPTR)); + EINTR_LOOP(ret, forkfd_wait(forkfd, &info, nullptr)); exitCode = info.status; crashed = info.code != CLD_EXITED; diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index e19d45841f..3a62a67e3b 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -115,9 +115,7 @@ static void qt_create_pipe(Q_PIPE *pipe, bool isInputPipe) dwOpenMode |= PIPE_ACCESS_INBOUND; dwInputBufferSize = dwPipeBufferSize; } - DWORD dwPipeFlags = PIPE_TYPE_BYTE | PIPE_WAIT; - if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) - dwPipeFlags |= PIPE_REJECT_REMOTE_CLIENTS; + DWORD dwPipeFlags = PIPE_TYPE_BYTE | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS; hServer = CreateNamedPipe(pipeName, dwOpenMode, dwPipeFlags, diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 31f02e977d..35a0de4fb7 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -911,8 +911,8 @@ public: inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { } inline ~QDynamicBufferResourceRoot() { } inline const uchar *mappingBuffer() const { return buffer; } - virtual QString mappingRoot() const Q_DECL_OVERRIDE { return root; } - virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_Buffer; } + virtual QString mappingRoot() const override { return root; } + virtual ResourceRootType type() const override { return Resource_Buffer; } // size == -1 means "unknown" bool registerSelf(const uchar *b, int size) @@ -994,7 +994,7 @@ public: } } QString mappingFile() const { return fileName; } - virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_File; } + virtual ResourceRootType type() const override { return Resource_File; } bool registerSelf(const QString &f) { bool fromMM = false; diff --git a/src/corelib/io/qresource_iterator_p.h b/src/corelib/io/qresource_iterator_p.h index 6a4e215864..207a88b0ba 100644 --- a/src/corelib/io/qresource_iterator_p.h +++ b/src/corelib/io/qresource_iterator_p.h @@ -63,10 +63,10 @@ public: QResourceFileEngineIterator(QDir::Filters filters, const QStringList &filterNames); ~QResourceFileEngineIterator(); - QString next() Q_DECL_OVERRIDE; - bool hasNext() const Q_DECL_OVERRIDE; + QString next() override; + bool hasNext() const override; - QString currentFileName() const Q_DECL_OVERRIDE; + QString currentFileName() const override; private: mutable QStringList entries; diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index e08ba64d2b..dcfe46704c 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -64,52 +64,52 @@ public: explicit QResourceFileEngine(const QString &path); ~QResourceFileEngine(); - virtual void setFileName(const QString &file) Q_DECL_OVERRIDE; + virtual void setFileName(const QString &file) override; - virtual bool open(QIODevice::OpenMode flags) Q_DECL_OVERRIDE ; - virtual bool close() Q_DECL_OVERRIDE; - virtual bool flush() Q_DECL_OVERRIDE; - virtual qint64 size() const Q_DECL_OVERRIDE; - virtual qint64 pos() const Q_DECL_OVERRIDE; + virtual bool open(QIODevice::OpenMode flags) override ; + virtual bool close() override; + virtual bool flush() override; + virtual qint64 size() const override; + virtual qint64 pos() const override; virtual bool atEnd() const; - virtual bool seek(qint64) Q_DECL_OVERRIDE; - virtual qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - virtual qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + virtual bool seek(qint64) override; + virtual qint64 read(char *data, qint64 maxlen) override; + virtual qint64 write(const char *data, qint64 len) override; - virtual bool remove() Q_DECL_OVERRIDE; - virtual bool copy(const QString &newName) Q_DECL_OVERRIDE; - virtual bool rename(const QString &newName) Q_DECL_OVERRIDE; - virtual bool link(const QString &newName) Q_DECL_OVERRIDE; + virtual bool remove() override; + virtual bool copy(const QString &newName) override; + virtual bool rename(const QString &newName) override; + virtual bool link(const QString &newName) override; - virtual bool isSequential() const Q_DECL_OVERRIDE; + virtual bool isSequential() const override; - virtual bool isRelativePath() const Q_DECL_OVERRIDE; + virtual bool isRelativePath() const override; - virtual bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE; - virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const Q_DECL_OVERRIDE; + virtual bool mkdir(const QString &dirName, bool createParentDirectories) const override; + virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; - virtual bool setSize(qint64 size) Q_DECL_OVERRIDE; + virtual bool setSize(qint64 size) override; - virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const Q_DECL_OVERRIDE; + virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; - virtual bool caseSensitive() const Q_DECL_OVERRIDE; + virtual bool caseSensitive() const override; - virtual FileFlags fileFlags(FileFlags type) const Q_DECL_OVERRIDE; + virtual FileFlags fileFlags(FileFlags type) const override; - virtual bool setPermissions(uint perms) Q_DECL_OVERRIDE; + virtual bool setPermissions(uint perms) override; - virtual QString fileName(QAbstractFileEngine::FileName file) const Q_DECL_OVERRIDE; + virtual QString fileName(QAbstractFileEngine::FileName file) const override; - virtual uint ownerId(FileOwner) const Q_DECL_OVERRIDE; - virtual QString owner(FileOwner) const Q_DECL_OVERRIDE; + virtual uint ownerId(FileOwner) const override; + virtual QString owner(FileOwner) const override; - virtual QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE; + virtual QDateTime fileTime(FileTime time) const override; - virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE; - virtual Iterator *endEntryList() Q_DECL_OVERRIDE; + virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + virtual Iterator *endEntryList() override; - bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE; - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; + bool supportsExtension(Extension extension) const override; }; QT_END_NAMESPACE diff --git a/src/corelib/io/qsavefile.cpp b/src/corelib/io/qsavefile.cpp index 63f2284ef5..0cbc8c2234 100644 --- a/src/corelib/io/qsavefile.cpp +++ b/src/corelib/io/qsavefile.cpp @@ -184,7 +184,8 @@ void QSaveFile::setFileName(const QString &name) Important: the \a mode must include QIODevice::WriteOnly. It may also have additional flags, such as QIODevice::Text and QIODevice::Unbuffered. - QIODevice::ReadWrite and QIODevice::Append are not supported at the moment. + QIODevice::ReadWrite, QIODevice::Append, QIODevice::NewOnly and + QIODevice::ExistingOnly are not supported at the moment. \sa QIODevice::OpenMode, setFileName() */ @@ -201,7 +202,8 @@ bool QSaveFile::open(OpenMode mode) return false; } // In the future we could implement ReadWrite by copying from the existing file to the temp file... - if ((mode & ReadOnly) || (mode & Append)) { + // The implications of NewOnly and ExistingOnly when used with QSaveFile need to be considered carefully... + if (mode & (ReadOnly | Append | NewOnly | ExistingOnly)) { qWarning("QSaveFile::open: Unsupported open mode 0x%x", int(mode)); return false; } @@ -262,7 +264,7 @@ bool QSaveFile::open(OpenMode mode) } #endif - d->fileEngine = new QTemporaryFileEngine(&d->finalFileName); + d->fileEngine = new QTemporaryFileEngine(&d->finalFileName, QTemporaryFileEngine::Win32NonShared); // if the target file exists, we'll copy its permissions below, // but until then, let's ensure the temporary file is not accessible // to a third party diff --git a/src/corelib/io/qsavefile.h b/src/corelib/io/qsavefile.h index 09d6e29272..200068d30d 100644 --- a/src/corelib/io/qsavefile.h +++ b/src/corelib/io/qsavefile.h @@ -67,15 +67,15 @@ public: explicit QSaveFile(const QString &name); #ifndef QT_NO_QOBJECT - explicit QSaveFile(QObject *parent = Q_NULLPTR); + explicit QSaveFile(QObject *parent = nullptr); explicit QSaveFile(const QString &name, QObject *parent); #endif ~QSaveFile(); - QString fileName() const Q_DECL_OVERRIDE; + QString fileName() const override; void setFileName(const QString &name); - bool open(OpenMode flags) Q_DECL_OVERRIDE; + bool open(OpenMode flags) override; bool commit(); void cancelWriting(); @@ -84,10 +84,10 @@ public: bool directWriteFallback() const; protected: - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 writeData(const char *data, qint64 len) override; private: - void close() Q_DECL_OVERRIDE; + void close() override; #if !QT_CONFIG(translation) static QString tr(const char *string) { return QString::fromLatin1(string); } #endif diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index da5502e5ca..d78edd23a2 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -88,7 +88,7 @@ public: NativeFormat, IniFormat, -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) Registry32Format, Registry64Format, #endif @@ -125,13 +125,13 @@ public: #ifndef QT_NO_QOBJECT explicit QSettings(const QString &organization, - const QString &application = QString(), QObject *parent = Q_NULLPTR); + const QString &application = QString(), QObject *parent = nullptr); QSettings(Scope scope, const QString &organization, - const QString &application = QString(), QObject *parent = Q_NULLPTR); + const QString &application = QString(), QObject *parent = nullptr); QSettings(Format format, Scope scope, const QString &organization, - const QString &application = QString(), QObject *parent = Q_NULLPTR); - QSettings(const QString &fileName, Format format, QObject *parent = Q_NULLPTR); - explicit QSettings(QObject *parent = Q_NULLPTR); + const QString &application = QString(), QObject *parent = nullptr); + QSettings(const QString &fileName, Format format, QObject *parent = nullptr); + explicit QSettings(QObject *parent = nullptr); #else explicit QSettings(const QString &organization, const QString &application = QString()); @@ -199,7 +199,7 @@ public: protected: #ifndef QT_NO_QOBJECT - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; #endif private: diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp index 2a08ee2e64..aa14d8435a 100644 --- a/src/corelib/io/qsettings_mac.cpp +++ b/src/corelib/io/qsettings_mac.cpp @@ -616,7 +616,7 @@ bool QConfFileSettingsPrivate::readPlistFile(const QByteArray &data, ParsedSetti { QCFType<CFDataRef> cfData = data.toRawCFData(); QCFType<CFPropertyListRef> propertyList = - CFPropertyListCreateWithData(kCFAllocatorDefault, cfData, kCFPropertyListImmutable, Q_NULLPTR, Q_NULLPTR); + CFPropertyListCreateWithData(kCFAllocatorDefault, cfData, kCFPropertyListImmutable, nullptr, nullptr); if (!propertyList) return true; diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h index 7923c24770..d18c96a06c 100644 --- a/src/corelib/io/qsettings_p.h +++ b/src/corelib/io/qsettings_p.h @@ -261,17 +261,17 @@ public: QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format); ~QConfFileSettingsPrivate(); - void remove(const QString &key) Q_DECL_OVERRIDE; - void set(const QString &key, const QVariant &value) Q_DECL_OVERRIDE; - bool get(const QString &key, QVariant *value) const Q_DECL_OVERRIDE; + void remove(const QString &key) override; + void set(const QString &key, const QVariant &value) override; + bool get(const QString &key, QVariant *value) const override; - QStringList children(const QString &prefix, ChildSpec spec) const Q_DECL_OVERRIDE; + QStringList children(const QString &prefix, ChildSpec spec) const override; - void clear() Q_DECL_OVERRIDE; - void sync() Q_DECL_OVERRIDE; - void flush() Q_DECL_OVERRIDE; - bool isWritable() const Q_DECL_OVERRIDE; - QString fileName() const Q_DECL_OVERRIDE; + void clear() override; + void sync() override; + void flush() override; + bool isWritable() const override; + QString fileName() const override; bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections); static bool readIniSection(const QSettingsKey §ion, const QByteArray &data, diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm index ab73edb008..11b5cc8c37 100644 --- a/src/corelib/io/qstandardpaths_mac.mm +++ b/src/corelib/io/qstandardpaths_mac.mm @@ -203,28 +203,17 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) if (type == AppDataLocation || type == AppLocalDataLocation) { CFBundleRef mainBundle = CFBundleGetMainBundle(); if (mainBundle) { - CFURLRef bundleUrl = CFBundleCopyBundleURL(mainBundle); - CFStringRef cfBundlePath = CFURLCopyFileSystemPath(bundleUrl, kCFURLPOSIXPathStyle); - QString bundlePath = QString::fromCFString(cfBundlePath); - CFRelease(cfBundlePath); - CFRelease(bundleUrl); - - CFURLRef resourcesUrl = CFBundleCopyResourcesDirectoryURL(mainBundle); - CFStringRef cfResourcesPath = CFURLCopyFileSystemPath(resourcesUrl, - kCFURLPOSIXPathStyle); - QString resourcesPath = QString::fromCFString(cfResourcesPath); - CFRelease(cfResourcesPath); - CFRelease(resourcesUrl); - - // Handle bundled vs unbundled executables. CFBundleGetMainBundle() returns - // a valid bundle in both cases. CFBundleCopyResourcesDirectoryURL() returns - // an absolute path for unbundled executables. - if (resourcesPath.startsWith(QLatin1Char('/'))) - dirs.append(resourcesPath); - else - dirs.append(bundlePath + resourcesPath); + if (QCFType<CFURLRef> resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle)) { + if (QCFType<CFURLRef> absoluteResouresURL = CFURLCopyAbsoluteURL(resourcesURL)) { + if (QCFType<CFStringRef> path = CFURLCopyFileSystemPath(absoluteResouresURL, + kCFURLPOSIXPathStyle)) { + dirs.append(QString::fromCFString(path)); + } + } + } } } + const QString localDir = writableLocation(type); if (!localDir.isEmpty()) dirs.prepend(localDir); diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp index d06778e2a1..e49edd9a40 100644 --- a/src/corelib/io/qstandardpaths_unix.cpp +++ b/src/corelib/io/qstandardpaths_unix.cpp @@ -170,7 +170,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) break; } -#ifndef QT_BOOTSTRAPPED +#if QT_CONFIG(regularexpression) // http://www.freedesktop.org/wiki/Software/xdg-user-dirs QString xdgConfigHome = QFile::decodeName(qgetenv("XDG_CONFIG_HOME")); if (xdgConfigHome.isEmpty()) @@ -232,7 +232,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) } } } -#endif +#endif // QT_CONFIG(regularexpression) QString path; switch (type) { diff --git a/src/corelib/io/qstorageinfo_mac.cpp b/src/corelib/io/qstorageinfo_mac.cpp index 0f271f2bc6..8b06543d71 100644 --- a/src/corelib/io/qstorageinfo_mac.cpp +++ b/src/corelib/io/qstorageinfo_mac.cpp @@ -112,7 +112,7 @@ void QStorageInfoPrivate::retrieveUrlProperties(bool initRootPath) QCFType<CFArrayRef> keys = CFArrayCreate(kCFAllocatorDefault, initRootPath ? rootPathKeys : propertyKeys, size, - Q_NULLPTR); + nullptr); if (!keys) return; @@ -178,9 +178,9 @@ QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes() QList<QStorageInfo> volumes; QCFType<CFURLEnumeratorRef> enumerator; - enumerator = CFURLEnumeratorCreateForMountedVolumes(Q_NULLPTR, + enumerator = CFURLEnumeratorCreateForMountedVolumes(nullptr, kCFURLEnumeratorSkipInvisibles, - Q_NULLPTR); + nullptr); CFURLEnumeratorResult result = kCFURLEnumeratorSuccess; do { diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp index c2d31e7677..7664b77d81 100644 --- a/src/corelib/io/qstorageinfo_unix.cpp +++ b/src/corelib/io/qstorageinfo_unix.cpp @@ -45,6 +45,7 @@ #include <QtCore/qtextstream.h> #include <QtCore/private/qcore_unix_p.h> +#include <QtCore/private/qlocale_tools_p.h> #include <errno.h> #include <sys/stat.h> @@ -128,6 +129,7 @@ public: inline QByteArray fileSystemType() const; inline QByteArray device() const; inline QByteArray options() const; + inline QByteArray subvolume() const; private: #if defined(Q_OS_BSD4) QT_STATFSBUF *stat_buf; @@ -143,9 +145,36 @@ private: QByteArray m_device; QByteArray m_options; #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD) + struct mountinfoent : public mntent { + // Details from proc(5) section from /proc/<pid>/mountinfo: + //(1) mount ID: a unique ID for the mount (may be reused after umount(2)). + int mount_id; + //(2) parent ID: the ID of the parent mount (or of self for the top of the mount tree). +// int parent_id; + //(3) major:minor: the value of st_dev for files on this filesystem (see stat(2)). +// dev_t rdev; + //(4) root: the pathname of the directory in the filesystem which forms the root of this mount. + char *subvolume; + //(5) mount point: the pathname of the mount point relative to the process's root directory. +// char *mnt_dir; // in mntent + //(6) mount options: per-mount options. +// char *mnt_opts; // in mntent + //(7) optional fields: zero or more fields of the form "tag[:value]"; see below. +// int flags; + //(8) separator: the end of the optional fields is marked by a single hyphen. + + //(9) filesystem type: the filesystem type in the form "type[.subtype]". +// char *mnt_type; // in mntent + //(10) mount source: filesystem-specific information or "none". +// char *mnt_fsname; // in mntent + //(11) super options: per-superblock options. + char *superopts; + }; + FILE *fp; - mntent mnt; QByteArray buffer; + mountinfoent mnt; + bool usingMountinfo; #elif defined(Q_OS_HAIKU) BVolumeRoster m_volumeRoster; @@ -246,6 +275,10 @@ inline QByteArray QStorageIterator::options() const return QByteArray(); } +inline QByteArray QStorageIterator::subvolume() const +{ + return QByteArray(); +} #elif defined(Q_OS_SOLARIS) inline QStorageIterator::QStorageIterator() @@ -262,7 +295,7 @@ inline QStorageIterator::~QStorageIterator() inline bool QStorageIterator::isValid() const { - return fp != Q_NULLPTR; + return fp != nullptr; } inline bool QStorageIterator::next() @@ -285,6 +318,10 @@ inline QByteArray QStorageIterator::device() const return QByteArray(mnt.mnt_mntopts); } +inline QByteArray QStorageIterator::subvolume() const +{ + return QByteArray(); +} #elif defined(Q_OS_ANDROID) inline QStorageIterator::QStorageIterator() @@ -340,6 +377,10 @@ inline QByteArray QStorageIterator::options() const return m_options; } +inline QByteArray QStorageIterator::subvolume() const +{ + return QByteArray(); +} #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD) static const int bufferSize = 1024; // 2 paths (mount point+device) and metainfo; @@ -348,23 +389,158 @@ static const int bufferSize = 1024; // 2 paths (mount point+device) and metainfo inline QStorageIterator::QStorageIterator() : buffer(QByteArray(bufferSize, 0)) { - fp = ::setmntent(_PATH_MOUNTED, "r"); + fp = nullptr; + +#ifdef Q_OS_LINUX + // first, try to open /proc/self/mountinfo, which has more details + fp = ::fopen("/proc/self/mountinfo", "re"); +#endif + if (fp) { + usingMountinfo = true; + } else { + usingMountinfo = false; + fp = ::setmntent(_PATH_MOUNTED, "r"); + } } inline QStorageIterator::~QStorageIterator() { - if (fp) - ::endmntent(fp); + if (fp) { + if (usingMountinfo) + ::fclose(fp); + else + ::endmntent(fp); + } } inline bool QStorageIterator::isValid() const { - return fp != Q_NULLPTR; + return fp != nullptr; } inline bool QStorageIterator::next() { - return ::getmntent_r(fp, &mnt, buffer.data(), buffer.size()) != Q_NULLPTR; + mnt.subvolume = nullptr; + mnt.superopts = nullptr; + if (!usingMountinfo) + return ::getmntent_r(fp, &mnt, buffer.data(), buffer.size()) != nullptr; + + // Helper function to parse paths that the kernel inserts escape sequences + // for. The unescaped string is left at \a src and is properly + // NUL-terminated. Returns a pointer to the delimiter that terminated the + // path, or nullptr if it failed. + auto parseMangledPath = [](char *src) { + // The kernel escapes with octal the following characters: + // space ' ', tab '\t', backslask '\\', and newline '\n' + char *dst = src; + while (*src) { + switch (*src) { + case ' ': + // Unescaped space: end of the field. + *dst = '\0'; + return src; + + default: + *dst++ = *src++; + break; + + case '\\': + // It always uses exactly three octal characters. + ++src; + char c = (*src++ - '0') << 6; + c |= (*src++ - '0') << 3; + c |= (*src++ - '0'); + *dst++ = c; + break; + } + } + + // Found a NUL before the end of the field. + src = nullptr; + return src; + }; + + char *ptr = buffer.data(); + if (fgets(ptr, buffer.size(), fp) == nullptr) + return false; + + size_t len = strlen(buffer.data()); + if (len == 0) + return false; + if (ptr[len - 1] == '\n') + ptr[len - 1] = '\0'; + + // parse the line + bool ok; + mnt.mnt_freq = 0; + mnt.mnt_passno = 0; + + mnt.mount_id = qstrtoll(ptr, const_cast<const char **>(&ptr), 10, &ok); + if (!ptr || !ok) + return false; + + int parent_id = qstrtoll(ptr, const_cast<const char **>(&ptr), 10, &ok); + Q_UNUSED(parent_id); + if (!ptr || !ok) + return false; + + int rdevmajor = qstrtoll(ptr, const_cast<const char **>(&ptr), 10, &ok); + if (!ptr || !ok) + return false; + if (*ptr != ':') + return false; + int rdevminor = qstrtoll(ptr + 1, const_cast<const char **>(&ptr), 10, &ok); + if (!ptr || !ok) + return false; + Q_UNUSED(rdevmajor); + Q_UNUSED(rdevminor); + + if (*ptr != ' ') + return false; + + mnt.subvolume = ++ptr; + ptr = parseMangledPath(ptr); + if (!ptr) + return false; + + // unset a subvolume of "/" -- it's not a *sub* volume + if (mnt.subvolume + 1 == ptr) + *mnt.subvolume = '\0'; + + mnt.mnt_dir = ++ptr; + ptr = parseMangledPath(ptr); + if (!ptr) + return false; + + mnt.mnt_opts = ++ptr; + ptr = strchr(ptr, ' '); + if (!ptr) + return false; + + // we don't parse the flags, so just find the separator + if (char *const dashed = strstr(ptr, " - ")) { + *ptr = '\0'; + ptr = dashed + strlen(" - ") - 1; + } else { + return false; + } + + mnt.mnt_type = ++ptr; + ptr = strchr(ptr, ' '); + if (!ptr) + return false; + *ptr = '\0'; + + mnt.mnt_fsname = ++ptr; + ptr = parseMangledPath(ptr); + if (!ptr) + return false; + + mnt.superopts = ++ptr; + ptr += strcspn(ptr, " \n"); + *ptr = '\0'; + + return true; } inline QString QStorageIterator::rootPath() const @@ -384,9 +560,28 @@ inline QByteArray QStorageIterator::device() const inline QByteArray QStorageIterator::options() const { + // Merge the two options, starting with the superblock options and letting + // the per-mount options override. + const char *superopts = mnt.superopts; + + // Both mnt_opts and superopts start with "ro" or "rw", so we can skip the + // superblock's field (see show_mountinfo() in fs/proc_namespace.c). + if (superopts && superopts[0] == 'r') { + if (superopts[2] == '\0') // no other superopts besides "ro" / "rw"? + superopts = nullptr; + else if (superopts[2] == ',') + superopts += 3; + } + + if (superopts) + return QByteArray(superopts) + ',' + mnt.mnt_opts; return QByteArray(mnt.mnt_opts); } +inline QByteArray QStorageIterator::subvolume() const +{ + return QByteArray(mnt.subvolume); +} #elif defined(Q_OS_HAIKU) inline QStorageIterator::QStorageIterator() { @@ -449,6 +644,10 @@ inline QByteArray QStorageIterator::options() const return QByteArray(); } +inline QByteArray QStorageIterator::subvolume() const +{ + return QByteArray(); +} #else inline QStorageIterator::QStorageIterator() @@ -489,31 +688,11 @@ inline QByteArray QStorageIterator::options() const return QByteArray(); } -#endif - -static QByteArray extractSubvolume(const QStorageIterator &it) +inline QByteArray QStorageIterator::subvolume() const { -#ifdef Q_OS_LINUX - if (it.fileSystemType() == "btrfs") { - const QByteArrayList opts = it.options().split(','); - QByteArray id; - for (const QByteArray &opt : opts) { - static const char subvol[] = "subvol="; - static const char subvolid[] = "subvolid="; - if (opt.startsWith(subvol)) - return std::move(opt).mid(strlen(subvol)); - if (opt.startsWith(subvolid)) - id = std::move(opt).mid(strlen(subvolid)); - } - - // if we didn't find the subvolume name, return the subvolume ID - return id; - } -#else - Q_UNUSED(it); -#endif return QByteArray(); } +#endif void QStorageInfoPrivate::initRootPath() { @@ -541,7 +720,7 @@ void QStorageInfoPrivate::initRootPath() rootPath = mountDir; device = it.device(); fileSystemType = fsName; - subvolume = extractSubvolume(it); + subvolume = it.subvolume(); } } } diff --git a/src/corelib/io/qstorageinfo_win.cpp b/src/corelib/io/qstorageinfo_win.cpp index 3830c5480c..8a3db90f87 100644 --- a/src/corelib/io/qstorageinfo_win.cpp +++ b/src/corelib/io/qstorageinfo_win.cpp @@ -147,8 +147,8 @@ void QStorageInfoPrivate::retrieveVolumeInfo() const bool result = ::GetVolumeInformation(reinterpret_cast<const wchar_t *>(path.utf16()), nameBuffer, defaultBufferSize, - Q_NULLPTR, - Q_NULLPTR, + nullptr, + nullptr, &fileSystemFlags, fileSystemTypeBuffer, defaultBufferSize); diff --git a/src/corelib/io/qt_attribution.json b/src/corelib/io/qt_attribution.json index 0fa4502db4..e9eb9c85e4 100644 --- a/src/corelib/io/qt_attribution.json +++ b/src/corelib/io/qt_attribution.json @@ -1,17 +1,3 @@ -[ -{ - "Id": "qtemporaryfile", - "Name": "Parts of QTemporaryFile", - "QDocModule": "qtcore", - "QtUsage": "Used in Qt Core. Disable the qtemporaryfile feature to avoid.", - "Path": "qtemporaryfile.cpp", - - "Description": "Generates a unique file path and returns a native handle to the open file.", - "License": "BSD 3-clause \"New\" or \"Revised\" License", - "LicenseId": "BSD-3-Clause", - "LicenseFile": "QTEMPORARYFILE_LICENSE.txt", - "Copyright": "Copyright (c) 1987, 1993 The Regents of the University of California." -}, { "Id": "psl", "Name": "The Public Suffix List", @@ -39,4 +25,3 @@ supported by Qt (by the QNetworkCookieJar class).", "Copyright": "The list was originally provided by Jo Hermans <jo.hermans@gmail.com>. It is now maintained on github (https://github.com/publicsuffix/list)." } -] diff --git a/src/corelib/io/qtemporarydir.cpp b/src/corelib/io/qtemporarydir.cpp index 2779246c5b..ed52472ab3 100644 --- a/src/corelib/io/qtemporarydir.cpp +++ b/src/corelib/io/qtemporarydir.cpp @@ -42,12 +42,12 @@ #ifndef QT_NO_TEMPORARYFILE +#include "qdebug.h" #include "qdiriterator.h" +#include "qpair.h" #include "qplatformdefs.h" +#include "qrandom.h" #include "private/qtemporaryfile_p.h" -#include <QDebug> -#include <QPair> -#include <QRandomGenerator> #if defined(QT_BUILD_CORE_LIB) #include "qcoreapplication.h" diff --git a/src/corelib/io/qtemporarydir.h b/src/corelib/io/qtemporarydir.h index 3f6b70a2eb..5864ce5cfc 100644 --- a/src/corelib/io/qtemporarydir.h +++ b/src/corelib/io/qtemporarydir.h @@ -41,7 +41,7 @@ #define QTEMPORARYDIR_H #include <QtCore/qdir.h> -#include <QtCore/QScopedPointer> +#include <QtCore/qscopedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 35699d52df..1983a22c65 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -207,7 +207,7 @@ QFileSystemEntry::NativePath QTemporaryFileName::generateNext() changed and contain the generated path name. */ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &templ, - quint32 mode, QSystemError &error) + quint32 mode, int flags, QSystemError &error) { const int maxAttempts = 16; for (int attempt = 0; attempt < maxAttempts; ++attempt) { @@ -216,16 +216,18 @@ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &t #if defined(Q_OS_WIN) Q_UNUSED(mode); + const DWORD shareMode = (flags & QTemporaryFileEngine::Win32NonShared) + ? 0u : (FILE_SHARE_READ | FILE_SHARE_WRITE); # ifndef Q_OS_WINRT file = CreateFile((const wchar_t *)path.constData(), GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_NEW, + shareMode, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); # else // !Q_OS_WINRT file = CreateFile2((const wchar_t *)path.constData(), GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, CREATE_NEW, + shareMode, CREATE_NEW, NULL); # endif // Q_OS_WINRT @@ -247,8 +249,9 @@ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &t return false; } #else // POSIX + Q_UNUSED(flags) file = QT_OPEN(path.constData(), - QT_OPEN_CREAT | O_EXCL | QT_OPEN_RDWR | QT_OPEN_LARGEFILE, + QT_OPEN_CREAT | QT_OPEN_EXCL | QT_OPEN_RDWR | QT_OPEN_LARGEFILE, static_cast<mode_t>(mode)); if (file != -1) @@ -366,7 +369,7 @@ bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode) unnamedFile = true; d->fileEntry.clear(); } else if (st == CreateUnnamedFileStatus::NotSupported && - createFileFromTemplate(file, tfn, fileMode, error)) { + createFileFromTemplate(file, tfn, fileMode, flags, error)) { filePathIsTemplate = false; unnamedFile = false; d->fileEntry = QFileSystemEntry(tfn.path, QFileSystemEntry::FromNativePath()); diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h index 7fc5a299fc..90a6a613e6 100644 --- a/src/corelib/io/qtemporaryfile.h +++ b/src/corelib/io/qtemporaryfile.h @@ -77,7 +77,7 @@ public: // ### Hides open(flags) bool open() { return open(QIODevice::ReadWrite); } - QString fileName() const Q_DECL_OVERRIDE; + QString fileName() const override; QString fileTemplate() const; void setFileTemplate(const QString &name); @@ -95,7 +95,7 @@ public: static QTemporaryFile *createNativeFile(QFile &file); protected: - bool open(OpenMode flags) Q_DECL_OVERRIDE; + bool open(OpenMode flags) override; private: friend class QFile; diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h index fb8887af53..0fec88d3cd 100644 --- a/src/corelib/io/qtemporaryfile_p.h +++ b/src/corelib/io/qtemporaryfile_p.h @@ -108,8 +108,10 @@ class QTemporaryFileEngine : public QFSFileEngine { Q_DECLARE_PRIVATE(QFSFileEngine) public: - QTemporaryFileEngine(const QString *templateName) - : templateName(*templateName) + enum Flags { Win32NonShared = 0x1 }; + + explicit QTemporaryFileEngine(const QString *_templateName, int _flags = 0) + : templateName(*_templateName), flags(_flags) {} void initialize(const QString &file, quint32 mode, bool nameIsTemplate = true) @@ -144,6 +146,7 @@ public: const QString &templateName; quint32 fileMode; + int flags = 0; bool filePathIsTemplate; bool filePathWasTemplate; bool unnamedFile = false; diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp deleted file mode 100644 index ee3cb4efcb..0000000000 --- a/src/corelib/io/qtextstream.cpp +++ /dev/null @@ -1,3192 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#define QTEXTSTREAM_DEBUG -static const int QTEXTSTREAM_BUFFERSIZE = 16384; - -/*! - \class QTextStream - \inmodule QtCore - - \brief The QTextStream class provides a convenient interface for - reading and writing text. - - \ingroup io - \ingroup string-processing - \reentrant - - QTextStream can operate on a QIODevice, a QByteArray or a - QString. Using QTextStream's streaming operators, you can - conveniently read and write words, lines and numbers. For - generating text, QTextStream supports formatting options for field - padding and alignment, and formatting of numbers. Example: - - \snippet code/src_corelib_io_qtextstream.cpp 0 - - It's also common to use QTextStream to read console input and write - console output. QTextStream is locale aware, and will automatically decode - standard input using the correct codec. Example: - - \snippet code/src_corelib_io_qtextstream.cpp 1 - - Besides using QTextStream's constructors, you can also set the - device or string QTextStream operates on by calling setDevice() or - setString(). You can seek to a position by calling seek(), and - atEnd() will return true when there is no data left to be read. If - you call flush(), QTextStream will empty all data from its write - buffer into the device and call flush() on the device. - - Internally, QTextStream uses a Unicode based buffer, and - QTextCodec is used by QTextStream to automatically support - different character sets. By default, QTextCodec::codecForLocale() - is used for reading and writing, but you can also set the codec by - calling setCodec(). Automatic Unicode detection is also - supported. When this feature is enabled (the default behavior), - QTextStream will detect the UTF-16 or the UTF-32 BOM (Byte Order Mark) and - switch to the appropriate UTF codec when reading. QTextStream - does not write a BOM by default, but you can enable this by calling - setGenerateByteOrderMark(true). When QTextStream operates on a QString - directly, the codec is disabled. - - There are three general ways to use QTextStream when reading text - files: - - \list - - \li Chunk by chunk, by calling readLine() or readAll(). - - \li Word by word. QTextStream supports streaming into \l {QString}s, - \l {QByteArray}s and char* buffers. Words are delimited by space, and - leading white space is automatically skipped. - - \li Character by character, by streaming into QChar or char types. - This method is often used for convenient input handling when - parsing files, independent of character encoding and end-of-line - semantics. To skip white space, call skipWhiteSpace(). - - \endlist - - Since the text stream uses a buffer, you should not read from - the stream using the implementation of a superclass. For instance, - if you have a QFile and read from it directly using - QFile::readLine() instead of using the stream, the text stream's - internal position will be out of sync with the file's position. - - By default, when reading numbers from a stream of text, - QTextStream will automatically detect the number's base - representation. For example, if the number starts with "0x", it is - assumed to be in hexadecimal form. If it starts with the digits - 1-9, it is assumed to be in decimal form, and so on. You can set - the integer base, thereby disabling the automatic detection, by - calling setIntegerBase(). Example: - - \snippet code/src_corelib_io_qtextstream.cpp 2 - - QTextStream supports many formatting options for generating text. - You can set the field width and pad character by calling - setFieldWidth() and setPadChar(). Use setFieldAlignment() to set - the alignment within each field. For real numbers, call - setRealNumberNotation() and setRealNumberPrecision() to set the - notation (SmartNotation, ScientificNotation, FixedNotation) and precision in - digits of the generated number. Some extra number formatting - options are also available through setNumberFlags(). - - \target QTextStream manipulators - - Like \c <iostream> in the standard C++ library, QTextStream also - defines several global manipulator functions: - - \table - \header \li Manipulator \li Description - \row \li \c bin \li Same as setIntegerBase(2). - \row \li \c oct \li Same as setIntegerBase(8). - \row \li \c dec \li Same as setIntegerBase(10). - \row \li \c hex \li Same as setIntegerBase(16). - \row \li \c showbase \li Same as setNumberFlags(numberFlags() | ShowBase). - \row \li \c forcesign \li Same as setNumberFlags(numberFlags() | ForceSign). - \row \li \c forcepoint \li Same as setNumberFlags(numberFlags() | ForcePoint). - \row \li \c noshowbase \li Same as setNumberFlags(numberFlags() & ~ShowBase). - \row \li \c noforcesign \li Same as setNumberFlags(numberFlags() & ~ForceSign). - \row \li \c noforcepoint \li Same as setNumberFlags(numberFlags() & ~ForcePoint). - \row \li \c uppercasebase \li Same as setNumberFlags(numberFlags() | UppercaseBase). - \row \li \c uppercasedigits \li Same as setNumberFlags(numberFlags() | UppercaseDigits). - \row \li \c lowercasebase \li Same as setNumberFlags(numberFlags() & ~UppercaseBase). - \row \li \c lowercasedigits \li Same as setNumberFlags(numberFlags() & ~UppercaseDigits). - \row \li \c fixed \li Same as setRealNumberNotation(FixedNotation). - \row \li \c scientific \li Same as setRealNumberNotation(ScientificNotation). - \row \li \c left \li Same as setFieldAlignment(AlignLeft). - \row \li \c right \li Same as setFieldAlignment(AlignRight). - \row \li \c center \li Same as setFieldAlignment(AlignCenter). - \row \li \c endl \li Same as operator<<('\\n') and flush(). - \row \li \c flush \li Same as flush(). - \row \li \c reset \li Same as reset(). - \row \li \c ws \li Same as skipWhiteSpace(). - \row \li \c bom \li Same as setGenerateByteOrderMark(true). - \endtable - - In addition, Qt provides three global manipulators that take a - parameter: qSetFieldWidth(), qSetPadChar(), and - qSetRealNumberPrecision(). - - \sa QDataStream, QIODevice, QFile, QBuffer, QTcpSocket, {Text Codecs Example} -*/ - -/*! \enum QTextStream::RealNumberNotation - - This enum specifies which notations to use for expressing \c - float and \c double as strings. - - \value ScientificNotation Scientific notation (\c{printf()}'s \c %e flag). - \value FixedNotation Fixed-point notation (\c{printf()}'s \c %f flag). - \value SmartNotation Scientific or fixed-point notation, depending on which makes most sense (\c{printf()}'s \c %g flag). - - \sa setRealNumberNotation() -*/ - -/*! \enum QTextStream::FieldAlignment - - This enum specifies how to align text in fields when the field is - wider than the text that occupies it. - - \value AlignLeft Pad on the right side of fields. - \value AlignRight Pad on the left side of fields. - \value AlignCenter Pad on both sides of field. - \value AlignAccountingStyle Same as AlignRight, except that the - sign of a number is flush left. - - \sa setFieldAlignment() -*/ - -/*! \enum QTextStream::NumberFlag - - This enum specifies various flags that can be set to affect the - output of integers, \c{float}s, and \c{double}s. - - \value ShowBase Show the base as a prefix if the base - is 16 ("0x"), 8 ("0"), or 2 ("0b"). - \value ForcePoint Always put the decimal separator in numbers, even if - there are no decimals. - \value ForceSign Always put the sign in numbers, even for positive numbers. - \value UppercaseBase Use uppercase versions of base prefixes ("0X", "0B"). - \value UppercaseDigits Use uppercase letters for expressing - digits 10 to 35 instead of lowercase. - - \sa setNumberFlags() -*/ - -/*! \enum QTextStream::Status - - This enum describes the current status of the text stream. - - \value Ok The text stream is operating normally. - \value ReadPastEnd The text stream has read past the end of the - data in the underlying device. - \value ReadCorruptData The text stream has read corrupt data. - \value WriteFailed The text stream cannot write to the underlying device. - - \sa status() -*/ - -#include "qtextstream.h" -#include "private/qtextstream_p.h" -#include "qbuffer.h" -#include "qfile.h" -#include "qnumeric.h" -#include "qvarlengtharray.h" - -#include <locale.h> -#include "private/qlocale_p.h" - -#include <stdlib.h> -#include <limits.h> -#include <new> - -#if defined QTEXTSTREAM_DEBUG -#include <ctype.h> -#include "private/qtools_p.h" - -QT_BEGIN_NAMESPACE - -// Returns a human readable representation of the first \a len -// characters in \a data. -static QByteArray qt_prettyDebug(const char *data, int len, int maxSize) -{ - if (!data) return "(null)"; - QByteArray out; - for (int i = 0; i < len; ++i) { - char c = data[i]; - if (isprint(int(uchar(c)))) { - out += c; - } else switch (c) { - case '\n': out += "\\n"; break; - case '\r': out += "\\r"; break; - case '\t': out += "\\t"; break; - default: { - const char buf[] = { - '\\', - 'x', - QtMiscUtils::toHexLower(uchar(c) / 16), - QtMiscUtils::toHexLower(uchar(c) % 16), - 0 - }; - out += buf; - } - } - } - - if (len < maxSize) - out += "..."; - - return out; -} -QT_END_NAMESPACE - -#endif - -// A precondition macro -#define Q_VOID -#define CHECK_VALID_STREAM(x) do { \ - if (!d->string && !d->device) { \ - qWarning("QTextStream: No device"); \ - return x; \ - } } while (0) - -// Base implementations of operator>> for ints and reals -#define IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(type) do { \ - Q_D(QTextStream); \ - CHECK_VALID_STREAM(*this); \ - qulonglong tmp; \ - switch (d->getNumber(&tmp)) { \ - case QTextStreamPrivate::npsOk: \ - i = (type)tmp; \ - break; \ - case QTextStreamPrivate::npsMissingDigit: \ - case QTextStreamPrivate::npsInvalidPrefix: \ - i = (type)0; \ - setStatus(atEnd() ? QTextStream::ReadPastEnd : QTextStream::ReadCorruptData); \ - break; \ - } \ - return *this; } while (0) - -#define IMPLEMENT_STREAM_RIGHT_REAL_OPERATOR(type) do { \ - Q_D(QTextStream); \ - CHECK_VALID_STREAM(*this); \ - double tmp; \ - if (d->getReal(&tmp)) { \ - f = (type)tmp; \ - } else { \ - f = (type)0; \ - setStatus(atEnd() ? QTextStream::ReadPastEnd : QTextStream::ReadCorruptData); \ - } \ - return *this; } while (0) - -QT_BEGIN_NAMESPACE - -//------------------------------------------------------------------- - -/*! - \internal -*/ -QTextStreamPrivate::QTextStreamPrivate(QTextStream *q_ptr) - : -#ifndef QT_NO_TEXTCODEC - readConverterSavedState(0), -#endif - readConverterSavedStateOffset(0), - locale(QLocale::c()) -{ - this->q_ptr = q_ptr; - reset(); -} - -/*! - \internal -*/ -QTextStreamPrivate::~QTextStreamPrivate() -{ - if (deleteDevice) { -#ifndef QT_NO_QOBJECT - device->blockSignals(true); -#endif - delete device; - } -#ifndef QT_NO_TEXTCODEC - delete readConverterSavedState; -#endif -} - -#ifndef QT_NO_TEXTCODEC -static void resetCodecConverterStateHelper(QTextCodec::ConverterState *state) -{ - state->~ConverterState(); - new (state) QTextCodec::ConverterState; -} - -static void copyConverterStateHelper(QTextCodec::ConverterState *dest, - const QTextCodec::ConverterState *src) -{ - // ### QTextCodec::ConverterState's copy constructors and assignments are - // private. This function copies the structure manually. - Q_ASSERT(!src->d); - dest->flags = src->flags; - dest->invalidChars = src->invalidChars; - dest->state_data[0] = src->state_data[0]; - dest->state_data[1] = src->state_data[1]; - dest->state_data[2] = src->state_data[2]; -} -#endif - -void QTextStreamPrivate::Params::reset() -{ - realNumberPrecision = 6; - integerBase = 0; - fieldWidth = 0; - padChar = QLatin1Char(' '); - fieldAlignment = QTextStream::AlignRight; - realNumberNotation = QTextStream::SmartNotation; - numberFlags = 0; -} - -/*! - \internal -*/ -void QTextStreamPrivate::reset() -{ - params.reset(); - - device = 0; - deleteDevice = false; - string = 0; - stringOffset = 0; - stringOpenMode = QIODevice::NotOpen; - - readBufferOffset = 0; - readBufferStartDevicePos = 0; - lastTokenSize = 0; - -#ifndef QT_NO_TEXTCODEC - codec = QTextCodec::codecForLocale(); - resetCodecConverterStateHelper(&readConverterState); - resetCodecConverterStateHelper(&writeConverterState); - delete readConverterSavedState; - readConverterSavedState = 0; - writeConverterState.flags |= QTextCodec::IgnoreHeader; - autoDetectUnicode = true; -#endif -} - -/*! - \internal -*/ -bool QTextStreamPrivate::fillReadBuffer(qint64 maxBytes) -{ - // no buffer next to the QString itself; this function should only - // be called internally, for devices. - Q_ASSERT(!string); - Q_ASSERT(device); - - // handle text translation and bypass the Text flag in the device. - bool textModeEnabled = device->isTextModeEnabled(); - if (textModeEnabled) - device->setTextModeEnabled(false); - - // read raw data into a temporary buffer - char buf[QTEXTSTREAM_BUFFERSIZE]; - qint64 bytesRead = 0; -#if defined(Q_OS_WIN) - // On Windows, there is no non-blocking stdin - so we fall back to reading - // lines instead. If there is no QOBJECT, we read lines for all sequential - // devices; otherwise, we read lines only for stdin. - QFile *file = 0; - Q_UNUSED(file); - if (device->isSequential() -#if !defined(QT_NO_QOBJECT) - && (file = qobject_cast<QFile *>(device)) && file->handle() == 0 -#endif - ) { - if (maxBytes != -1) - bytesRead = device->readLine(buf, qMin<qint64>(sizeof(buf), maxBytes)); - else - bytesRead = device->readLine(buf, sizeof(buf)); - } else -#endif - { - if (maxBytes != -1) - bytesRead = device->read(buf, qMin<qint64>(sizeof(buf), maxBytes)); - else - bytesRead = device->read(buf, sizeof(buf)); - } - - // reset the Text flag. - if (textModeEnabled) - device->setTextModeEnabled(true); - - if (bytesRead <= 0) - return false; - -#ifndef QT_NO_TEXTCODEC - // codec auto detection, explicitly defaults to locale encoding if the - // codec has been set to 0. - if (!codec || autoDetectUnicode) { - autoDetectUnicode = false; - - codec = QTextCodec::codecForUtfText(QByteArray::fromRawData(buf, bytesRead), codec); - if (!codec) { - codec = QTextCodec::codecForLocale(); - writeConverterState.flags |= QTextCodec::IgnoreHeader; - } - } -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::fillReadBuffer(), using %s codec", - codec ? codec->name().constData() : "no"); -#endif -#endif - -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::fillReadBuffer(), device->read(\"%s\", %d) == %d", - qt_prettyDebug(buf, qMin(32,int(bytesRead)) , int(bytesRead)).constData(), int(sizeof(buf)), int(bytesRead)); -#endif - - int oldReadBufferSize = readBuffer.size(); -#ifndef QT_NO_TEXTCODEC - // convert to unicode - readBuffer += Q_LIKELY(codec) ? codec->toUnicode(buf, bytesRead, &readConverterState) - : QString::fromLatin1(buf, bytesRead); -#else - readBuffer += QString::fromLatin1(buf, bytesRead); -#endif - - // remove all '\r\n' in the string. - if (readBuffer.size() > oldReadBufferSize && textModeEnabled) { - QChar CR = QLatin1Char('\r'); - QChar *writePtr = readBuffer.data() + oldReadBufferSize; - QChar *readPtr = readBuffer.data() + oldReadBufferSize; - QChar *endPtr = readBuffer.data() + readBuffer.size(); - - int n = oldReadBufferSize; - if (readPtr < endPtr) { - // Cut-off to avoid unnecessary self-copying. - while (*readPtr++ != CR) { - ++n; - if (++writePtr == endPtr) - break; - } - } - while (readPtr < endPtr) { - QChar ch = *readPtr++; - if (ch != CR) { - *writePtr++ = ch; - } else { - if (n < readBufferOffset) - --readBufferOffset; - --bytesRead; - } - ++n; - } - readBuffer.resize(writePtr - readBuffer.data()); - } - -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::fillReadBuffer() read %d bytes from device. readBuffer = [%s]", int(bytesRead), - qt_prettyDebug(readBuffer.toLatin1(), readBuffer.size(), readBuffer.size()).data()); -#endif - return true; -} - -/*! - \internal -*/ -void QTextStreamPrivate::resetReadBuffer() -{ - readBuffer.clear(); - readBufferOffset = 0; - readBufferStartDevicePos = (device ? device->pos() : 0); -} - -/*! - \internal -*/ -void QTextStreamPrivate::flushWriteBuffer() -{ - // no buffer next to the QString itself; this function should only - // be called internally, for devices. - if (string || !device) - return; - - // Stream went bye-bye already. Appending further data may succeed again, - // but would create a corrupted stream anyway. - if (status != QTextStream::Ok) - return; - - if (writeBuffer.isEmpty()) - return; - -#if defined (Q_OS_WIN) - // handle text translation and bypass the Text flag in the device. - bool textModeEnabled = device->isTextModeEnabled(); - if (textModeEnabled) { - device->setTextModeEnabled(false); - writeBuffer.replace(QLatin1Char('\n'), QLatin1String("\r\n")); - } -#endif - -#ifndef QT_NO_TEXTCODEC - if (!codec) - codec = QTextCodec::codecForLocale(); -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::flushWriteBuffer(), using %s codec (%s generating BOM)", - codec ? codec->name().constData() : "no", - !codec || (writeConverterState.flags & QTextCodec::IgnoreHeader) ? "not" : ""); -#endif - - // convert from unicode to raw data - // codec might be null if we're already inside global destructors (QTestCodec::codecForLocale returned null) - QByteArray data = Q_LIKELY(codec) ? codec->fromUnicode(writeBuffer.data(), writeBuffer.size(), &writeConverterState) - : writeBuffer.toLatin1(); -#else - QByteArray data = writeBuffer.toLatin1(); -#endif - writeBuffer.clear(); - - // write raw data to the device - qint64 bytesWritten = device->write(data); -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::flushWriteBuffer(), device->write(\"%s\") == %d", - qt_prettyDebug(data.constData(), qMin(data.size(),32), data.size()).constData(), int(bytesWritten)); -#endif - -#if defined (Q_OS_WIN) - // reset the text flag - if (textModeEnabled) - device->setTextModeEnabled(true); -#endif - - if (bytesWritten <= 0) { - status = QTextStream::WriteFailed; - return; - } - - // flush the file -#ifndef QT_NO_QOBJECT - QFileDevice *file = qobject_cast<QFileDevice *>(device); - bool flushed = !file || file->flush(); -#else - bool flushed = true; -#endif - -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::flushWriteBuffer() wrote %d bytes", - int(bytesWritten)); -#endif - if (!flushed || bytesWritten != qint64(data.size())) - status = QTextStream::WriteFailed; -} - -QString QTextStreamPrivate::read(int maxlen) -{ - QString ret; - if (string) { - lastTokenSize = qMin(maxlen, string->size() - stringOffset); - ret = string->mid(stringOffset, lastTokenSize); - } else { - while (readBuffer.size() - readBufferOffset < maxlen && fillReadBuffer()) ; - lastTokenSize = qMin(maxlen, readBuffer.size() - readBufferOffset); - ret = readBuffer.mid(readBufferOffset, lastTokenSize); - } - consumeLastToken(); - -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::read() maxlen = %d, token length = %d", maxlen, ret.length()); -#endif - return ret; -} - -/*! - \internal - - Scans no more than \a maxlen QChars in the current buffer for the - first \a delimiter. Stores a pointer to the start offset of the - token in \a ptr, and the length in QChars in \a length. -*/ -bool QTextStreamPrivate::scan(const QChar **ptr, int *length, int maxlen, TokenDelimiter delimiter) -{ - int totalSize = 0; - int delimSize = 0; - bool consumeDelimiter = false; - bool foundToken = false; - int startOffset = device ? readBufferOffset : stringOffset; - QChar lastChar; - - bool canStillReadFromDevice = true; - do { - int endOffset; - const QChar *chPtr; - if (device) { - chPtr = readBuffer.constData(); - endOffset = readBuffer.size(); - } else { - chPtr = string->constData(); - endOffset = string->size(); - } - chPtr += startOffset; - - for (; !foundToken && startOffset < endOffset && (!maxlen || totalSize < maxlen); ++startOffset) { - const QChar ch = *chPtr++; - ++totalSize; - - switch (delimiter) { - case Space: - if (ch.isSpace()) { - foundToken = true; - delimSize = 1; - } - break; - case NotSpace: - if (!ch.isSpace()) { - foundToken = true; - delimSize = 1; - } - break; - case EndOfLine: - if (ch == QLatin1Char('\n')) { - foundToken = true; - delimSize = (lastChar == QLatin1Char('\r')) ? 2 : 1; - consumeDelimiter = true; - } - lastChar = ch; - break; - } - } - } while (!foundToken - && (!maxlen || totalSize < maxlen) - && (device && (canStillReadFromDevice = fillReadBuffer()))); - - if (totalSize == 0) { -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::scan() reached the end of input."); -#endif - return false; - } - - // if we find a '\r' at the end of the data when reading lines, - // don't make it part of the line. - if (delimiter == EndOfLine && totalSize > 0 && !foundToken) { - if (((string && stringOffset + totalSize == string->size()) || (device && device->atEnd())) - && lastChar == QLatin1Char('\r')) { - consumeDelimiter = true; - ++delimSize; - } - } - - // set the read offset and length of the token - if (length) - *length = totalSize - delimSize; - if (ptr) - *ptr = readPtr(); - - // update last token size. the callee will call consumeLastToken() when - // done. - lastTokenSize = totalSize; - if (!consumeDelimiter) - lastTokenSize -= delimSize; - -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::scan(%p, %p, %d, %x) token length = %d, delimiter = %d", - ptr, length, maxlen, (int)delimiter, totalSize - delimSize, delimSize); -#endif - return true; -} - -/*! - \internal -*/ -inline const QChar *QTextStreamPrivate::readPtr() const -{ - Q_ASSERT(readBufferOffset <= readBuffer.size()); - if (string) - return string->constData() + stringOffset; - return readBuffer.constData() + readBufferOffset; -} - -/*! - \internal -*/ -inline void QTextStreamPrivate::consumeLastToken() -{ - if (lastTokenSize) - consume(lastTokenSize); - lastTokenSize = 0; -} - -/*! - \internal -*/ -inline void QTextStreamPrivate::consume(int size) -{ -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStreamPrivate::consume(%d)", size); -#endif - if (string) { - stringOffset += size; - if (stringOffset > string->size()) - stringOffset = string->size(); - } else { - readBufferOffset += size; - if (readBufferOffset >= readBuffer.size()) { - readBufferOffset = 0; - readBuffer.clear(); - saveConverterState(device->pos()); - } else if (readBufferOffset > QTEXTSTREAM_BUFFERSIZE) { - readBuffer = readBuffer.remove(0,readBufferOffset); - readConverterSavedStateOffset += readBufferOffset; - readBufferOffset = 0; - } - } -} - -/*! - \internal -*/ -inline void QTextStreamPrivate::saveConverterState(qint64 newPos) -{ -#ifndef QT_NO_TEXTCODEC - if (readConverterState.d) { - // converter cannot be copied, so don't save anything - // don't update readBufferStartDevicePos either - return; - } - - if (!readConverterSavedState) - readConverterSavedState = new QTextCodec::ConverterState; - copyConverterStateHelper(readConverterSavedState, &readConverterState); -#endif - - readBufferStartDevicePos = newPos; - readConverterSavedStateOffset = 0; -} - -/*! - \internal -*/ -inline void QTextStreamPrivate::restoreToSavedConverterState() -{ -#ifndef QT_NO_TEXTCODEC - if (readConverterSavedState) { - // we have a saved state - // that means the converter can be copied - copyConverterStateHelper(&readConverterState, readConverterSavedState); - } else { - // the only state we could save was the initial - // so reset to that - resetCodecConverterStateHelper(&readConverterState); - } -#endif -} - -/*! - \internal -*/ -void QTextStreamPrivate::write(const QChar *data, int len) -{ - if (string) { - // ### What about seek()?? - string->append(data, len); - } else { - writeBuffer.append(data, len); - if (writeBuffer.size() > QTEXTSTREAM_BUFFERSIZE) - flushWriteBuffer(); - } -} - -/*! - \internal -*/ -inline void QTextStreamPrivate::write(QChar ch) -{ - if (string) { - // ### What about seek()?? - string->append(ch); - } else { - writeBuffer += ch; - if (writeBuffer.size() > QTEXTSTREAM_BUFFERSIZE) - flushWriteBuffer(); - } -} - -/*! - \internal -*/ -void QTextStreamPrivate::write(QLatin1String data) -{ - if (string) { - // ### What about seek()?? - string->append(data); - } else { - writeBuffer += data; - if (writeBuffer.size() > QTEXTSTREAM_BUFFERSIZE) - flushWriteBuffer(); - } -} - -/*! - \internal -*/ -void QTextStreamPrivate::writePadding(int len) -{ - if (string) { - // ### What about seek()?? - string->resize(string->size() + len, params.padChar); - } else { - writeBuffer.resize(writeBuffer.size() + len, params.padChar); - if (writeBuffer.size() > QTEXTSTREAM_BUFFERSIZE) - flushWriteBuffer(); - } -} - -/*! - \internal -*/ -inline bool QTextStreamPrivate::getChar(QChar *ch) -{ - if ((string && stringOffset == string->size()) - || (device && readBuffer.isEmpty() && !fillReadBuffer())) { - if (ch) - *ch = 0; - return false; - } - if (ch) - *ch = *readPtr(); - consume(1); - return true; -} - -/*! - \internal -*/ -inline void QTextStreamPrivate::ungetChar(QChar ch) -{ - if (string) { - if (stringOffset == 0) - string->prepend(ch); - else - (*string)[--stringOffset] = ch; - return; - } - - if (readBufferOffset == 0) { - readBuffer.prepend(ch); - return; - } - - readBuffer[--readBufferOffset] = ch; -} - -/*! - \internal -*/ -inline void QTextStreamPrivate::putChar(QChar ch) -{ - if (params.fieldWidth > 0) - putString(&ch, 1); - else - write(ch); -} - - -/*! - \internal -*/ -QTextStreamPrivate::PaddingResult QTextStreamPrivate::padding(int len) const -{ - Q_ASSERT(params.fieldWidth > len); // calling padding() when no padding is needed is an error - - int left = 0, right = 0; - - const int padSize = params.fieldWidth - len; - - switch (params.fieldAlignment) { - case QTextStream::AlignLeft: - right = padSize; - break; - case QTextStream::AlignRight: - case QTextStream::AlignAccountingStyle: - left = padSize; - break; - case QTextStream::AlignCenter: - left = padSize/2; - right = padSize - padSize/2; - break; - } - return { left, right }; -} - -/*! - \internal -*/ -void QTextStreamPrivate::putString(const QChar *data, int len, bool number) -{ - if (Q_UNLIKELY(params.fieldWidth > len)) { - - // handle padding: - - const PaddingResult pad = padding(len); - - if (params.fieldAlignment == QTextStream::AlignAccountingStyle && number) { - const QChar sign = len > 0 ? data[0] : QChar(); - if (sign == locale.negativeSign() || sign == locale.positiveSign()) { - // write the sign before the padding, then skip it later - write(&sign, 1); - ++data; - --len; - } - } - - writePadding(pad.left); - write(data, len); - writePadding(pad.right); - } else { - write(data, len); - } -} - -/*! - \internal -*/ -void QTextStreamPrivate::putString(QLatin1String data, bool number) -{ - if (Q_UNLIKELY(params.fieldWidth > data.size())) { - - // handle padding - - const PaddingResult pad = padding(data.size()); - - if (params.fieldAlignment == QTextStream::AlignAccountingStyle && number) { - const QChar sign = data.size() > 0 ? QLatin1Char(*data.data()) : QChar(); - if (sign == locale.negativeSign() || sign == locale.positiveSign()) { - // write the sign before the padding, then skip it later - write(&sign, 1); - data = QLatin1String(data.data() + 1, data.size() - 1); - } - } - - writePadding(pad.left); - write(data); - writePadding(pad.right); - } else { - write(data); - } -} - -/*! - Constructs a QTextStream. Before you can use it for reading or - writing, you must assign a device or a string. - - \sa setDevice(), setString() -*/ -QTextStream::QTextStream() - : d_ptr(new QTextStreamPrivate(this)) -{ -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStream::QTextStream()"); -#endif - Q_D(QTextStream); - d->status = Ok; -} - -/*! - Constructs a QTextStream that operates on \a device. -*/ -QTextStream::QTextStream(QIODevice *device) - : d_ptr(new QTextStreamPrivate(this)) -{ -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStream::QTextStream(QIODevice *device == *%p)", - device); -#endif - Q_D(QTextStream); - d->device = device; -#ifndef QT_NO_QOBJECT - d->deviceClosedNotifier.setupDevice(this, d->device); -#endif - d->status = Ok; -} - -/*! - Constructs a QTextStream that operates on \a string, using \a - openMode to define the open mode. -*/ -QTextStream::QTextStream(QString *string, QIODevice::OpenMode openMode) - : d_ptr(new QTextStreamPrivate(this)) -{ -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStream::QTextStream(QString *string == *%p, openMode = %d)", - string, int(openMode)); -#endif - Q_D(QTextStream); - d->string = string; - d->stringOpenMode = openMode; - d->status = Ok; -} - -/*! - Constructs a QTextStream that operates on \a array, using \a - openMode to define the open mode. Internally, the array is wrapped - by a QBuffer. -*/ -QTextStream::QTextStream(QByteArray *array, QIODevice::OpenMode openMode) - : d_ptr(new QTextStreamPrivate(this)) -{ -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStream::QTextStream(QByteArray *array == *%p, openMode = %d)", - array, int(openMode)); -#endif - Q_D(QTextStream); - d->device = new QBuffer(array); - d->device->open(openMode); - d->deleteDevice = true; -#ifndef QT_NO_QOBJECT - d->deviceClosedNotifier.setupDevice(this, d->device); -#endif - d->status = Ok; -} - -/*! - Constructs a QTextStream that operates on \a array, using \a - openMode to define the open mode. The array is accessed as - read-only, regardless of the values in \a openMode. - - This constructor is convenient for working on constant - strings. Example: - - \snippet code/src_corelib_io_qtextstream.cpp 3 -*/ -QTextStream::QTextStream(const QByteArray &array, QIODevice::OpenMode openMode) - : d_ptr(new QTextStreamPrivate(this)) -{ -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStream::QTextStream(const QByteArray &array == *(%p), openMode = %d)", - &array, int(openMode)); -#endif - QBuffer *buffer = new QBuffer; - buffer->setData(array); - buffer->open(openMode); - - Q_D(QTextStream); - d->device = buffer; - d->deleteDevice = true; -#ifndef QT_NO_QOBJECT - d->deviceClosedNotifier.setupDevice(this, d->device); -#endif - d->status = Ok; -} - -/*! - Constructs a QTextStream that operates on \a fileHandle, using \a - openMode to define the open mode. Internally, a QFile is created - to handle the FILE pointer. - - This constructor is useful for working directly with the common - FILE based input and output streams: stdin, stdout and stderr. Example: - - \snippet code/src_corelib_io_qtextstream.cpp 4 -*/ - -QTextStream::QTextStream(FILE *fileHandle, QIODevice::OpenMode openMode) - : d_ptr(new QTextStreamPrivate(this)) -{ -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStream::QTextStream(FILE *fileHandle = %p, openMode = %d)", - fileHandle, int(openMode)); -#endif - QFile *file = new QFile; - file->open(fileHandle, openMode); - - Q_D(QTextStream); - d->device = file; - d->deleteDevice = true; -#ifndef QT_NO_QOBJECT - d->deviceClosedNotifier.setupDevice(this, d->device); -#endif - d->status = Ok; -} - -/*! - Destroys the QTextStream. - - If the stream operates on a device, flush() will be called - implicitly. Otherwise, the device is unaffected. -*/ -QTextStream::~QTextStream() -{ - Q_D(QTextStream); -#if defined (QTEXTSTREAM_DEBUG) - qDebug("QTextStream::~QTextStream()"); -#endif - if (!d->writeBuffer.isEmpty()) - d->flushWriteBuffer(); -} - -/*! - Resets QTextStream's formatting options, bringing it back to its - original constructed state. The device, string and any buffered - data is left untouched. -*/ -void QTextStream::reset() -{ - Q_D(QTextStream); - - d->params.reset(); -} - -/*! - Flushes any buffered data waiting to be written to the device. - - If QTextStream operates on a string, this function does nothing. -*/ -void QTextStream::flush() -{ - Q_D(QTextStream); - d->flushWriteBuffer(); -} - -/*! - Seeks to the position \a pos in the device. Returns \c true on - success; otherwise returns \c false. -*/ -bool QTextStream::seek(qint64 pos) -{ - Q_D(QTextStream); - d->lastTokenSize = 0; - - if (d->device) { - // Empty the write buffer - d->flushWriteBuffer(); - if (!d->device->seek(pos)) - return false; - d->resetReadBuffer(); - -#ifndef QT_NO_TEXTCODEC - // Reset the codec converter states. - resetCodecConverterStateHelper(&d->readConverterState); - resetCodecConverterStateHelper(&d->writeConverterState); - delete d->readConverterSavedState; - d->readConverterSavedState = 0; - d->writeConverterState.flags |= QTextCodec::IgnoreHeader; -#endif - return true; - } - - // string - if (d->string && pos <= d->string->size()) { - d->stringOffset = int(pos); - return true; - } - return false; -} - -/*! - \since 4.2 - - Returns the device position corresponding to the current position of the - stream, or -1 if an error occurs (e.g., if there is no device or string, - or if there's a device error). - - Because QTextStream is buffered, this function may have to - seek the device to reconstruct a valid device position. This - operation can be expensive, so you may want to avoid calling this - function in a tight loop. - - \sa seek() -*/ -qint64 QTextStream::pos() const -{ - Q_D(const QTextStream); - if (d->device) { - // Cutoff - if (d->readBuffer.isEmpty()) - return d->device->pos(); - if (d->device->isSequential()) - return 0; - - // Seek the device - if (!d->device->seek(d->readBufferStartDevicePos)) - return qint64(-1); - - // Reset the read buffer - QTextStreamPrivate *thatd = const_cast<QTextStreamPrivate *>(d); - thatd->readBuffer.clear(); - -#ifndef QT_NO_TEXTCODEC - thatd->restoreToSavedConverterState(); - if (d->readBufferStartDevicePos == 0) - thatd->autoDetectUnicode = true; -#endif - - // Rewind the device to get to the current position Ensure that - // readBufferOffset is unaffected by fillReadBuffer() - int oldReadBufferOffset = d->readBufferOffset + d->readConverterSavedStateOffset; - while (d->readBuffer.size() < oldReadBufferOffset) { - if (!thatd->fillReadBuffer(1)) - return qint64(-1); - } - thatd->readBufferOffset = oldReadBufferOffset; - thatd->readConverterSavedStateOffset = 0; - - // Return the device position. - return d->device->pos(); - } - - if (d->string) - return d->stringOffset; - - qWarning("QTextStream::pos: no device"); - return qint64(-1); -} - -/*! - Reads and discards whitespace from the stream until either a - non-space character is detected, or until atEnd() returns - true. This function is useful when reading a stream character by - character. - - Whitespace characters are all characters for which - QChar::isSpace() returns \c true. - - \sa operator>>() -*/ -void QTextStream::skipWhiteSpace() -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(Q_VOID); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); - d->consumeLastToken(); -} - -/*! - Sets the current device to \a device. If a device has already been - assigned, QTextStream will call flush() before the old device is - replaced. - - \note This function resets locale to the default locale ('C') - and codec to the default codec, QTextCodec::codecForLocale(). - - \sa device(), setString() -*/ -void QTextStream::setDevice(QIODevice *device) -{ - Q_D(QTextStream); - flush(); - if (d->deleteDevice) { -#ifndef QT_NO_QOBJECT - d->deviceClosedNotifier.disconnect(); -#endif - delete d->device; - d->deleteDevice = false; - } - - d->reset(); - d->status = Ok; - d->device = device; - d->resetReadBuffer(); -#ifndef QT_NO_QOBJECT - d->deviceClosedNotifier.setupDevice(this, d->device); -#endif -} - -/*! - Returns the current device associated with the QTextStream, - or 0 if no device has been assigned. - - \sa setDevice(), string() -*/ -QIODevice *QTextStream::device() const -{ - Q_D(const QTextStream); - return d->device; -} - -/*! - Sets the current string to \a string, using the given \a - openMode. If a device has already been assigned, QTextStream will - call flush() before replacing it. - - \sa string(), setDevice() -*/ -void QTextStream::setString(QString *string, QIODevice::OpenMode openMode) -{ - Q_D(QTextStream); - flush(); - if (d->deleteDevice) { -#ifndef QT_NO_QOBJECT - d->deviceClosedNotifier.disconnect(); - d->device->blockSignals(true); -#endif - delete d->device; - d->deleteDevice = false; - } - - d->reset(); - d->status = Ok; - d->string = string; - d->stringOpenMode = openMode; -} - -/*! - Returns the current string assigned to the QTextStream, or 0 if no - string has been assigned. - - \sa setString(), device() -*/ -QString *QTextStream::string() const -{ - Q_D(const QTextStream); - return d->string; -} - -/*! - Sets the field alignment to \a mode. When used together with - setFieldWidth(), this function allows you to generate formatted - output with text aligned to the left, to the right or center - aligned. - - \sa fieldAlignment(), setFieldWidth() -*/ -void QTextStream::setFieldAlignment(FieldAlignment mode) -{ - Q_D(QTextStream); - d->params.fieldAlignment = mode; -} - -/*! - Returns the current field alignment. - - \sa setFieldAlignment(), fieldWidth() -*/ -QTextStream::FieldAlignment QTextStream::fieldAlignment() const -{ - Q_D(const QTextStream); - return d->params.fieldAlignment; -} - -/*! - Sets the pad character to \a ch. The default value is the ASCII - space character (' '), or QChar(0x20). This character is used to - fill in the space in fields when generating text. - - Example: - - \snippet code/src_corelib_io_qtextstream.cpp 5 - - The string \c s contains: - - \snippet code/src_corelib_io_qtextstream.cpp 6 - - \sa padChar(), setFieldWidth() -*/ -void QTextStream::setPadChar(QChar ch) -{ - Q_D(QTextStream); - d->params.padChar = ch; -} - -/*! - Returns the current pad character. - - \sa setPadChar(), setFieldWidth() -*/ -QChar QTextStream::padChar() const -{ - Q_D(const QTextStream); - return d->params.padChar; -} - -/*! - Sets the current field width to \a width. If \a width is 0 (the - default), the field width is equal to the length of the generated - text. - - \note The field width applies to every element appended to this - stream after this function has been called (e.g., it also pads - endl). This behavior is different from similar classes in the STL, - where the field width only applies to the next element. - - \sa fieldWidth(), setPadChar() -*/ -void QTextStream::setFieldWidth(int width) -{ - Q_D(QTextStream); - d->params.fieldWidth = width; -} - -/*! - Returns the current field width. - - \sa setFieldWidth() -*/ -int QTextStream::fieldWidth() const -{ - Q_D(const QTextStream); - return d->params.fieldWidth; -} - -/*! - Sets the current number flags to \a flags. \a flags is a set of - flags from the NumberFlag enum, and describes options for - formatting generated code (e.g., whether or not to always write - the base or sign of a number). - - \sa numberFlags(), setIntegerBase(), setRealNumberNotation() -*/ -void QTextStream::setNumberFlags(NumberFlags flags) -{ - Q_D(QTextStream); - d->params.numberFlags = flags; -} - -/*! - Returns the current number flags. - - \sa setNumberFlags(), integerBase(), realNumberNotation() -*/ -QTextStream::NumberFlags QTextStream::numberFlags() const -{ - Q_D(const QTextStream); - return d->params.numberFlags; -} - -/*! - Sets the base of integers to \a base, both for reading and for - generating numbers. \a base can be either 2 (binary), 8 (octal), - 10 (decimal) or 16 (hexadecimal). If \a base is 0, QTextStream - will attempt to detect the base by inspecting the data on the - stream. When generating numbers, QTextStream assumes base is 10 - unless the base has been set explicitly. - - \sa integerBase(), QString::number(), setNumberFlags() -*/ -void QTextStream::setIntegerBase(int base) -{ - Q_D(QTextStream); - d->params.integerBase = base; -} - -/*! - Returns the current base of integers. 0 means that the base is - detected when reading, or 10 (decimal) when generating numbers. - - \sa setIntegerBase(), QString::number(), numberFlags() -*/ -int QTextStream::integerBase() const -{ - Q_D(const QTextStream); - return d->params.integerBase; -} - -/*! - Sets the real number notation to \a notation (SmartNotation, - FixedNotation, ScientificNotation). When reading and generating - numbers, QTextStream uses this value to detect the formatting of - real numbers. - - \sa realNumberNotation(), setRealNumberPrecision(), setNumberFlags(), setIntegerBase() -*/ -void QTextStream::setRealNumberNotation(RealNumberNotation notation) -{ - Q_D(QTextStream); - d->params.realNumberNotation = notation; -} - -/*! - Returns the current real number notation. - - \sa setRealNumberNotation(), realNumberPrecision(), numberFlags(), integerBase() -*/ -QTextStream::RealNumberNotation QTextStream::realNumberNotation() const -{ - Q_D(const QTextStream); - return d->params.realNumberNotation; -} - -/*! - Sets the precision of real numbers to \a precision. This value - describes the number of fraction digits QTextStream should - write when generating real numbers. - - The precision cannot be a negative value. The default value is 6. - - \sa realNumberPrecision(), setRealNumberNotation() -*/ -void QTextStream::setRealNumberPrecision(int precision) -{ - Q_D(QTextStream); - if (precision < 0) { - qWarning("QTextStream::setRealNumberPrecision: Invalid precision (%d)", precision); - d->params.realNumberPrecision = 6; - return; - } - d->params.realNumberPrecision = precision; -} - -/*! - Returns the current real number precision, or the number of fraction - digits QTextStream will write when generating real numbers. - - \sa setRealNumberNotation(), realNumberNotation(), numberFlags(), integerBase() -*/ -int QTextStream::realNumberPrecision() const -{ - Q_D(const QTextStream); - return d->params.realNumberPrecision; -} - -/*! - Returns the status of the text stream. - - \sa QTextStream::Status, setStatus(), resetStatus() -*/ - -QTextStream::Status QTextStream::status() const -{ - Q_D(const QTextStream); - return d->status; -} - -/*! - \since 4.1 - - Resets the status of the text stream. - - \sa QTextStream::Status, status(), setStatus() -*/ -void QTextStream::resetStatus() -{ - Q_D(QTextStream); - d->status = Ok; -} - -/*! - \since 4.1 - - Sets the status of the text stream to the \a status given. - - Subsequent calls to setStatus() are ignored until resetStatus() - is called. - - \sa Status, status(), resetStatus() -*/ -void QTextStream::setStatus(Status status) -{ - Q_D(QTextStream); - if (d->status == Ok) - d->status = status; -} - -/*! - Returns \c true if there is no more data to be read from the - QTextStream; otherwise returns \c false. This is similar to, but not - the same as calling QIODevice::atEnd(), as QTextStream also takes - into account its internal Unicode buffer. -*/ -bool QTextStream::atEnd() const -{ - Q_D(const QTextStream); - CHECK_VALID_STREAM(true); - - if (d->string) - return d->string->size() == d->stringOffset; - return d->readBuffer.isEmpty() && d->device->atEnd(); -} - -/*! - Reads the entire content of the stream, and returns it as a - QString. Avoid this function when working on large files, as it - will consume a significant amount of memory. - - Calling \l {QTextStream::readLine()}{readLine()} is better if you do not know how much data is - available. - - \sa readLine() -*/ -QString QTextStream::readAll() -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(QString()); - - return d->read(INT_MAX); -} - -/*! - Reads one line of text from the stream, and returns it as a - QString. The maximum allowed line length is set to \a maxlen. If - the stream contains lines longer than this, then the lines will be - split after \a maxlen characters and returned in parts. - - If \a maxlen is 0, the lines can be of any length. - - The returned line has no trailing end-of-line characters ("\\n" - or "\\r\\n"), so calling QString::trimmed() can be unnecessary. - - If the stream has read to the end of the file, \l {QTextStream::readLine()}{readLine()} - will return a null QString. For strings, or for devices that support it, - you can explicitly test for the end of the stream using atEnd(). - - \sa readAll(), QIODevice::readLine() -*/ -QString QTextStream::readLine(qint64 maxlen) -{ - QString line; - - readLineInto(&line, maxlen); - return line; -} - -/*! - \since 5.5 - - Reads one line of text from the stream into \a line. - If \a line is 0, the read line is not stored. - - The maximum allowed line length is set to \a maxlen. If - the stream contains lines longer than this, then the lines will be - split after \a maxlen characters and returned in parts. - - If \a maxlen is 0, the lines can be of any length. - - The resulting line has no trailing end-of-line characters ("\\n" - or "\\r\\n"), so calling QString::trimmed() can be unnecessary. - - If \a line has sufficient capacity for the data that is about to be - read, this function may not need to allocate new memory. Because of - this, it can be faster than readLine(). - - Returns \c false if the stream has read to the end of the file or - an error has occurred; otherwise returns \c true. The contents in - \a line before the call are discarded in any case. - - \sa readAll(), QIODevice::readLine() -*/ -bool QTextStream::readLineInto(QString *line, qint64 maxlen) -{ - Q_D(QTextStream); - // keep in sync with CHECK_VALID_STREAM - if (!d->string && !d->device) { - qWarning("QTextStream: No device"); - if (line && !line->isNull()) - line->resize(0); - return false; - } - - const QChar *readPtr; - int length; - if (!d->scan(&readPtr, &length, int(maxlen), QTextStreamPrivate::EndOfLine)) { - if (line && !line->isNull()) - line->resize(0); - return false; - } - - if (Q_LIKELY(line)) - line->setUnicode(readPtr, length); - d->consumeLastToken(); - return true; -} - -/*! - \since 4.1 - - Reads at most \a maxlen characters from the stream, and returns the data - read as a QString. - - \sa readAll(), readLine(), QIODevice::read() -*/ -QString QTextStream::read(qint64 maxlen) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(QString()); - - if (maxlen <= 0) - return QString::fromLatin1(""); // empty, not null - - return d->read(int(maxlen)); -} - -/*! - \internal -*/ -QTextStreamPrivate::NumberParsingStatus QTextStreamPrivate::getNumber(qulonglong *ret) -{ - scan(0, 0, 0, NotSpace); - consumeLastToken(); - - // detect int encoding - int base = params.integerBase; - if (base == 0) { - QChar ch; - if (!getChar(&ch)) - return npsInvalidPrefix; - if (ch == QLatin1Char('0')) { - QChar ch2; - if (!getChar(&ch2)) { - // Result is the number 0 - *ret = 0; - return npsOk; - } - ch2 = ch2.toLower(); - - if (ch2 == QLatin1Char('x')) { - base = 16; - } else if (ch2 == QLatin1Char('b')) { - base = 2; - } else if (ch2.isDigit() && ch2.digitValue() >= 0 && ch2.digitValue() <= 7) { - base = 8; - } else { - base = 10; - } - ungetChar(ch2); - } else if (ch == locale.negativeSign() || ch == locale.positiveSign() || ch.isDigit()) { - base = 10; - } else { - ungetChar(ch); - return npsInvalidPrefix; - } - ungetChar(ch); - // State of the stream is now the same as on entry - // (cursor is at prefix), - // and local variable 'base' has been set appropriately. - } - - qulonglong val=0; - switch (base) { - case 2: { - QChar pf1, pf2, dig; - // Parse prefix '0b' - if (!getChar(&pf1) || pf1 != QLatin1Char('0')) - return npsInvalidPrefix; - if (!getChar(&pf2) || pf2.toLower() != QLatin1Char('b')) - return npsInvalidPrefix; - // Parse digits - int ndigits = 0; - while (getChar(&dig)) { - int n = dig.toLower().unicode(); - if (n == '0' || n == '1') { - val <<= 1; - val += n - '0'; - } else { - ungetChar(dig); - break; - } - ndigits++; - } - if (ndigits == 0) { - // Unwind the prefix and abort - ungetChar(pf2); - ungetChar(pf1); - return npsMissingDigit; - } - break; - } - case 8: { - QChar pf, dig; - // Parse prefix '0' - if (!getChar(&pf) || pf != QLatin1Char('0')) - return npsInvalidPrefix; - // Parse digits - int ndigits = 0; - while (getChar(&dig)) { - int n = dig.toLower().unicode(); - if (n >= '0' && n <= '7') { - val *= 8; - val += n - '0'; - } else { - ungetChar(dig); - break; - } - ndigits++; - } - if (ndigits == 0) { - // Unwind the prefix and abort - ungetChar(pf); - return npsMissingDigit; - } - break; - } - case 10: { - // Parse sign (or first digit) - QChar sign; - int ndigits = 0; - if (!getChar(&sign)) - return npsMissingDigit; - if (sign != locale.negativeSign() && sign != locale.positiveSign()) { - if (!sign.isDigit()) { - ungetChar(sign); - return npsMissingDigit; - } - val += sign.digitValue(); - ndigits++; - } - // Parse digits - QChar ch; - while (getChar(&ch)) { - if (ch.isDigit()) { - val *= 10; - val += ch.digitValue(); - } else if (locale != QLocale::c() && ch == locale.groupSeparator()) { - continue; - } else { - ungetChar(ch); - break; - } - ndigits++; - } - if (ndigits == 0) - return npsMissingDigit; - if (sign == locale.negativeSign()) { - qlonglong ival = qlonglong(val); - if (ival > 0) - ival = -ival; - val = qulonglong(ival); - } - break; - } - case 16: { - QChar pf1, pf2, dig; - // Parse prefix ' 0x' - if (!getChar(&pf1) || pf1 != QLatin1Char('0')) - return npsInvalidPrefix; - if (!getChar(&pf2) || pf2.toLower() != QLatin1Char('x')) - return npsInvalidPrefix; - // Parse digits - int ndigits = 0; - while (getChar(&dig)) { - int n = dig.toLower().unicode(); - if (n >= '0' && n <= '9') { - val <<= 4; - val += n - '0'; - } else if (n >= 'a' && n <= 'f') { - val <<= 4; - val += 10 + (n - 'a'); - } else { - ungetChar(dig); - break; - } - ndigits++; - } - if (ndigits == 0) { - return npsMissingDigit; - } - break; - } - default: - // Unsupported integerBase - return npsInvalidPrefix; - } - - if (ret) - *ret = val; - return npsOk; -} - -/*! - \internal - (hihi) -*/ -bool QTextStreamPrivate::getReal(double *f) -{ - // We use a table-driven FSM to parse floating point numbers - // strtod() cannot be used directly since we may be reading from a - // QIODevice. - enum ParserState { - Init = 0, - Sign = 1, - Mantissa = 2, - Dot = 3, - Abscissa = 4, - ExpMark = 5, - ExpSign = 6, - Exponent = 7, - Nan1 = 8, - Nan2 = 9, - Inf1 = 10, - Inf2 = 11, - NanInf = 12, - Done = 13 - }; - enum InputToken { - None = 0, - InputSign = 1, - InputDigit = 2, - InputDot = 3, - InputExp = 4, - InputI = 5, - InputN = 6, - InputF = 7, - InputA = 8, - InputT = 9 - }; - - static const uchar table[13][10] = { - // None InputSign InputDigit InputDot InputExp InputI InputN InputF InputA InputT - { 0, Sign, Mantissa, Dot, 0, Inf1, Nan1, 0, 0, 0 }, // 0 Init - { 0, 0, Mantissa, Dot, 0, Inf1, Nan1, 0, 0, 0 }, // 1 Sign - { Done, Done, Mantissa, Dot, ExpMark, 0, 0, 0, 0, 0 }, // 2 Mantissa - { 0, 0, Abscissa, 0, 0, 0, 0, 0, 0, 0 }, // 3 Dot - { Done, Done, Abscissa, Done, ExpMark, 0, 0, 0, 0, 0 }, // 4 Abscissa - { 0, ExpSign, Exponent, 0, 0, 0, 0, 0, 0, 0 }, // 5 ExpMark - { 0, 0, Exponent, 0, 0, 0, 0, 0, 0, 0 }, // 6 ExpSign - { Done, Done, Exponent, Done, Done, 0, 0, 0, 0, 0 }, // 7 Exponent - { 0, 0, 0, 0, 0, 0, 0, 0, Nan2, 0 }, // 8 Nan1 - { 0, 0, 0, 0, 0, 0, NanInf, 0, 0, 0 }, // 9 Nan2 - { 0, 0, 0, 0, 0, 0, Inf2, 0, 0, 0 }, // 10 Inf1 - { 0, 0, 0, 0, 0, 0, 0, NanInf, 0, 0 }, // 11 Inf2 - { Done, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // 11 NanInf - }; - - ParserState state = Init; - InputToken input = None; - - scan(0, 0, 0, NotSpace); - consumeLastToken(); - - const int BufferSize = 128; - char buf[BufferSize]; - int i = 0; - - QChar c; - while (getChar(&c)) { - switch (c.unicode()) { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - input = InputDigit; - break; - case 'i': case 'I': - input = InputI; - break; - case 'n': case 'N': - input = InputN; - break; - case 'f': case 'F': - input = InputF; - break; - case 'a': case 'A': - input = InputA; - break; - case 't': case 'T': - input = InputT; - break; - default: { - QChar lc = c.toLower(); - if (lc == locale.decimalPoint().toLower()) - input = InputDot; - else if (lc == locale.exponential().toLower()) - input = InputExp; - else if (lc == locale.negativeSign().toLower() - || lc == locale.positiveSign().toLower()) - input = InputSign; - else if (locale != QLocale::c() // backward-compatibility - && lc == locale.groupSeparator().toLower()) - input = InputDigit; // well, it isn't a digit, but no one cares. - else - input = None; - } - break; - } - - state = ParserState(table[state][input]); - - if (state == Init || state == Done || i > (BufferSize - 5)) { - ungetChar(c); - if (i > (BufferSize - 5)) { // ignore rest of digits - while (getChar(&c)) { - if (!c.isDigit()) { - ungetChar(c); - break; - } - } - } - break; - } - - buf[i++] = c.toLatin1(); - } - - if (i == 0) - return false; - if (!f) - return true; - buf[i] = '\0'; - - // backward-compatibility. Old implementation supported +nan/-nan - // for some reason. QLocale only checks for lower-case - // nan/+inf/-inf, so here we also check for uppercase and mixed - // case versions. - if (!qstricmp(buf, "nan") || !qstricmp(buf, "+nan") || !qstricmp(buf, "-nan")) { - *f = qSNaN(); - return true; - } else if (!qstricmp(buf, "+inf") || !qstricmp(buf, "inf")) { - *f = qInf(); - return true; - } else if (!qstricmp(buf, "-inf")) { - *f = -qInf(); - return true; - } - bool ok; - *f = locale.toDouble(QString::fromLatin1(buf), &ok); - return ok; -} - -/*! - Reads a character from the stream and stores it in \a c. Returns a - reference to the QTextStream, so several operators can be - nested. Example: - - \snippet code/src_corelib_io_qtextstream.cpp 7 - - Whitespace is \e not skipped. -*/ - -QTextStream &QTextStream::operator>>(QChar &c) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); - if (!d->getChar(&c)) - setStatus(ReadPastEnd); - return *this; -} - -/*! - \overload - - Reads a character from the stream and stores it in \a c. The - character from the stream is converted to ISO-5589-1 before it is - stored. - - \sa QChar::toLatin1() -*/ -QTextStream &QTextStream::operator>>(char &c) -{ - QChar ch; - *this >> ch; - c = ch.toLatin1(); - return *this; -} - -/*! - Reads an integer from the stream and stores it in \a i, then - returns a reference to the QTextStream. The number is cast to - the correct type before it is stored. If no number was detected on - the stream, \a i is set to 0. - - By default, QTextStream will attempt to detect the base of the - number using the following rules: - - \table - \header \li Prefix \li Base - \row \li "0b" or "0B" \li 2 (binary) - \row \li "0" followed by "0-7" \li 8 (octal) - \row \li "0" otherwise \li 10 (decimal) - \row \li "0x" or "0X" \li 16 (hexadecimal) - \row \li "1" to "9" \li 10 (decimal) - \endtable - - By calling setIntegerBase(), you can specify the integer base - explicitly. This will disable the auto-detection, and speed up - QTextStream slightly. - - Leading whitespace is skipped. -*/ -QTextStream &QTextStream::operator>>(signed short &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(signed short); -} - -/*! - \overload - - Stores the integer in the unsigned short \a i. -*/ -QTextStream &QTextStream::operator>>(unsigned short &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(unsigned short); -} - -/*! - \overload - - Stores the integer in the signed int \a i. -*/ -QTextStream &QTextStream::operator>>(signed int &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(signed int); -} - -/*! - \overload - - Stores the integer in the unsigned int \a i. -*/ -QTextStream &QTextStream::operator>>(unsigned int &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(unsigned int); -} - -/*! - \overload - - Stores the integer in the signed long \a i. -*/ -QTextStream &QTextStream::operator>>(signed long &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(signed long); -} - -/*! - \overload - - Stores the integer in the unsigned long \a i. -*/ -QTextStream &QTextStream::operator>>(unsigned long &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(unsigned long); -} - -/*! - \overload - - Stores the integer in the qlonglong \a i. -*/ -QTextStream &QTextStream::operator>>(qlonglong &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(qlonglong); -} - -/*! - \overload - - Stores the integer in the qulonglong \a i. -*/ -QTextStream &QTextStream::operator>>(qulonglong &i) -{ - IMPLEMENT_STREAM_RIGHT_INT_OPERATOR(qulonglong); -} - -/*! - Reads a real number from the stream and stores it in \a f, then - returns a reference to the QTextStream. The number is cast to - the correct type. If no real number is detect on the stream, \a f - is set to 0.0. - - As a special exception, QTextStream allows the strings "nan" and "inf" to - represent NAN and INF floats or doubles. - - Leading whitespace is skipped. -*/ -QTextStream &QTextStream::operator>>(float &f) -{ - IMPLEMENT_STREAM_RIGHT_REAL_OPERATOR(float); -} - -/*! - \overload - - Stores the real number in the double \a f. -*/ -QTextStream &QTextStream::operator>>(double &f) -{ - IMPLEMENT_STREAM_RIGHT_REAL_OPERATOR(double); -} - -/*! - Reads a word from the stream and stores it in \a str, then returns - a reference to the stream. Words are separated by whitespace - (i.e., all characters for which QChar::isSpace() returns \c true). - - Leading whitespace is skipped. -*/ -QTextStream &QTextStream::operator>>(QString &str) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - - str.clear(); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); - d->consumeLastToken(); - - const QChar *ptr; - int length; - if (!d->scan(&ptr, &length, 0, QTextStreamPrivate::Space)) { - setStatus(ReadPastEnd); - return *this; - } - - str = QString(ptr, length); - d->consumeLastToken(); - return *this; -} - -/*! - \overload - - Converts the word to ISO-8859-1, then stores it in \a array. - - \sa QString::toLatin1() -*/ -QTextStream &QTextStream::operator>>(QByteArray &array) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - - array.clear(); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); - d->consumeLastToken(); - - const QChar *ptr; - int length; - if (!d->scan(&ptr, &length, 0, QTextStreamPrivate::Space)) { - setStatus(ReadPastEnd); - return *this; - } - - for (int i = 0; i < length; ++i) - array += ptr[i].toLatin1(); - - d->consumeLastToken(); - return *this; -} - -/*! - \overload - - Stores the word in \a c, terminated by a '\\0' character. If no word is - available, only the '\\0' character is stored. - - Warning: Although convenient, this operator is dangerous and must - be used with care. QTextStream assumes that \a c points to a - buffer with enough space to hold the word. If the buffer is too - small, your application may crash. - - If possible, use the QByteArray operator instead. -*/ -QTextStream &QTextStream::operator>>(char *c) -{ - Q_D(QTextStream); - *c = 0; - CHECK_VALID_STREAM(*this); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); - d->consumeLastToken(); - - const QChar *ptr; - int length; - if (!d->scan(&ptr, &length, 0, QTextStreamPrivate::Space)) { - setStatus(ReadPastEnd); - return *this; - } - - for (int i = 0; i < length; ++i) - *c++ = ptr[i].toLatin1(); - *c = '\0'; - d->consumeLastToken(); - return *this; -} - -/*! - \internal - */ -void QTextStreamPrivate::putNumber(qulonglong number, bool negative) -{ - QString result; - - unsigned flags = 0; - const QTextStream::NumberFlags numberFlags = params.numberFlags; - if (numberFlags & QTextStream::ShowBase) - flags |= QLocaleData::ShowBase; - if (numberFlags & QTextStream::ForceSign) - flags |= QLocaleData::AlwaysShowSign; - if (numberFlags & QTextStream::UppercaseBase) - flags |= QLocaleData::UppercaseBase; - if (numberFlags & QTextStream::UppercaseDigits) - flags |= QLocaleData::CapitalEorX; - - // add thousands group separators. For backward compatibility we - // don't add a group separator for C locale. - if (locale != QLocale::c() && !locale.numberOptions().testFlag(QLocale::OmitGroupSeparator)) - flags |= QLocaleData::ThousandsGroup; - - const QLocaleData *dd = locale.d->m_data; - int base = params.integerBase ? params.integerBase : 10; - if (negative && base == 10) { - result = dd->longLongToString(-static_cast<qlonglong>(number), -1, - base, -1, flags); - } else if (negative) { - // Workaround for backward compatibility for writing negative - // numbers in octal and hex: - // QTextStream(result) << showbase << hex << -1 << oct << -1 - // should output: -0x1 -0b1 - result = dd->unsLongLongToString(number, -1, base, -1, flags); - result.prepend(locale.negativeSign()); - } else { - result = dd->unsLongLongToString(number, -1, base, -1, flags); - // workaround for backward compatibility - in octal form with - // ShowBase flag set zero should be written as '00' - if (number == 0 && base == 8 && params.numberFlags & QTextStream::ShowBase - && result == QLatin1String("0")) { - result.prepend(QLatin1Char('0')); - } - } - putString(result, true); -} - -/*! - Writes the character \a c to the stream, then returns a reference - to the QTextStream. - - \sa setFieldWidth() -*/ -QTextStream &QTextStream::operator<<(QChar c) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putChar(c); - return *this; -} - -/*! - \overload - - Converts \a c from ASCII to a QChar, then writes it to the stream. -*/ -QTextStream &QTextStream::operator<<(char c) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putChar(QChar::fromLatin1(c)); - return *this; -} - -/*! - Writes the integer number \a i to the stream, then returns a - reference to the QTextStream. By default, the number is stored in - decimal form, but you can also set the base by calling - setIntegerBase(). - - \sa setFieldWidth(), setNumberFlags() -*/ -QTextStream &QTextStream::operator<<(signed short i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber((qulonglong)qAbs(qlonglong(i)), i < 0); - return *this; -} - -/*! - \overload - - Writes the unsigned short \a i to the stream. -*/ -QTextStream &QTextStream::operator<<(unsigned short i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber((qulonglong)i, false); - return *this; -} - -/*! - \overload - - Writes the signed int \a i to the stream. -*/ -QTextStream &QTextStream::operator<<(signed int i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber((qulonglong)qAbs(qlonglong(i)), i < 0); - return *this; -} - -/*! - \overload - - Writes the unsigned int \a i to the stream. -*/ -QTextStream &QTextStream::operator<<(unsigned int i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber((qulonglong)i, false); - return *this; -} - -/*! - \overload - - Writes the signed long \a i to the stream. -*/ -QTextStream &QTextStream::operator<<(signed long i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber((qulonglong)qAbs(qlonglong(i)), i < 0); - return *this; -} - -/*! - \overload - - Writes the unsigned long \a i to the stream. -*/ -QTextStream &QTextStream::operator<<(unsigned long i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber((qulonglong)i, false); - return *this; -} - -/*! - \overload - - Writes the qlonglong \a i to the stream. -*/ -QTextStream &QTextStream::operator<<(qlonglong i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber((qulonglong)qAbs(i), i < 0); - return *this; -} - -/*! - \overload - - Writes the qulonglong \a i to the stream. -*/ -QTextStream &QTextStream::operator<<(qulonglong i) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putNumber(i, false); - return *this; -} - -/*! - Writes the real number \a f to the stream, then returns a - reference to the QTextStream. By default, QTextStream stores it - using SmartNotation, with up to 6 digits of precision. You can - change the textual representation QTextStream will use for real - numbers by calling setRealNumberNotation(), - setRealNumberPrecision() and setNumberFlags(). - - \sa setFieldWidth(), setRealNumberNotation(), - setRealNumberPrecision(), setNumberFlags() -*/ -QTextStream &QTextStream::operator<<(float f) -{ - return *this << double(f); -} - -/*! - \overload - - Writes the double \a f to the stream. -*/ -QTextStream &QTextStream::operator<<(double f) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - - QLocaleData::DoubleForm form = QLocaleData::DFDecimal; - switch (realNumberNotation()) { - case FixedNotation: - form = QLocaleData::DFDecimal; - break; - case ScientificNotation: - form = QLocaleData::DFExponent; - break; - case SmartNotation: - form = QLocaleData::DFSignificantDigits; - break; - } - - uint flags = 0; - const QLocale::NumberOptions numberOptions = locale().numberOptions(); - if (numberFlags() & ShowBase) - flags |= QLocaleData::ShowBase; - if (numberFlags() & ForceSign) - flags |= QLocaleData::AlwaysShowSign; - if (numberFlags() & UppercaseBase) - flags |= QLocaleData::UppercaseBase; - if (numberFlags() & UppercaseDigits) - flags |= QLocaleData::CapitalEorX; - if (numberFlags() & ForcePoint) { - flags |= QLocaleData::ForcePoint; - - // Only for backwards compatibility - flags |= QLocaleData::AddTrailingZeroes | QLocaleData::ShowBase; - } - if (locale() != QLocale::c() && !(numberOptions & QLocale::OmitGroupSeparator)) - flags |= QLocaleData::ThousandsGroup; - if (!(numberOptions & QLocale::OmitLeadingZeroInExponent)) - flags |= QLocaleData::ZeroPadExponent; - if (numberOptions & QLocale::IncludeTrailingZeroesAfterDot) - flags |= QLocaleData::AddTrailingZeroes; - - const QLocaleData *dd = d->locale.d->m_data; - QString num = dd->doubleToString(f, d->params.realNumberPrecision, form, -1, flags); - d->putString(num, true); - return *this; -} - -/*! - Writes the string \a string to the stream, and returns a reference - to the QTextStream. The string is first encoded using the assigned - codec (the default codec is QTextCodec::codecForLocale()) before - it is written to the stream. - - \sa setFieldWidth(), setCodec() -*/ -QTextStream &QTextStream::operator<<(const QString &string) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putString(string); - return *this; -} - -/*! - \overload - - Writes \a string to the stream, and returns a reference to the - QTextStream. -*/ -QTextStream &QTextStream::operator<<(QLatin1String string) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putString(string); - return *this; -} - -/*! - \since 5.6 - \overload - - Writes \a string to the stream, and returns a reference to the - QTextStream. -*/ -QTextStream &QTextStream::operator<<(const QStringRef &string) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putString(string.data(), string.size()); - return *this; -} - -/*! - \overload - - Writes \a array to the stream. The contents of \a array are - converted with QString::fromUtf8(). -*/ -QTextStream &QTextStream::operator<<(const QByteArray &array) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - d->putString(QString::fromUtf8(array.constData(), array.length())); - return *this; -} - -/*! - \overload - - Writes the constant string pointed to by \a string to the stream. \a - string is assumed to be in ISO-8859-1 encoding. This operator - is convenient when working with constant string data. Example: - - \snippet code/src_corelib_io_qtextstream.cpp 8 - - Warning: QTextStream assumes that \a string points to a string of - text, terminated by a '\\0' character. If there is no terminating - '\\0' character, your application may crash. -*/ -QTextStream &QTextStream::operator<<(const char *string) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - // ### Qt6: consider changing to UTF-8 - d->putString(QLatin1String(string)); - return *this; -} - -/*! - \overload - - Writes \a ptr to the stream as a hexadecimal number with a base. -*/ - -QTextStream &QTextStream::operator<<(const void *ptr) -{ - Q_D(QTextStream); - CHECK_VALID_STREAM(*this); - const int oldBase = d->params.integerBase; - const NumberFlags oldFlags = d->params.numberFlags; - d->params.integerBase = 16; - d->params.numberFlags |= ShowBase; - d->putNumber(reinterpret_cast<quintptr>(ptr), false); - d->params.integerBase = oldBase; - d->params.numberFlags = oldFlags; - return *this; -} - -/*! - \relates QTextStream - - Calls QTextStream::setIntegerBase(2) on \a stream and returns \a - stream. - - \sa oct(), dec(), hex(), {QTextStream manipulators} -*/ -QTextStream &bin(QTextStream &stream) -{ - stream.setIntegerBase(2); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setIntegerBase(8) on \a stream and returns \a - stream. - - \sa bin(), dec(), hex(), {QTextStream manipulators} -*/ -QTextStream &oct(QTextStream &stream) -{ - stream.setIntegerBase(8); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setIntegerBase(10) on \a stream and returns \a - stream. - - \sa bin(), oct(), hex(), {QTextStream manipulators} -*/ -QTextStream &dec(QTextStream &stream) -{ - stream.setIntegerBase(10); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setIntegerBase(16) on \a stream and returns \a - stream. - - \note The hex modifier can only be used for writing to streams. - \sa bin(), oct(), dec(), {QTextStream manipulators} -*/ -QTextStream &hex(QTextStream &stream) -{ - stream.setIntegerBase(16); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() | - QTextStream::ShowBase) on \a stream and returns \a stream. - - \sa noshowbase(), forcesign(), forcepoint(), {QTextStream manipulators} -*/ -QTextStream &showbase(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() | QTextStream::ShowBase); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() | - QTextStream::ForceSign) on \a stream and returns \a stream. - - \sa noforcesign(), forcepoint(), showbase(), {QTextStream manipulators} -*/ -QTextStream &forcesign(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() | QTextStream::ForceSign); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() | - QTextStream::ForcePoint) on \a stream and returns \a stream. - - \sa noforcepoint(), forcesign(), showbase(), {QTextStream manipulators} -*/ -QTextStream &forcepoint(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() | QTextStream::ForcePoint); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() & - ~QTextStream::ShowBase) on \a stream and returns \a stream. - - \sa showbase(), noforcesign(), noforcepoint(), {QTextStream manipulators} -*/ -QTextStream &noshowbase(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() &= ~QTextStream::ShowBase); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() & - ~QTextStream::ForceSign) on \a stream and returns \a stream. - - \sa forcesign(), noforcepoint(), noshowbase(), {QTextStream manipulators} -*/ -QTextStream &noforcesign(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() &= ~QTextStream::ForceSign); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() & - ~QTextStream::ForcePoint) on \a stream and returns \a stream. - - \sa forcepoint(), noforcesign(), noshowbase(), {QTextStream manipulators} -*/ -QTextStream &noforcepoint(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() &= ~QTextStream::ForcePoint); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() | - QTextStream::UppercaseBase) on \a stream and returns \a stream. - - \sa lowercasebase(), uppercasedigits(), {QTextStream manipulators} -*/ -QTextStream &uppercasebase(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() | QTextStream::UppercaseBase); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() | - QTextStream::UppercaseDigits) on \a stream and returns \a stream. - - \sa lowercasedigits(), uppercasebase(), {QTextStream manipulators} -*/ -QTextStream &uppercasedigits(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() | QTextStream::UppercaseDigits); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() & - ~QTextStream::UppercaseBase) on \a stream and returns \a stream. - - \sa uppercasebase(), lowercasedigits(), {QTextStream manipulators} -*/ -QTextStream &lowercasebase(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() & ~QTextStream::UppercaseBase); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setNumberFlags(QTextStream::numberFlags() & - ~QTextStream::UppercaseDigits) on \a stream and returns \a stream. - - \sa uppercasedigits(), lowercasebase(), {QTextStream manipulators} -*/ -QTextStream &lowercasedigits(QTextStream &stream) -{ - stream.setNumberFlags(stream.numberFlags() & ~QTextStream::UppercaseDigits); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setRealNumberNotation(QTextStream::FixedNotation) - on \a stream and returns \a stream. - - \sa scientific(), {QTextStream manipulators} -*/ -QTextStream &fixed(QTextStream &stream) -{ - stream.setRealNumberNotation(QTextStream::FixedNotation); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setRealNumberNotation(QTextStream::ScientificNotation) - on \a stream and returns \a stream. - - \sa fixed(), {QTextStream manipulators} -*/ -QTextStream &scientific(QTextStream &stream) -{ - stream.setRealNumberNotation(QTextStream::ScientificNotation); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setFieldAlignment(QTextStream::AlignLeft) - on \a stream and returns \a stream. - - \sa {QTextStream::}{right()}, {QTextStream::}{center()}, {QTextStream manipulators} -*/ -QTextStream &left(QTextStream &stream) -{ - stream.setFieldAlignment(QTextStream::AlignLeft); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setFieldAlignment(QTextStream::AlignRight) - on \a stream and returns \a stream. - - \sa {QTextStream::}{left()}, {QTextStream::}{center()}, {QTextStream manipulators} -*/ -QTextStream &right(QTextStream &stream) -{ - stream.setFieldAlignment(QTextStream::AlignRight); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::setFieldAlignment(QTextStream::AlignCenter) - on \a stream and returns \a stream. - - \sa {QTextStream::}{left()}, {QTextStream::}{right()}, {QTextStream manipulators} -*/ -QTextStream ¢er(QTextStream &stream) -{ - stream.setFieldAlignment(QTextStream::AlignCenter); - return stream; -} - -/*! - \relates QTextStream - - Writes '\\n' to the \a stream and flushes the stream. - - Equivalent to - - \snippet code/src_corelib_io_qtextstream.cpp 9 - - Note: On Windows, all '\\n' characters are written as '\\r\\n' if - QTextStream's device or string is opened using the QIODevice::Text flag. - - \sa flush(), reset(), {QTextStream manipulators} -*/ -QTextStream &endl(QTextStream &stream) -{ - return stream << QLatin1Char('\n') << flush; -} - -/*! - \relates QTextStream - - Calls QTextStream::flush() on \a stream and returns \a stream. - - \sa endl(), reset(), {QTextStream manipulators} -*/ -QTextStream &flush(QTextStream &stream) -{ - stream.flush(); - return stream; -} - -/*! - \relates QTextStream - - Calls QTextStream::reset() on \a stream and returns \a stream. - - \sa flush(), {QTextStream manipulators} -*/ -QTextStream &reset(QTextStream &stream) -{ - stream.reset(); - return stream; -} - -/*! - \relates QTextStream - - Calls \l {QTextStream::}{skipWhiteSpace()} on \a stream and returns \a stream. - - \sa {QTextStream manipulators} -*/ -QTextStream &ws(QTextStream &stream) -{ - stream.skipWhiteSpace(); - return stream; -} - -/*! - \fn QTextStreamManipulator qSetFieldWidth(int width) - \relates QTextStream - - Equivalent to QTextStream::setFieldWidth(\a width). -*/ - -/*! - \fn QTextStreamManipulator qSetPadChar(QChar ch) - \relates QTextStream - - Equivalent to QTextStream::setPadChar(\a ch). -*/ - -/*! - \fn QTextStreamManipulator qSetRealNumberPrecision(int precision) - \relates QTextStream - - Equivalent to QTextStream::setRealNumberPrecision(\a precision). -*/ - -#ifndef QT_NO_TEXTCODEC -/*! - \relates QTextStream - - Toggles insertion of the Byte Order Mark on \a stream when QTextStream is - used with a UTF codec. - - \sa QTextStream::setGenerateByteOrderMark(), {QTextStream manipulators} -*/ -QTextStream &bom(QTextStream &stream) -{ - stream.setGenerateByteOrderMark(true); - return stream; -} - -/*! - Sets the codec for this stream to \a codec. The codec is used for - decoding any data that is read from the assigned device, and for - encoding any data that is written. By default, - QTextCodec::codecForLocale() is used, and automatic unicode - detection is enabled. - - If QTextStream operates on a string, this function does nothing. - - \warning If you call this function while the text stream is reading - from an open sequential socket, the internal buffer may still contain - text decoded using the old codec. - - \sa codec(), setAutoDetectUnicode(), setLocale() -*/ -void QTextStream::setCodec(QTextCodec *codec) -{ - Q_D(QTextStream); - qint64 seekPos = -1; - if (!d->readBuffer.isEmpty()) { - if (!d->device->isSequential()) { - seekPos = pos(); - } - } - d->codec = codec; - if (seekPos >=0 && !d->readBuffer.isEmpty()) - seek(seekPos); -} - -/*! - Sets the codec for this stream to the QTextCodec for the encoding - specified by \a codecName. Common values for \c codecName include - "ISO 8859-1", "UTF-8", and "UTF-16". If the encoding isn't - recognized, nothing happens. - - Example: - - \snippet code/src_corelib_io_qtextstream.cpp 10 - - \sa QTextCodec::codecForName(), setLocale() -*/ -void QTextStream::setCodec(const char *codecName) -{ - QTextCodec *codec = QTextCodec::codecForName(codecName); - if (codec) - setCodec(codec); -} - -/*! - Returns the codec that is current assigned to the stream. - - \sa setCodec(), setAutoDetectUnicode(), locale() -*/ -QTextCodec *QTextStream::codec() const -{ - Q_D(const QTextStream); - return d->codec; -} - -/*! - If \a enabled is true, QTextStream will attempt to detect Unicode - encoding by peeking into the stream data to see if it can find the - UTF-16 or UTF-32 BOM (Byte Order Mark). If this mark is found, QTextStream - will replace the current codec with the UTF codec. - - This function can be used together with setCodec(). It is common - to set the codec to UTF-8, and then enable UTF-16 detection. - - \sa autoDetectUnicode(), setCodec() -*/ -void QTextStream::setAutoDetectUnicode(bool enabled) -{ - Q_D(QTextStream); - d->autoDetectUnicode = enabled; -} - -/*! - Returns \c true if automatic Unicode detection is enabled, otherwise - returns \c false. Automatic Unicode detection is enabled by default. - - \sa setAutoDetectUnicode(), setCodec() -*/ -bool QTextStream::autoDetectUnicode() const -{ - Q_D(const QTextStream); - return d->autoDetectUnicode; -} - -/*! - If \a generate is true and a UTF codec is used, QTextStream will insert - the BOM (Byte Order Mark) before any data has been written to the - device. If \a generate is false, no BOM will be inserted. This function - must be called before any data is written. Otherwise, it does nothing. - - \sa generateByteOrderMark(), bom() -*/ -void QTextStream::setGenerateByteOrderMark(bool generate) -{ - Q_D(QTextStream); - if (d->writeBuffer.isEmpty()) { - d->writeConverterState.flags.setFlag(QTextCodec::IgnoreHeader, !generate); - } -} - -/*! - Returns \c true if QTextStream is set to generate the UTF BOM (Byte Order - Mark) when using a UTF codec; otherwise returns \c false. UTF BOM generation is - set to false by default. - - \sa setGenerateByteOrderMark() -*/ -bool QTextStream::generateByteOrderMark() const -{ - Q_D(const QTextStream); - return (d->writeConverterState.flags & QTextCodec::IgnoreHeader) == 0; -} - -#endif - -/*! - \since 4.5 - - Sets the locale for this stream to \a locale. The specified locale is - used for conversions between numbers and their string representations. - - The default locale is C and it is a special case - the thousands - group separator is not used for backward compatibility reasons. - - \sa locale() -*/ -void QTextStream::setLocale(const QLocale &locale) -{ - Q_D(QTextStream); - d->locale = locale; -} - -/*! - \since 4.5 - - Returns the locale for this stream. The default locale is C. - - \sa setLocale() -*/ -QLocale QTextStream::locale() const -{ - Q_D(const QTextStream); - return d->locale; -} - -QT_END_NAMESPACE - -#ifndef QT_NO_QOBJECT -#include "moc_qtextstream_p.cpp" -#endif diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h deleted file mode 100644 index e72b7942fd..0000000000 --- a/src/corelib/io/qtextstream.h +++ /dev/null @@ -1,287 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTEXTSTREAM_H -#define QTEXTSTREAM_H - -#include <QtCore/qiodevice.h> -#include <QtCore/qstring.h> -#include <QtCore/qchar.h> -#include <QtCore/qlocale.h> -#include <QtCore/qscopedpointer.h> - -#include <stdio.h> - -#ifdef Status -#error qtextstream.h must be included before any header file that defines Status -#endif - -QT_BEGIN_NAMESPACE - - -class QTextCodec; -class QTextDecoder; - -class QTextStreamPrivate; -class Q_CORE_EXPORT QTextStream // text stream class -{ - Q_DECLARE_PRIVATE(QTextStream) - -public: - enum RealNumberNotation { - SmartNotation, - FixedNotation, - ScientificNotation - }; - enum FieldAlignment { - AlignLeft, - AlignRight, - AlignCenter, - AlignAccountingStyle - }; - enum Status { - Ok, - ReadPastEnd, - ReadCorruptData, - WriteFailed - }; - enum NumberFlag { - ShowBase = 0x1, - ForcePoint = 0x2, - ForceSign = 0x4, - UppercaseBase = 0x8, - UppercaseDigits = 0x10 - }; - Q_DECLARE_FLAGS(NumberFlags, NumberFlag) - - QTextStream(); - explicit QTextStream(QIODevice *device); - explicit QTextStream(FILE *fileHandle, QIODevice::OpenMode openMode = QIODevice::ReadWrite); - explicit QTextStream(QString *string, QIODevice::OpenMode openMode = QIODevice::ReadWrite); - explicit QTextStream(QByteArray *array, QIODevice::OpenMode openMode = QIODevice::ReadWrite); - explicit QTextStream(const QByteArray &array, QIODevice::OpenMode openMode = QIODevice::ReadOnly); - virtual ~QTextStream(); - -#ifndef QT_NO_TEXTCODEC - void setCodec(QTextCodec *codec); - void setCodec(const char *codecName); - QTextCodec *codec() const; - void setAutoDetectUnicode(bool enabled); - bool autoDetectUnicode() const; - void setGenerateByteOrderMark(bool generate); - bool generateByteOrderMark() const; -#endif - - void setLocale(const QLocale &locale); - QLocale locale() const; - - void setDevice(QIODevice *device); - QIODevice *device() const; - - void setString(QString *string, QIODevice::OpenMode openMode = QIODevice::ReadWrite); - QString *string() const; - - Status status() const; - void setStatus(Status status); - void resetStatus(); - - bool atEnd() const; - void reset(); - void flush(); - bool seek(qint64 pos); - qint64 pos() const; - - void skipWhiteSpace(); - - QString readLine(qint64 maxlen = 0); - bool readLineInto(QString *line, qint64 maxlen = 0); - QString readAll(); - QString read(qint64 maxlen); - - void setFieldAlignment(FieldAlignment alignment); - FieldAlignment fieldAlignment() const; - - void setPadChar(QChar ch); - QChar padChar() const; - - void setFieldWidth(int width); - int fieldWidth() const; - - void setNumberFlags(NumberFlags flags); - NumberFlags numberFlags() const; - - void setIntegerBase(int base); - int integerBase() const; - - void setRealNumberNotation(RealNumberNotation notation); - RealNumberNotation realNumberNotation() const; - - void setRealNumberPrecision(int precision); - int realNumberPrecision() const; - - QTextStream &operator>>(QChar &ch); - QTextStream &operator>>(char &ch); - QTextStream &operator>>(signed short &i); - QTextStream &operator>>(unsigned short &i); - QTextStream &operator>>(signed int &i); - QTextStream &operator>>(unsigned int &i); - QTextStream &operator>>(signed long &i); - QTextStream &operator>>(unsigned long &i); - QTextStream &operator>>(qlonglong &i); - QTextStream &operator>>(qulonglong &i); - QTextStream &operator>>(float &f); - QTextStream &operator>>(double &f); - QTextStream &operator>>(QString &s); - QTextStream &operator>>(QByteArray &array); - QTextStream &operator>>(char *c); - - QTextStream &operator<<(QChar ch); - QTextStream &operator<<(char ch); - QTextStream &operator<<(signed short i); - QTextStream &operator<<(unsigned short i); - QTextStream &operator<<(signed int i); - QTextStream &operator<<(unsigned int i); - QTextStream &operator<<(signed long i); - QTextStream &operator<<(unsigned long i); - QTextStream &operator<<(qlonglong i); - QTextStream &operator<<(qulonglong i); - QTextStream &operator<<(float f); - QTextStream &operator<<(double f); - QTextStream &operator<<(const QString &s); - QTextStream &operator<<(QLatin1String s); - QTextStream &operator<<(const QStringRef &s); - QTextStream &operator<<(const QByteArray &array); - QTextStream &operator<<(const char *c); - QTextStream &operator<<(const void *ptr); - -private: - Q_DISABLE_COPY(QTextStream) - friend class QDebugStateSaverPrivate; - friend class QDebug; - - QScopedPointer<QTextStreamPrivate> d_ptr; -}; - -Q_DECLARE_OPERATORS_FOR_FLAGS(QTextStream::NumberFlags) - -/***************************************************************************** - QTextStream manipulators - *****************************************************************************/ - -typedef QTextStream & (*QTextStreamFunction)(QTextStream &);// manipulator function -typedef void (QTextStream::*QTSMFI)(int); // manipulator w/int argument -typedef void (QTextStream::*QTSMFC)(QChar); // manipulator w/QChar argument - - -class Q_CORE_EXPORT QTextStreamManipulator -{ -public: - Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFI m, int a) Q_DECL_NOTHROW : mf(m), mc(Q_NULLPTR), arg(a), ch() {} - Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFC m, QChar c) Q_DECL_NOTHROW : mf(Q_NULLPTR), mc(m), arg(-1), ch(c) {} - void exec(QTextStream &s) { if (mf) { (s.*mf)(arg); } else { (s.*mc)(ch); } } - -private: - QTSMFI mf; // QTextStream member function - QTSMFC mc; // QTextStream member function - int arg; // member function argument - QChar ch; -}; - -inline QTextStream &operator>>(QTextStream &s, QTextStreamFunction f) -{ return (*f)(s); } - -inline QTextStream &operator<<(QTextStream &s, QTextStreamFunction f) -{ return (*f)(s); } - -inline QTextStream &operator<<(QTextStream &s, QTextStreamManipulator m) -{ m.exec(s); return s; } - -Q_CORE_EXPORT QTextStream &bin(QTextStream &s); -Q_CORE_EXPORT QTextStream &oct(QTextStream &s); -Q_CORE_EXPORT QTextStream &dec(QTextStream &s); -Q_CORE_EXPORT QTextStream &hex(QTextStream &s); - -Q_CORE_EXPORT QTextStream &showbase(QTextStream &s); -Q_CORE_EXPORT QTextStream &forcesign(QTextStream &s); -Q_CORE_EXPORT QTextStream &forcepoint(QTextStream &s); -Q_CORE_EXPORT QTextStream &noshowbase(QTextStream &s); -Q_CORE_EXPORT QTextStream &noforcesign(QTextStream &s); -Q_CORE_EXPORT QTextStream &noforcepoint(QTextStream &s); - -Q_CORE_EXPORT QTextStream &uppercasebase(QTextStream &s); -Q_CORE_EXPORT QTextStream &uppercasedigits(QTextStream &s); -Q_CORE_EXPORT QTextStream &lowercasebase(QTextStream &s); -Q_CORE_EXPORT QTextStream &lowercasedigits(QTextStream &s); - -Q_CORE_EXPORT QTextStream &fixed(QTextStream &s); -Q_CORE_EXPORT QTextStream &scientific(QTextStream &s); - -Q_CORE_EXPORT QTextStream &left(QTextStream &s); -Q_CORE_EXPORT QTextStream &right(QTextStream &s); -Q_CORE_EXPORT QTextStream ¢er(QTextStream &s); - -Q_CORE_EXPORT QTextStream &endl(QTextStream &s); -Q_CORE_EXPORT QTextStream &flush(QTextStream &s); -Q_CORE_EXPORT QTextStream &reset(QTextStream &s); - -Q_CORE_EXPORT QTextStream &bom(QTextStream &s); - -Q_CORE_EXPORT QTextStream &ws(QTextStream &s); - -inline QTextStreamManipulator qSetFieldWidth(int width) -{ - QTSMFI func = &QTextStream::setFieldWidth; - return QTextStreamManipulator(func,width); -} - -inline QTextStreamManipulator qSetPadChar(QChar ch) -{ - QTSMFC func = &QTextStream::setPadChar; - return QTextStreamManipulator(func, ch); -} - -inline QTextStreamManipulator qSetRealNumberPrecision(int precision) -{ - QTSMFI func = &QTextStream::setRealNumberPrecision; - return QTextStreamManipulator(func, precision); -} - -QT_END_NAMESPACE - -#endif // QTEXTSTREAM_H diff --git a/src/corelib/io/qtextstream_p.h b/src/corelib/io/qtextstream_p.h deleted file mode 100644 index a642beddc4..0000000000 --- a/src/corelib/io/qtextstream_p.h +++ /dev/null @@ -1,200 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTEXTSTREAM_P_H -#define QTEXTSTREAM_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/private/qglobal_p.h> -#include "qtextstream.h" -#ifndef QT_NO_TEXTCODEC -#include "qtextcodec.h" -#endif - -QT_BEGIN_NAMESPACE - -#ifndef QT_NO_QOBJECT -class QDeviceClosedNotifier : public QObject -{ - Q_OBJECT -public: - inline QDeviceClosedNotifier() - { } - - inline void setupDevice(QTextStream *stream, QIODevice *device) - { - disconnect(); - if (device) - connect(device, SIGNAL(aboutToClose()), this, SLOT(flushStream())); - this->stream = stream; - } - -public Q_SLOTS: - inline void flushStream() { stream->flush(); } - -private: - QTextStream *stream; -}; -#endif - -class QTextStreamPrivate -{ - Q_DECLARE_PUBLIC(QTextStream) -public: - // streaming parameters - class Params - { - public: - void reset(); - - int realNumberPrecision; - int integerBase; - int fieldWidth; - QChar padChar; - QTextStream::FieldAlignment fieldAlignment; - QTextStream::RealNumberNotation realNumberNotation; - QTextStream::NumberFlags numberFlags; - }; - - QTextStreamPrivate(QTextStream *q_ptr); - ~QTextStreamPrivate(); - void reset(); - - // device - QIODevice *device; -#ifndef QT_NO_QOBJECT - QDeviceClosedNotifier deviceClosedNotifier; -#endif - - // string - QString *string; - int stringOffset; - QIODevice::OpenMode stringOpenMode; - -#ifndef QT_NO_TEXTCODEC - // codec - QTextCodec *codec; - QTextCodec::ConverterState readConverterState; - QTextCodec::ConverterState writeConverterState; - QTextCodec::ConverterState *readConverterSavedState; -#endif - - QString writeBuffer; - QString readBuffer; - int readBufferOffset; - int readConverterSavedStateOffset; //the offset between readBufferStartDevicePos and that start of the buffer - qint64 readBufferStartDevicePos; - - Params params; - - // status - QTextStream::Status status; - QLocale locale; - QTextStream *q_ptr; - - int lastTokenSize; - bool deleteDevice; -#ifndef QT_NO_TEXTCODEC - bool autoDetectUnicode; -#endif - - // i/o - enum TokenDelimiter { - Space, - NotSpace, - EndOfLine - }; - - QString read(int maxlen); - bool scan(const QChar **ptr, int *tokenLength, - int maxlen, TokenDelimiter delimiter); - inline const QChar *readPtr() const; - inline void consumeLastToken(); - inline void consume(int nchars); - void saveConverterState(qint64 newPos); - void restoreToSavedConverterState(); - - // Return value type for getNumber() - enum NumberParsingStatus { - npsOk, - npsMissingDigit, - npsInvalidPrefix - }; - - inline bool getChar(QChar *ch); - inline void ungetChar(QChar ch); - NumberParsingStatus getNumber(qulonglong *l); - bool getReal(double *f); - - inline void write(const QString &data) { write(data.begin(), data.length()); } - inline void write(QChar ch); - void write(const QChar *data, int len); - void write(QLatin1String data); - void writePadding(int len); - inline void putString(const QString &ch, bool number = false) { putString(ch.constData(), ch.length(), number); } - void putString(const QChar *data, int len, bool number = false); - void putString(QLatin1String data, bool number = false); - inline void putChar(QChar ch); - void putNumber(qulonglong number, bool negative); - - struct PaddingResult { - int left, right; - }; - PaddingResult padding(int len) const; - - // buffers - bool fillReadBuffer(qint64 maxBytes = -1); - void resetReadBuffer(); - void flushWriteBuffer(); -}; - -QT_END_NAMESPACE - -#endif // QTEXTSTREAM_P_H diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 0bb8707ff9..5062ef7905 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -184,7 +184,7 @@ public: #endif #ifdef Q_COMPILER_RVALUE_REFS QUrl(QUrl &&other) Q_DECL_NOTHROW : d(other.d) - { other.d = Q_NULLPTR; } + { other.d = nullptr; } inline QUrl &operator=(QUrl &&other) Q_DECL_NOTHROW { qSwap(d, other.d); return *this; } #endif diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp index 226bc8ba28..2f8bd91f6e 100644 --- a/src/corelib/io/qurlidna.cpp +++ b/src/corelib/io/qurlidna.cpp @@ -60,11 +60,6 @@ struct NameprepCaseFoldingEntry { ushort mapping[4]; }; -#if defined(Q_CC_MSVC) && _MSC_VER < 1600 -inline bool operator<(const NameprepCaseFoldingEntry &one, const NameprepCaseFoldingEntry &other) -{ return one.uc < other.uc; } -#endif - inline bool operator<(uint one, const NameprepCaseFoldingEntry &other) { return one < other.uc; } diff --git a/src/corelib/io/qurlrecode.cpp b/src/corelib/io/qurlrecode.cpp index ce90ab49d3..a9b23babc0 100644 --- a/src/corelib/io/qurlrecode.cpp +++ b/src/corelib/io/qurlrecode.cpp @@ -511,7 +511,7 @@ static int decode(QString &appendTo, const ushort *begin, const ushort *end) if (Q_UNLIKELY(end - input < 3 || !isHex(input[1]) || !isHex(input[2]))) { // badly-encoded data appendTo.resize(origSize + (end - begin)); - memcpy(appendTo.begin() + origSize, begin, (end - begin) * sizeof(ushort)); + memcpy(static_cast<void *>(appendTo.begin() + origSize), static_cast<const void *>(begin), (end - begin) * sizeof(ushort)); return end - begin; } @@ -519,7 +519,7 @@ static int decode(QString &appendTo, const ushort *begin, const ushort *end) // detach appendTo.resize(origSize + (end - begin)); output = reinterpret_cast<ushort *>(appendTo.begin()) + origSize; - memcpy(output, begin, (input - begin) * sizeof(ushort)); + memcpy(static_cast<void *>(output), static_cast<const void *>(begin), (input - begin) * sizeof(ushort)); output += input - begin; } diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp index ef5ff2d827..3055fb392e 100644 --- a/src/corelib/io/qwindowspipereader.cpp +++ b/src/corelib/io/qwindowspipereader.cpp @@ -175,7 +175,7 @@ void QWindowsPipeReader::notified(DWORD errorCode, DWORD numberOfBytesRead) case ERROR_OPERATION_ABORTED: if (stopped) break; - // fall through + Q_FALLTHROUGH(); default: emit winError(errorCode, QLatin1String("QWindowsPipeReader::notified")); pipeBroken = true; diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp index 75cb8a7ede..92e8b6db52 100644 --- a/src/corelib/io/qwindowspipewriter.cpp +++ b/src/corelib/io/qwindowspipewriter.cpp @@ -145,7 +145,7 @@ void QWindowsPipeWriter::notified(DWORD errorCode, DWORD numberOfBytesWritten) case ERROR_OPERATION_ABORTED: if (stopped) break; - // fall through + Q_FALLTHROUGH(); default: qErrnoWarning(errorCode, "QWindowsPipeWriter: asynchronous write failed."); break; |