diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp --- a/cli/kdeconnect-cli.cpp +++ b/cli/kdeconnect-cli.cpp @@ -90,7 +90,7 @@ } const QStringList devices = blockOnReply(iface.devices(paired, reachable)); - Q_FOREACH (const QString& id, devices) { + for (const QString& id : devices) { if (parser.isSet(QStringLiteral("id-only"))) { QTextStream(stdout) << id << endl; } else { diff --git a/core/backends/bluetooth/bluetoothlinkprovider.cpp b/core/backends/bluetooth/bluetoothlinkprovider.cpp --- a/core/backends/bluetooth/bluetoothlinkprovider.cpp +++ b/core/backends/bluetooth/bluetoothlinkprovider.cpp @@ -114,9 +114,9 @@ //I'm the new device and I found an existing device void BluetoothLinkProvider::serviceDiscoveryFinished() { - QList services = mServiceDiscoveryAgent->discoveredServices(); + const QList services = mServiceDiscoveryAgent->discoveredServices(); - Q_FOREACH (QBluetoothServiceInfo info, services) { + for (QBluetoothServiceInfo info : services) { if (mSockets.contains(info.device().address())) { continue; } diff --git a/core/daemon.cpp b/core/daemon.cpp --- a/core/daemon.cpp +++ b/core/daemon.cpp @@ -78,12 +78,12 @@ //Read remebered paired devices const QStringList& list = KdeConnectConfig::instance()->trustedDevices(); - Q_FOREACH (const QString& id, list) { + for (const QString& id : list) { addDevice(new Device(this, id)); } //Listen to new devices - Q_FOREACH (LinkProvider* a, d->mLinkProviders) { + for (LinkProvider* a : qAsConst(d->mLinkProviders)) { connect(a, &LinkProvider::onConnectionReceived, this, &Daemon::onNewDeviceLink); a->onStart(); @@ -127,7 +127,7 @@ void Daemon::cleanDevices() { - Q_FOREACH (Device* device, d->mDevices) { + for (Device* device : qAsConst(d->mDevices)) { if (device->isTrusted()) { continue; } @@ -142,14 +142,14 @@ void Daemon::forceOnNetworkChange() { qCDebug(KDECONNECT_CORE) << "Sending onNetworkChange to " << d->mLinkProviders.size() << " LinkProviders"; - Q_FOREACH (LinkProvider* a, d->mLinkProviders) { + for (LinkProvider* a : qAsConst(d->mLinkProviders)) { a->onNetworkChange(); } } Device*Daemon::getDevice(const QString& deviceId) { - Q_FOREACH (Device* device, d->mDevices) { + for (Device* device : qAsConst(d->mDevices)) { if (device->id() == deviceId) { return device; } @@ -160,7 +160,7 @@ QStringList Daemon::devices(bool onlyReachable, bool onlyTrusted) const { QStringList ret; - Q_FOREACH (Device* device, d->mDevices) { + for (Device* device : qAsConst(d->mDevices)) { if (onlyReachable && !device->isReachable()) continue; if (onlyTrusted && !device->isTrusted()) continue; ret.append(device->id()); @@ -244,9 +244,9 @@ QString Daemon::deviceIdByName(const QString &name) const { - Q_FOREACH (Device* d, d->mDevices) { - if (d->name() == name && d->isTrusted()) - return d->id(); + for (Device* device : qAsConst(d->mDevices)) { + if (device->name() == name && device->isTrusted()) + return device->id(); } return {}; } diff --git a/core/device.cpp b/core/device.cpp --- a/core/device.cpp +++ b/core/device.cpp @@ -102,7 +102,7 @@ PluginLoader* loader = PluginLoader::instance(); - Q_FOREACH (const QString& pluginName, m_supportedPlugins) { + for (const QString& pluginName : qAsConst(m_supportedPlugins)) { const KPluginMetaData service = loader->getPluginInfo(pluginName); const bool pluginEnabled = isPluginEnabled(pluginName); @@ -116,7 +116,7 @@ } Q_ASSERT(plugin); - Q_FOREACH (const QString& interface, incomingCapabilities) { + for (const QString& interface : incomingCapabilities) { newPluginsByIncomingCapability.insert(interface, plugin); } @@ -134,7 +134,7 @@ m_pluginsByIncomingCapability = newPluginsByIncomingCapability; QDBusConnection bus = QDBusConnection::sessionBus(); - Q_FOREACH(KdeConnectPlugin* plugin, m_plugins) { + for (KdeConnectPlugin* plugin : qAsConst(m_plugins)) { //TODO: see how it works in Android (only done once, when created) plugin->connected(); @@ -165,14 +165,14 @@ return; } - Q_FOREACH(DeviceLink* dl, m_deviceLinks) { + for (DeviceLink* dl : qAsConst(m_deviceLinks)) { dl->userRequestsPair(); } } void Device::unpair() { - Q_FOREACH(DeviceLink* dl, m_deviceLinks) { + for (DeviceLink* dl : qAsConst(m_deviceLinks)) { dl->userRequestsUnpair(); } KdeConnectConfig::instance()->removeTrustedDevice(id()); @@ -184,7 +184,7 @@ if (status == DeviceLink::NotPaired) { KdeConnectConfig::instance()->removeTrustedDevice(id()); - Q_FOREACH(DeviceLink* dl, m_deviceLinks) { + for (DeviceLink* dl : qAsConst(m_deviceLinks)) { if (dl != sender()) { dl->setPairStatus(DeviceLink::NotPaired); } @@ -325,7 +325,7 @@ Q_ASSERT(isTrusted()); //Maybe we could block here any package that is not an identity or a pairing package to prevent sending non encrypted data - Q_FOREACH(DeviceLink* dl, m_deviceLinks) { + for (DeviceLink* dl : qAsConst(m_deviceLinks)) { if (dl->sendPackage(np)) return true; } @@ -340,7 +340,7 @@ if (plugins.isEmpty()) { qWarning() << "discarding unsupported package" << np.type() << "for" << name(); } - Q_FOREACH (KdeConnectPlugin* plugin, plugins) { + for (KdeConnectPlugin* plugin : plugins) { plugin->receivePackage(np); } } else { @@ -359,7 +359,7 @@ { QStringList sl; sl.reserve(m_deviceLinks.size()); - Q_FOREACH(DeviceLink* dl, m_deviceLinks) { + for (DeviceLink* dl : qAsConst(m_deviceLinks)) { sl.append(dl->provider()->name()); } return sl; diff --git a/core/pluginloader.cpp b/core/pluginloader.cpp --- a/core/pluginloader.cpp +++ b/core/pluginloader.cpp @@ -36,8 +36,8 @@ PluginLoader::PluginLoader() { - QVector data = KPluginLoader::findPlugins(QStringLiteral("kdeconnect/")); - Q_FOREACH (const KPluginMetaData& metadata, data) { + const QVector data = KPluginLoader::findPlugins(QStringLiteral("kdeconnect/")); + for (const KPluginMetaData& metadata : data) { plugins[metadata.pluginId()] = metadata; } } @@ -86,7 +86,7 @@ QStringList PluginLoader::incomingCapabilities() const { QSet ret; - Q_FOREACH (const KPluginMetaData& service, plugins) { + for (const KPluginMetaData& service : qAsConst(plugins)) { ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet(); } return ret.toList(); @@ -95,7 +95,7 @@ QStringList PluginLoader::outgoingCapabilities() const { QSet ret; - Q_FOREACH (const KPluginMetaData& service, plugins) { + for (const KPluginMetaData& service : qAsConst(plugins)) { ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet(); } return ret.toList(); @@ -105,7 +105,7 @@ { QSet ret; - Q_FOREACH (const KPluginMetaData& service, plugins) { + for (const KPluginMetaData& service : qAsConst(plugins)) { const QSet pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet(); const QSet pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet(); diff --git a/fileitemactionplugin/sendfileitemaction.cpp b/fileitemactionplugin/sendfileitemaction.cpp --- a/fileitemactionplugin/sendfileitemaction.cpp +++ b/fileitemactionplugin/sendfileitemaction.cpp @@ -55,7 +55,7 @@ QDBusPendingReply reply = iface.devices(true, true); reply.waitForFinished(); const QStringList devices = reply.value(); - Q_FOREACH (const QString& id, devices) { + for (const QString& id : devices) { DeviceDbusInterface deviceIface(id); if (!deviceIface.isValid()) { continue; @@ -87,9 +87,9 @@ void SendFileItemAction::sendFile() { - QList urls = sender()->property("urls").value>(); + const QList urls = sender()->property("urls").value>(); QString id = sender()->property("id").toString(); - Q_FOREACH (const QUrl& url, urls) { + for (const QUrl& url : urls) { QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect"), "/modules/kdeconnect/devices/"+id+"/share", QStringLiteral("org.kde.kdeconnect.device.share"), QStringLiteral("shareUrl")); msg.setArguments(QVariantList() << url.toString()); QDBusConnection::sessionBus().call(msg); diff --git a/interfaces/devicesmodel.cpp b/interfaces/devicesmodel.cpp --- a/interfaces/devicesmodel.cpp +++ b/interfaces/devicesmodel.cpp @@ -203,7 +203,7 @@ return; beginInsertRows(QModelIndex(), 0, deviceIds.count()-1); - Q_FOREACH(const QString& id, deviceIds) { + for (const QString& id : deviceIds) { appendDevice(new DeviceDbusInterface(id, this)); } endInsertRows(); diff --git a/interfaces/notificationsmodel.cpp b/interfaces/notificationsmodel.cpp --- a/interfaces/notificationsmodel.cpp +++ b/interfaces/notificationsmodel.cpp @@ -155,7 +155,7 @@ } beginInsertRows(QModelIndex(), 0, notificationIds.size() - 1); - Q_FOREACH (const QString& notificationId, notificationIds) { + for (const QString& notificationId : notificationIds) { NotificationDbusInterface* dbusInterface = new NotificationDbusInterface(m_deviceId, notificationId, this); m_notificationList.append(dbusInterface); } @@ -229,7 +229,7 @@ bool NotificationsModel::isAnyDimissable() const { - Q_FOREACH (NotificationDbusInterface* notification, m_notificationList) { + for (NotificationDbusInterface* notification : qAsConst(m_notificationList)) { if (notification->dismissable()) { return true; } @@ -239,7 +239,7 @@ void NotificationsModel::dismissAll() { - Q_FOREACH (NotificationDbusInterface* notification, m_notificationList) { + for (NotificationDbusInterface* notification : qAsConst(m_notificationList)) { if (notification->dismissable()) { notification->dismiss(); } diff --git a/kio/kiokdeconnect.cpp b/kio/kiokdeconnect.cpp --- a/kio/kiokdeconnect.cpp +++ b/kio/kiokdeconnect.cpp @@ -84,9 +84,9 @@ infoMessage(i18n("Listing devices...")); //TODO: Change to all devices and show different icons for connected and disconnected? - QStringList devices = m_dbusInterface->devices(true, true); + const QStringList devices = m_dbusInterface->devices(true, true); - Q_FOREACH(const QString& deviceId, devices) { + for (const QString& deviceId : devices) { DeviceDbusInterface interface(deviceId); diff --git a/plasmoid/declarativeplugin/responsewaiter.cpp b/plasmoid/declarativeplugin/responsewaiter.cpp --- a/plasmoid/declarativeplugin/responsewaiter.cpp +++ b/plasmoid/declarativeplugin/responsewaiter.cpp @@ -117,7 +117,7 @@ const QDBusPendingCall* DBusResponseWaiter::extractPendingCall(QVariant& variant) const { - Q_FOREACH(int type, m_registered) + for (int type : qAsConst(m_registered)) { if (variant.canConvert(QVariant::Type(type))) { diff --git a/plugins/mpriscontrol/mpriscontrolplugin.cpp b/plugins/mpriscontrol/mpriscontrolplugin.cpp --- a/plugins/mpriscontrol/mpriscontrolplugin.cpp +++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp @@ -48,8 +48,8 @@ connect(QDBusConnection::sessionBus().interface(), &QDBusConnectionInterface::serviceOwnerChanged, this, &MprisControlPlugin::serviceOwnerChanged); //Add existing interfaces - QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); - Q_FOREACH (const QString& service, services) { + const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); + for (const QString& service : services) { // The string doesn't matter, it just needs to be empty/non-empty serviceOwnerChanged(service, QLatin1String(""), QStringLiteral("1")); } diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp --- a/plugins/notifications/notificationsdbusinterface.cpp +++ b/plugins/notifications/notificationsdbusinterface.cpp @@ -65,7 +65,7 @@ id = id.mid(id.indexOf(QLatin1String("::")) + 2); removeNotification(id); } else if (np.get(QStringLiteral("isRequest"))) { - Q_FOREACH (const auto& n, mNotifications) { + for (const auto& n : qAsConst(mNotifications)) { NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST, { {"id", n->internalId()}, {"appName", n->appName()}, diff --git a/plugins/pausemusic/pausemusicplugin.cpp b/plugins/pausemusic/pausemusicplugin.cpp --- a/plugins/pausemusic/pausemusicplugin.cpp +++ b/plugins/pausemusic/pausemusicplugin.cpp @@ -90,8 +90,8 @@ if (pause) { //Search for interfaces currently playing - QStringList interfaces = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); - Q_FOREACH (const QString& iface, interfaces) { + const QStringList interfaces = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); + for (const QString& iface : interfaces) { if (iface.startsWith(QLatin1String("org.mpris.MediaPlayer2"))) { QDBusInterface mprisInterface(iface, QStringLiteral("/org/mpris/MediaPlayer2"), QStringLiteral("org.mpris.MediaPlayer2.Player")); QString status = mprisInterface.property("PlaybackStatus").toString(); @@ -120,7 +120,7 @@ } if (pause && !pausedSources.empty()) { - Q_FOREACH (const QString& iface, pausedSources) { + for (const QString& iface : qAsConst(pausedSources)) { QDBusInterface mprisInterface(iface, QStringLiteral("/org/mpris/MediaPlayer2"), QStringLiteral("org.mpris.MediaPlayer2.Player")); mprisInterface.asyncCall(QStringLiteral("PlayPause")); } diff --git a/plugins/runcommand/runcommand_config.cpp b/plugins/runcommand/runcommand_config.cpp --- a/plugins/runcommand/runcommand_config.cpp +++ b/plugins/runcommand/runcommand_config.cpp @@ -70,7 +70,8 @@ QJsonDocument jsonDocument = QJsonDocument::fromJson(config()->get(QStringLiteral("commands"), "{}")); QJsonObject jsonConfig = jsonDocument.object(); - Q_FOREACH (const QString &key, jsonConfig.keys()) { + const QStringList keys = jsonConfig.keys(); + for (const QString& key : keys) { const QJsonObject entry = jsonConfig[key].toObject(); const QString name = entry[QStringLiteral("name")].toString(); const QString command = entry[QStringLiteral("command")].toString(); diff --git a/plugins/sendnotifications/notificationslistener.cpp b/plugins/sendnotifications/notificationslistener.cpp --- a/plugins/sendnotifications/notificationslistener.cpp +++ b/plugins/sendnotifications/notificationslistener.cpp @@ -97,8 +97,8 @@ void NotificationsListener::loadApplications() { applications.clear(); - QVariantList list = mPlugin->config()->getList(QStringLiteral("applications")); - Q_FOREACH (const auto& a, list) { + const QVariantList list = mPlugin->config()->getList(QStringLiteral("applications")); + for (const auto& a : list) { NotifyingApplication app = a.value(); if (!applications.contains(app.name)) applications.insert(app.name, app); @@ -204,7 +204,7 @@ applications.insert(app.name, app); // update config: QVariantList list; - Q_FOREACH (const auto& a, applications) + for (const auto& a : qAsConst(applications)) list << QVariant::fromValue(a); mPlugin->config()->setList(QStringLiteral("applications"), list); //qCDebug(KDECONNECT_PLUGIN_SENDNOTIFICATION) << "Added new application to config:" << app; diff --git a/tests/pluginloadtest.cpp b/tests/pluginloadtest.cpp --- a/tests/pluginloadtest.cpp +++ b/tests/pluginloadtest.cpp @@ -48,7 +48,8 @@ void testPlugins() { Device* d = nullptr; mDaemon->acquireDiscoveryMode(QStringLiteral("plugintest")); - Q_FOREACH(Device* id, mDaemon->devicesList()) { + const QList devicesList = mDaemon->devicesList(); + for (Device* id : devicesList) { if (id->isReachable()) { if (!id->isTrusted()) id->requestPair(); diff --git a/tests/sendfiletest.cpp b/tests/sendfiletest.cpp --- a/tests/sendfiletest.cpp +++ b/tests/sendfiletest.cpp @@ -52,7 +52,8 @@ void testSend() { mDaemon->acquireDiscoveryMode(QStringLiteral("test")); Device* d = nullptr; - Q_FOREACH(Device* id, mDaemon->devicesList()) { + const QList devicesList = mDaemon->devicesList(); + for (Device* id : devicesList) { if (id->isReachable()) { if (!id->isTrusted()) id->requestPair(); diff --git a/tests/testnotificationlistener.cpp b/tests/testnotificationlistener.cpp --- a/tests/testnotificationlistener.cpp +++ b/tests/testnotificationlistener.cpp @@ -354,7 +354,8 @@ QStringList iconPaths; // appIcon int count = 0; - Q_FOREACH (const auto& iconName, KIconLoader::global()->queryIcons(-KIconLoader::SizeEnormous, KIconLoader::Application)) { + const QStringList icons = KIconLoader::global()->queryIcons(-KIconLoader::SizeEnormous, KIconLoader::Application); + for (const auto& iconName : icons) { if (!iconName.endsWith(QLatin1String(".png"))) continue; if (count++ > 3) // max 3 iterations diff --git a/tests/testsocketlinereader.cpp b/tests/testsocketlinereader.cpp --- a/tests/testsocketlinereader.cpp +++ b/tests/testsocketlinereader.cpp @@ -67,7 +67,7 @@ { QList dataToSend; dataToSend << "foobar\n" << "barfoo\n" << "foobar?\n" << "\n" << "barfoo!\n" << "panda\n"; - Q_FOREACH(const QByteArray &line, dataToSend) { + for (const QByteArray& line : dataToSend) { mConn->write(line); } mConn->flush(); diff --git a/tests/testsslsocketlinereader.cpp b/tests/testsslsocketlinereader.cpp --- a/tests/testsslsocketlinereader.cpp +++ b/tests/testsslsocketlinereader.cpp @@ -138,7 +138,7 @@ QList dataToSend; dataToSend << "foobar\n" << "barfoo\n" << "foobar?\n" << "\n" << "barfoo!\n" << "panda\n"; - Q_FOREACH(const QByteArray &line, dataToSend) { + for (const QByteArray &line : dataToSend) { mClientSocket->write(line); } mClientSocket->flush(); @@ -197,7 +197,7 @@ QList dataToSend; dataToSend << "foobar\n" << "barfoo\n" << "foobar?\n" << "\n" << "barfoo!\n" << "panda\n"; - Q_FOREACH(const QByteArray &line, dataToSend) { + for (const QByteArray &line : dataToSend) { mClientSocket->write(line); } mClientSocket->flush();