diff options
Diffstat (limited to 'src/corelib/io/qnoncontiguousbytedevice.cpp')
-rw-r--r-- | src/corelib/io/qnoncontiguousbytedevice.cpp | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp index af1bb56fe9..61299b8aa8 100644 --- a/src/corelib/io/qnoncontiguousbytedevice.cpp +++ b/src/corelib/io/qnoncontiguousbytedevice.cpp @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** 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:LGPL21$ +** $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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** 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. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** 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$ ** @@ -79,7 +85,7 @@ QT_BEGIN_NAMESPACE \internal */ /*! - \fn virtual bool QNonContiguousByteDevice::atEnd() + \fn virtual bool QNonContiguousByteDevice::atEnd() const Returns \c true if everything has been read and the read pointer cannot be advanced anymore. @@ -99,7 +105,7 @@ QT_BEGIN_NAMESPACE \internal */ /*! - \fn virtual qint64 QNonContiguousByteDevice::size() + \fn virtual qint64 QNonContiguousByteDevice::size() const Returns the size of the complete device or -1 if unknown. May also return less/more than what can be actually read with readPointer() @@ -154,7 +160,7 @@ bool QNonContiguousByteDeviceBufferImpl::advanceReadPointer(qint64 amount) return arrayImpl->advanceReadPointer(amount); } -bool QNonContiguousByteDeviceBufferImpl::atEnd() +bool QNonContiguousByteDeviceBufferImpl::atEnd() const { return arrayImpl->atEnd(); } @@ -164,7 +170,7 @@ bool QNonContiguousByteDeviceBufferImpl::reset() return arrayImpl->reset(); } -qint64 QNonContiguousByteDeviceBufferImpl::size() +qint64 QNonContiguousByteDeviceBufferImpl::size() const { return arrayImpl->size(); } @@ -200,7 +206,7 @@ bool QNonContiguousByteDeviceByteArrayImpl::advanceReadPointer(qint64 amount) return true; } -bool QNonContiguousByteDeviceByteArrayImpl::atEnd() +bool QNonContiguousByteDeviceByteArrayImpl::atEnd() const { return currentPosition >= size(); } @@ -211,12 +217,12 @@ bool QNonContiguousByteDeviceByteArrayImpl::reset() return true; } -qint64 QNonContiguousByteDeviceByteArrayImpl::size() +qint64 QNonContiguousByteDeviceByteArrayImpl::size() const { return byteArray->size(); } -qint64 QNonContiguousByteDeviceByteArrayImpl::pos() +qint64 QNonContiguousByteDeviceByteArrayImpl::pos() const { return currentPosition; } @@ -253,12 +259,12 @@ bool QNonContiguousByteDeviceRingBufferImpl::advanceReadPointer(qint64 amount) return true; } -bool QNonContiguousByteDeviceRingBufferImpl::atEnd() +bool QNonContiguousByteDeviceRingBufferImpl::atEnd() const { return currentPosition >= size(); } -qint64 QNonContiguousByteDeviceRingBufferImpl::pos() +qint64 QNonContiguousByteDeviceRingBufferImpl::pos() const { return currentPosition; } @@ -269,7 +275,7 @@ bool QNonContiguousByteDeviceRingBufferImpl::reset() return true; } -qint64 QNonContiguousByteDeviceRingBufferImpl::size() +qint64 QNonContiguousByteDeviceRingBufferImpl::size() const { return ringBuffer->size(); } @@ -358,7 +364,7 @@ bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount) return true; } -bool QNonContiguousByteDeviceIoDeviceImpl::atEnd() +bool QNonContiguousByteDeviceIoDeviceImpl::atEnd() const { return eof == true; } @@ -381,7 +387,7 @@ bool QNonContiguousByteDeviceIoDeviceImpl::reset() return false; } -qint64 QNonContiguousByteDeviceIoDeviceImpl::size() +qint64 QNonContiguousByteDeviceIoDeviceImpl::size() const { // note that this is different from the size() implementation of QIODevice! @@ -391,7 +397,7 @@ qint64 QNonContiguousByteDeviceIoDeviceImpl::size() return device->size() - initialPosition; } -qint64 QNonContiguousByteDeviceIoDeviceImpl::pos() +qint64 QNonContiguousByteDeviceIoDeviceImpl::pos() const { if (device->isSequential()) return -1; |