From: Jonah =?unknown-8bit?q?Br=C3=BCchert?= <jbb.prv@gmx.de>
To: ofono@ofono.org
Subject: [PATCH phonesim 7/7] Fix handling of incoming connections
Date: Sun, 27 Oct 2019 02:04:25 +0200 [thread overview]
Message-ID: <20191027000425.14022-8-jbb.prv@gmx.de> (raw)
In-Reply-To: <20191027000425.14022-1-jbb.prv@gmx.de>
[-- Attachment #1: Type: text/plain, Size: 1210 bytes --]
The function has changed from: void incomingConnection(int s)
to: void incomingConnection(qintptr s) in Qt5
See https://doc.qt.io/qt-5/sourcebreaks.html#changes-to-qt-network
This caused our implementation of incomingConnection() of QTcpServer not
to be called anymore.
---
src/server.cpp | 2 +-
src/server.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/server.cpp b/src/server.cpp
index cd68969..62487ee 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -44,7 +44,7 @@ void PhoneSimServer::setHardwareManipulator(HardwareManipulatorFactory *f)
f->setRuleFile(filename);
}
-void PhoneSimServer::incomingConnection(int s)
+void PhoneSimServer::incomingConnection(qintptr s)
{
SimRules *sr = new SimRules(s, this, filename, fact);
sr->setPhoneNumber(QString::number(phonenumber));
diff --git a/src/server.h b/src/server.h
index 5915cc1..8fc5cfc 100644
--- a/src/server.h
+++ b/src/server.h
@@ -40,7 +40,7 @@ public:
SimRules *rules() const { return currentRules; }
protected:
- void incomingConnection(int s);
+ void incomingConnection(qintptr s) override;
private:
QString filename;
--
2.23.0
next prev parent reply other threads:[~2019-10-27 0:04 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 0:04 Port ofono-phonesim to Qt5 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 0:04 ` [PATCH phonesim 1/7] Port to qt5 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 0:04 ` [PATCH phonesim 2/7] Fix random build failure Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 0:04 ` [PATCH phonesim 3/7] configure.ac: use gnu++11 to fix build with Qt 5.7 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 0:04 ` [PATCH phonesim 4/7] Fix build with Qt 5.8 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 0:04 ` [PATCH phonesim 5/7] configure.ac: fix checking for host_bins variable Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 0:04 ` [PATCH phonesim 6/7] Make Qt detect fPIC flag correctly Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 0:04 ` Jonah =?unknown-8bit?q?Br=C3=BCchert?= [this message]
2019-10-27 0:11 ` Port ofono-phonesim to Qt5 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 11:42 ` Alexander Akulich
2019-10-27 16:05 ` Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` [PATCH phonesim v2 1/8] Port to qt5 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-29 16:06 ` Denis Kenzior
2019-10-29 16:58 ` Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-30 15:44 ` Denis Kenzior
2019-10-30 20:37 ` [PATCH phonesim v3 1/2] " Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-30 20:37 ` [PATCH phonesim v3 2/2] Use override at least in server header Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-11-07 0:10 ` [PATCH phonesim v3 1/2] Port to qt5 Denis Kenzior
2019-11-07 10:26 ` Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-11-12 2:28 ` Denis Kenzior
2019-10-27 16:30 ` [PATCH phonesim v2 2/8] Fix random build failure Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` [PATCH phonesim v2 3/8] configure.ac: use gnu++11 to fix build with Qt 5.7 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` [PATCH phonesim v2 4/8] Fix build with Qt 5.8 Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` [PATCH phonesim v2 5/8] configure.ac: fix checking for host_bins variable Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` [PATCH phonesim v2 6/8] Make Qt detect fPIC flag correctly Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` [PATCH phonesim v2 7/8] Fix Qt5 port on 64-bit platforms Jonah =?unknown-8bit?q?Br=C3=BCchert?=
2019-10-27 16:30 ` [PATCH phonesim v2 8/8] Use override at least in server header Jonah =?unknown-8bit?q?Br=C3=BCchert?=
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191027000425.14022-8-jbb.prv@gmx.de \
--to=jbb.prv@gmx.de \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.