diff options
Diffstat (limited to 'src/network/access/qhttpthreaddelegate_p.h')
| -rw-r--r-- | src/network/access/qhttpthreaddelegate_p.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index 16610828cb..ff919b11c5 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/src/network/access/qhttpthreaddelegate_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtNetwork module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ @@ -131,6 +131,7 @@ signals: void encrypted(); void sslErrors(const QList<QSslError> &, bool *, QList<QSslError> *); void sslConfigurationChanged(const QSslConfiguration); + void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *); #endif void downloadMetaData(QList<QPair<QByteArray,QByteArray> >, int, QString, bool, QSharedPointer<char>, qint64, bool); @@ -161,6 +162,7 @@ protected slots: #ifndef QT_NO_SSL void encryptedSlot(); void sslErrorsSlot(const QList<QSslError> &errors); + void preSharedKeyAuthenticationRequiredSlot(QSslPreSharedKeyAuthenticator *authenticator); #endif void synchronousAuthenticationRequiredSlot(const QHttpNetworkRequest &request, QAuthenticator *); @@ -202,7 +204,7 @@ public: { } - const char* readPointer(qint64 maximumLength, qint64 &len) + const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE { if (m_amount > 0) { len = m_amount; @@ -222,7 +224,7 @@ public: return 0; } - bool advanceReadPointer(qint64 a) + bool advanceReadPointer(qint64 a) Q_DECL_OVERRIDE { if (m_data == 0) return false; @@ -238,7 +240,7 @@ public: return true; } - bool atEnd() + bool atEnd() Q_DECL_OVERRIDE { if (m_amount > 0) return false; @@ -246,7 +248,7 @@ public: return m_atEnd; } - bool reset() + bool reset() Q_DECL_OVERRIDE { m_amount = 0; m_data = 0; @@ -257,7 +259,7 @@ public: return b; } - qint64 size() + qint64 size() Q_DECL_OVERRIDE { return m_size; } |