6d18e4a2b8
This reverts commit 94b3dd77f2.
The patch fixes ambiguity between a getter and a signal by changing the
getter name, but we still have to rename the signal to follow the signals
naming convention.
Revert the commit to keep the getter as is and change the signal name instead.
Change-Id: I0dd60cf1ae9d1bd95beeb8ad58661ca4b1fb63b9
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
138 lines
4.0 KiB
C++
138 lines
4.0 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the examples of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:BSD$
|
|
** 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.
|
|
**
|
|
** BSD License Usage
|
|
** Alternatively, you may use this file under the terms of the BSD license
|
|
** as follows:
|
|
**
|
|
** "Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions are
|
|
** met:
|
|
** * Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** * 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.
|
|
** * Neither the name of The Qt Company Ltd 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 COPYRIGHT HOLDERS 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 COPYRIGHT
|
|
** OWNER 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."
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtNetwork>
|
|
|
|
#include "fortunethread.h"
|
|
|
|
FortuneThread::FortuneThread(QObject *parent)
|
|
: QThread(parent), quit(false)
|
|
{
|
|
}
|
|
|
|
//! [0]
|
|
FortuneThread::~FortuneThread()
|
|
{
|
|
mutex.lock();
|
|
quit = true;
|
|
cond.wakeOne();
|
|
mutex.unlock();
|
|
wait();
|
|
}
|
|
//! [0]
|
|
|
|
//! [1] //! [2]
|
|
void FortuneThread::requestNewFortune(const QString &hostName, quint16 port)
|
|
{
|
|
//! [1]
|
|
QMutexLocker locker(&mutex);
|
|
this->hostName = hostName;
|
|
this->port = port;
|
|
//! [3]
|
|
if (!isRunning())
|
|
start();
|
|
else
|
|
cond.wakeOne();
|
|
}
|
|
//! [2] //! [3]
|
|
|
|
//! [4]
|
|
void FortuneThread::run()
|
|
{
|
|
mutex.lock();
|
|
//! [4] //! [5]
|
|
QString serverName = hostName;
|
|
quint16 serverPort = port;
|
|
mutex.unlock();
|
|
//! [5]
|
|
|
|
//! [6]
|
|
while (!quit) {
|
|
//! [7]
|
|
const int Timeout = 5 * 1000;
|
|
|
|
QTcpSocket socket;
|
|
socket.connectToHost(serverName, serverPort);
|
|
//! [6] //! [8]
|
|
|
|
if (!socket.waitForConnected(Timeout)) {
|
|
emit error(socket.error(), socket.errorString());
|
|
return;
|
|
}
|
|
//! [8] //! [11]
|
|
|
|
QDataStream in(&socket);
|
|
in.setVersion(QDataStream::Qt_4_0);
|
|
QString fortune;
|
|
//! [11] //! [12]
|
|
|
|
do {
|
|
if (!socket.waitForReadyRead(Timeout)) {
|
|
emit error(socket.error(), socket.errorString());
|
|
return;
|
|
}
|
|
|
|
in.startTransaction();
|
|
in >> fortune;
|
|
} while (!in.commitTransaction());
|
|
//! [12] //! [15]
|
|
|
|
mutex.lock();
|
|
emit newFortune(fortune);
|
|
//! [7]
|
|
|
|
cond.wait(&mutex);
|
|
serverName = hostName;
|
|
serverPort = port;
|
|
mutex.unlock();
|
|
}
|
|
//! [15]
|
|
}
|