From 7c942cfd1881e7e2153219502ed2c189633f7381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Mon, 7 Mar 2022 23:35:26 +0100 Subject: [PATCH] Remove outdated code Change-Id: I65e0ed79dabd987bc67d4082969835d52dd7cb8b Reviewed-by: Eike Ziller Reviewed-by: Reviewed-by: Qt CI Bot --- src/app/main.cpp | 6 ------ src/libs/advanceddockingsystem/workspacemodel.cpp | 4 ---- src/libs/clangsupport/connectionclient.cpp | 9 +-------- src/libs/clangsupport/connectionserver.h | 9 +-------- src/libs/qmldebug/qmldebugconnection.cpp | 13 +------------ src/libs/utils/algorithm.h | 4 ---- src/libs/utils/commandline.cpp | 6 ------ src/libs/utils/launchersocket.cpp | 4 ---- src/libs/utils/porting.h | 7 ------- src/libs/utils/stringutils.cpp | 7 ------- src/plugins/boot2qt/device-detection/qdbwatcher.cpp | 9 +-------- src/plugins/fakevim/fakevimplugin.cpp | 10 ---------- .../jsonwizard/jsonwizardfactory.cpp | 10 ---------- src/plugins/qmakeprojectmanager/externaleditors.cpp | 7 +------ src/tools/processlauncher/launchersockethandler.cpp | 4 ---- 15 files changed, 5 insertions(+), 104 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index e17ef27e209..c2a64e6d9ce 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -289,12 +289,6 @@ static void setHighDpiEnvironmentVariable() && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) { #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#if QT_VERSION == QT_VERSION_CHECK(5, 14, 0) - // work around QTBUG-80934 - QGuiApplication::setHighDpiScaleFactorRoundingPolicy( - Qt::HighDpiScaleFactorRoundingPolicy::Round); -#endif - #endif } else { #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) diff --git a/src/libs/advanceddockingsystem/workspacemodel.cpp b/src/libs/advanceddockingsystem/workspacemodel.cpp index fc76ce31804..b23cf394f46 100644 --- a/src/libs/advanceddockingsystem/workspacemodel.cpp +++ b/src/libs/advanceddockingsystem/workspacemodel.cpp @@ -161,13 +161,9 @@ QHash WorkspaceModel::roleNames() const {LastWorkspaceRole, "activeWorkspace"}, {ActiveWorkspaceRole, "lastWorkspace"}}; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) auto defaultRoles = QAbstractTableModel::roleNames(); defaultRoles.insert(extraRoles); return defaultRoles; -#else - return QAbstractTableModel::roleNames().unite(extraRoles); -#endif } void WorkspaceModel::sort(int column, Qt::SortOrder order) diff --git a/src/libs/clangsupport/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp index d9addc6ecee..9645c1f6a42 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 941423b0d15..c9288fd9aff 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; }); diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp index ad34bdddab1..cf41b4275ad 100644 --- a/src/libs/qmldebug/qmldebugconnection.cpp +++ b/src/libs/qmldebug/qmldebugconnection.cpp @@ -347,11 +347,7 @@ void QmlDebugConnection::connectToHost(const QString &hostName, quint16 port) emit logStateChange(socketStateToString(state)); }); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const auto errorOccurred = QOverload::of(&QAbstractSocket::error); -#else const auto errorOccurred = &QAbstractSocket::errorOccurred; -#endif connect(socket, errorOccurred, this, [this](QAbstractSocket::SocketError error) { emit logError(socketErrorToString(error)); socketDisconnected(); @@ -392,14 +388,7 @@ void QmlDebugConnection::newConnection() connect(socket, &QLocalSocket::disconnected, this, &QmlDebugConnection::socketDisconnected, Qt::QueuedConnection); - void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - = &QLocalSocket::error; -#else - = &QLocalSocket::errorOccurred; -#endif - - connect(socket, LocalSocketErrorFunction, this, [this](QLocalSocket::LocalSocketError error) { + connect(socket, &QLocalSocket::errorOccurred, this, [this](QLocalSocket::LocalSocketError error) { emit logError(socketErrorToString(static_cast(error))); socketDisconnected(); }, Qt::QueuedConnection); diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h index 62bcace8ef9..ae4a718c836 100644 --- a/src/libs/utils/algorithm.h +++ b/src/libs/utils/algorithm.h @@ -1303,11 +1303,7 @@ QList toList(const QSet &set) template void addToHash(QHash *result, const QHash &additionalContents) { -#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - result->unite(additionalContents); -#else result->insert(additionalContents); -#endif } } // namespace Utils diff --git a/src/libs/utils/commandline.cpp b/src/libs/utils/commandline.cpp index c81e49b30f0..cae41a187fe 100644 --- a/src/libs/utils/commandline.cpp +++ b/src/libs/utils/commandline.cpp @@ -670,13 +670,7 @@ bool ProcessArgs::prepareCommand(const CommandLine &cmdLine, QString *outCmd, Pr } else { if (err != ProcessArgs::FoundMeta) return false; -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) *outCmd = qEnvironmentVariable("SHELL", "/bin/sh"); -#else - // for sdktool - *outCmd = qEnvironmentVariableIsSet("SHELL") ? QString::fromLocal8Bit(qgetenv("SHELL")) - : QString("/bin/sh"); -#endif *outArgs = ProcessArgs::createUnixArgs({"-c", quoteArg(executable.toString()) + ' ' + arguments}); } } diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp index 124fd4ecec7..67aa254d76b 100644 --- a/src/libs/utils/launchersocket.cpp +++ b/src/libs/utils/launchersocket.cpp @@ -817,11 +817,7 @@ void LauncherSocket::setSocket(QLocalSocket *socket) m_socket.store(socket); m_packetParser.setDevice(m_socket); connect(m_socket, -#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - static_cast(&QLocalSocket::error), -#else &QLocalSocket::errorOccurred, -#endif this, &LauncherSocket::handleSocketError); connect(m_socket, &QLocalSocket::readyRead, this, &LauncherSocket::handleSocketDataAvailable); diff --git a/src/libs/utils/porting.h b/src/libs/utils/porting.h index f8d945a0c41..da2aed4b43b 100644 --- a/src/libs/utils/porting.h +++ b/src/libs/utils/porting.h @@ -34,12 +34,7 @@ namespace Utils { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) -// Keep the support code for lower Qt versions for sdktool -constexpr QString::SplitBehavior SkipEmptyParts = QString::SkipEmptyParts; -#else constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts; -#endif #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using QHashValueType = uint; @@ -71,7 +66,6 @@ inline StringView make_stringview(const QString &s) #endif } -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) // QStringView::mid in Qt5 does not do bounds checking, in Qt6 it does inline QStringView midView(const QString &s, int offset, int length) { @@ -92,7 +86,6 @@ inline QStringView midView(const QString &s, int offset, int length) return QStringView(s).mid(offset, length); #endif } -#endif #ifdef QT_GUI_LIB #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index ba664b1b700..7fa3937da3c 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -400,9 +400,6 @@ QString formatElapsedTime(qint64 elapsed) */ QString wildcardToRegularExpression(const QString &original) { -#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - using qsizetype = int; -#endif const qsizetype wclen = original.size(); QString rx; rx.reserve(wclen + wclen / 16); @@ -459,11 +456,7 @@ QString wildcardToRegularExpression(const QString &original) } } -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) return QRegularExpression::anchoredPattern(rx); -#else - return "\\A" + rx + "\\z"; -#endif } QTCREATOR_UTILS_EXPORT QString languageNameFromLanguageCode(const QString &languageCode) diff --git a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp index 3d54227a514..7a782e09472 100644 --- a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp +++ b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp @@ -62,17 +62,10 @@ void QdbWatcher::start(RequestType requestType) void QdbWatcher::startPrivate() { - void (QLocalSocket::*LocalSocketErrorFunction)(QLocalSocket::LocalSocketError) -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - = &QLocalSocket::error; -#else - = &QLocalSocket::errorOccurred; -#endif - m_socket = std::unique_ptr(new QLocalSocket()); connect(m_socket.get(), &QLocalSocket::connected, this, &QdbWatcher::handleWatchConnection); - connect(m_socket.get(), LocalSocketErrorFunction, + connect(m_socket.get(), &QLocalSocket::errorOccurred, this, &QdbWatcher::handleWatchError); m_socket->connectToServer(qdbSocketName); } diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 0ca936d4bff..6f9dc70acd9 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -698,13 +698,8 @@ void FakeVimExCommandsPage::apply() } settings->endArray(); globalCommandMapping.clear(); -#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) globalCommandMapping.insert(defaultMap); globalCommandMapping.insert(newMapping); -#else - globalCommandMapping.unite(defaultMap); - globalCommandMapping.unite(newMapping); -#endif } } @@ -956,13 +951,8 @@ void FakeVimUserCommandsPage::apply() } settings->endArray(); userMap.clear(); -#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) userMap.insert(dd->m_defaultUserCommandMap); userMap.insert(current); -#else - userMap.unite(dd->m_defaultUserCommandMap); - userMap.unite(current); -#endif } } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 705e51aa66d..9ed80f77c27 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -247,18 +247,8 @@ QVariant JsonWizardFactory::mergeDataValueMaps(const QVariant &valueMap, const Q { QVariantMap retVal; -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const QVariantMap &map = defaultValueMap.toMap(); - for (auto it = map.begin(), end = map.end(); it != end; ++it) - retVal.insert(it.key(), it.value()); - - const QVariantMap &map2 = valueMap.toMap(); - for (auto it = map2.begin(), end = map2.end(); it != end; ++it) - retVal.insert(it.key(), it.value()); -#else retVal.insert(defaultValueMap.toMap()); retVal.insert(valueMap.toMap()); -#endif return retVal; } diff --git a/src/plugins/qmakeprojectmanager/externaleditors.cpp b/src/plugins/qmakeprojectmanager/externaleditors.cpp index 6d5893e6701..3d43bd45418 100644 --- a/src/plugins/qmakeprojectmanager/externaleditors.cpp +++ b/src/plugins/qmakeprojectmanager/externaleditors.cpp @@ -272,12 +272,7 @@ bool DesignerExternalEditor::startEditor(const Utils::FilePath &filePath, QStrin m_processCache.insert(binary, socket); auto mapSlot = [this, binary] { processTerminated(binary); }; connect(socket, &QAbstractSocket::disconnected, this, mapSlot); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const auto errorOccurred = QOverload::of(&QAbstractSocket::error); -#else - const auto errorOccurred = &QAbstractSocket::errorOccurred; -#endif - connect(socket, errorOccurred, this, mapSlot); + connect(socket, &QAbstractSocket::errorOccurred, this, mapSlot); } return true; } diff --git a/src/tools/processlauncher/launchersockethandler.cpp b/src/tools/processlauncher/launchersockethandler.cpp index 83a62a91321..e4e637fe651 100644 --- a/src/tools/processlauncher/launchersockethandler.cpp +++ b/src/tools/processlauncher/launchersockethandler.cpp @@ -74,11 +74,7 @@ void LauncherSocketHandler::start() this, &LauncherSocketHandler::handleSocketClosed); connect(m_socket, &QLocalSocket::readyRead, this, &LauncherSocketHandler::handleSocketData); connect(m_socket, -#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - static_cast(&QLocalSocket::error), -#else &QLocalSocket::errorOccurred, -#endif this, &LauncherSocketHandler::handleSocketError); m_socket->connectToServer(m_serverPath); }