This is a fix for problems introduced by bf7f170.
Change-Id: If5dd8e031ef2efea578b3efb188c2e950e1ba41a
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
- QAbstractSocket's connectToHost() and disconnectFromHost() are now virtual and
connectToHostImplementation() and disconnectFromHostImplementation() don't exist.
+- QTcpServer::incomingConnection() now takes a qintptr instead of an int.
+
****************************************************************************
* General *
//! [1]
-void SslServer::incomingConnection(int socketDescriptor)
+void SslServer::incomingConnection(qintptr socketDescriptor)
{
QSslSocket *serverSocket = new QSslSocket;
if (serverSocket->setSocketDescriptor(socketDescriptor)) {
listen(QHostAddress::Any);
}
-void Server::incomingConnection(int socketDescriptor)
+void Server::incomingConnection(qintptr socketDescriptor)
{
Connection *connection = new Connection(this);
connection->setSocketDescriptor(socketDescriptor);
void newConnection(Connection *connection);
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
};
#endif
//! [0]
//! [1]
-void FortuneServer::incomingConnection(int socketDescriptor)
+void FortuneServer::incomingConnection(qintptr socketDescriptor)
{
QString fortune = fortunes.at(qrand() % fortunes.size());
FortuneThread *thread = new FortuneThread(socketDescriptor, fortune, this);
FortuneServer(QObject *parent = 0);
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
private:
QStringList fortunes;
clients.removeAll(client);
}
-void TorrentServer::incomingConnection(int socketDescriptor)
+void TorrentServer::incomingConnection(qintptr socketDescriptor)
{
PeerWireClient *client =
new PeerWireClient(ConnectionManager::instance()->clientId(), this);
void removeClient(TorrentClient *client);
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
private slots:
void removeClient();
}
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
//qDebug() << "incomingConnection" << socketDescriptor << "doSsl:" << doSsl << "ipv6:" << ipv6;
if (!doSsl) {
return nextPendingConnection();
}
}
- virtual void incomingConnection(int socketDescriptor)
+ virtual void incomingConnection(qintptr socketDescriptor)
{
#ifndef QT_NO_OPENSSL
if (doSsl) {
Q_OBJECT
public:
SslServer() : socket(0) {};
- void incomingConnection(int socketDescriptor) {
+ void incomingConnection(qintptr socketDescriptor) {
QSslSocket *serverSocket = new QSslSocket;
serverSocket->setParent(this);
}
//------------------------------------------------------------------------------
-void My4Server::incomingConnection(int socketId)
+void My4Server::incomingConnection(qintptr socketId)
{
m_socket = new My4Socket(this);
m_socket->setSocketDescriptor(socketId);
My4Server(QObject *parent = 0);
protected:
- void incomingConnection(int socket);
+ void incomingConnection(qintptr socket);
private slots:
void stopServer();
QString m_certFile;
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
socket = new QSslSocket(this);
socket->setProtocol(protocol);
class SslServer2 : public QTcpServer
{
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
QSslSocket *socket = new QSslSocket(this);
socket->ignoreSslErrors();
QSslSocket *socket;
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
socket = new QSslSocket(this);
connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot()));
QSslSocket *socket;
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
socket = new QSslSocket(this);
return settingsFile;
}
-void BaselineServer::incomingConnection(int socketDescriptor)
+void BaselineServer::incomingConnection(qintptr socketDescriptor)
{
QString runId = QDateTime::currentDateTime().toString(QLS("MMMdd-hhmmss"));
if (runId == lastRunId) {
static QString settingsFilePath();
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
private slots:
void heartbeat();