aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/clangsupport
diff options
context:
space:
mode:
authorRobert Löhning <robert.loehning@qt.io>2022-03-07 23:35:26 +0100
committerRobert Löhning <robert.loehning@qt.io>2022-03-09 18:53:36 +0000
commit7c942cfd1881e7e2153219502ed2c189633f7381 (patch)
tree20b77befc007b6a398cc07f56e5ca81ec5b04753 /src/libs/clangsupport
parent34ecdc30084bc47dfe2e77aa21463806dcbdcb26 (diff)
Remove outdated code
Change-Id: I65e0ed79dabd987bc67d4082969835d52dd7cb8b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/libs/clangsupport')
-rw-r--r--src/libs/clangsupport/connectionclient.cpp9
-rw-r--r--src/libs/clangsupport/connectionserver.h9
2 files changed, 2 insertions, 16 deletions
diff --git a/src/libs/clangsupport/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp
index d9addc6ece..9645c1f6a4 100644
--- a/src/libs/clangsupport/connectionclient.cpp
+++ b/src/libs/clangsupport/connectionclient.cpp
@@ -327,15 +327,8 @@ void ConnectionClient::connectStandardOutputAndError(QtcProcess *process) const
void ConnectionClient::connectLocalSocketError() const
{
- void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError)
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- = &QLocalSocket::error;
-#else
- = &QLocalSocket::errorOccurred;
-#endif
-
connect(m_localSocket,
- LocalSocketErrorFunction,
+ &QLocalSocket::errorOccurred,
this,
&ConnectionClient::printLocalSocketError);
}
diff --git a/src/libs/clangsupport/connectionserver.h b/src/libs/clangsupport/connectionserver.h
index 941423b0d1..c9288fd9af 100644
--- a/src/libs/clangsupport/connectionserver.h
+++ b/src/libs/clangsupport/connectionserver.h
@@ -81,15 +81,8 @@ public:
private:
void connectToLocalServer(const QString &connectionName)
{
- void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError)
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- = &QLocalSocket::error;
-#else
- = &QLocalSocket::errorOccurred;
-#endif
-
QObject::connect(&m_localSocket,
- LocalSocketErrorFunction,
+ &QLocalSocket::errorOccurred,
[&] (QLocalSocket::LocalSocketError) {
qWarning() << "ConnectionServer error:" << m_localSocket.errorString() << connectionName;
});