diff options
author | Eric Hameleers <alien@slackware.com> | 2015-04-30 14:55:29 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-04-30 14:55:29 +0200 |
commit | 0f522477dd2e49b809ad0853775bdc814dd78ff4 (patch) | |
tree | 97633f4e2cb5d259330fff81a07e9080c5a2d2e7 /kde/patch/plasma-nm | |
parent | a1cf65b86f7655b9aa8e8e49b5465bb3d04baef2 (diff) | |
download | ktown-0f522477dd2e49b809ad0853775bdc814dd78ff4.tar.gz ktown-0f522477dd2e49b809ad0853775bdc814dd78ff4.tar.xz |
This patch became obsolete with Plasma 5.3.0.
It was required when combining Frameworks 5.9.0 with Plasma 5.2.2.
Diffstat (limited to 'kde/patch/plasma-nm')
-rw-r--r-- | kde/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/kde/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch b/kde/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch new file mode 100644 index 0000000..4c59f4c --- /dev/null +++ b/kde/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch @@ -0,0 +1,73 @@ +From: Jan Grulich <jgrulich@redhat.com> +Date: Tue, 31 Mar 2015 12:37:16 +0000 +Subject: Adapt to modemmanager-qt API changes +X-Git-Url: http://quickgit.kde.org/?p=plasma-nm.git&a=commitdiff&h=4d72cb7966edda33bc72c77fc2a126844fc1f134 +--- +Adapt to modemmanager-qt API changes +--- + + +--- a/libs/models/networkmodel.cpp ++++ b/libs/models/networkmodel.cpp +@@ -246,10 +246,10 @@ + if (modem->hasInterface(ModemManager::ModemDevice::ModemInterface)) { + ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>(); + if (modemNetwork) { +- connect(modemNetwork.data(), SIGNAL(signalQualityChanged(uint)), +- SLOT(gsmNetworkSignalQualityChanged(uint)), Qt::UniqueConnection); +- connect(modemNetwork.data(), SIGNAL(accessTechnologyChanged(ModemManager::Modem::AccessTechnologies)), +- SLOT(gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies)), Qt::UniqueConnection); ++ connect(modemNetwork.data(), SIGNAL(signalQualityChanged(ModemManager::SignalQualityPair)), ++ SLOT(gsmNetworkSignalQualityChanged(ModemManager::SignalQualityPair)), Qt::UniqueConnection); ++ connect(modemNetwork.data(), SIGNAL(accessTechnologiesChanged(QFlags<MMModemAccessTechnology>)), ++ SLOT(gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology>)), Qt::UniqueConnection); + connect(modemNetwork.data(), SIGNAL(currentModesChanged()), + SLOT(gsmNetworkCurrentModesChanged()), Qt::UniqueConnection); + } +@@ -847,9 +847,9 @@ + } + + #if WITH_MODEMMANAGER_SUPPORT +-void NetworkModel::gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology) +-{ +- Q_UNUSED(technology); ++void NetworkModel::gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies) ++{ ++ Q_UNUSED(accessTechnologies); + ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender()); + if (gsmNetwork) { + Q_FOREACH (const NetworkManager::Device::Ptr & dev, NetworkManager::networkInterfaces()) { +@@ -893,7 +893,7 @@ + } + } + +-void NetworkModel::gsmNetworkSignalQualityChanged(uint signal) ++void NetworkModel::gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality) + { + ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender()); + if (gsmNetwork) { +@@ -905,7 +905,7 @@ + ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>(); + if (modemNetwork && modemNetwork->device() == gsmNetwork->device()) { + Q_FOREACH (NetworkModelItem * item, m_list.returnItems(NetworkItemsList::Device, dev->uni())) { +- item->setSignal(signal); ++ item->setSignal(signalQuality.signal); + updateItem(item); + } + } + +--- a/libs/models/networkmodel.h ++++ b/libs/models/networkmodel.h +@@ -94,9 +94,9 @@ + void deviceRemoved(const QString& device); + void deviceStateChanged(NetworkManager::Device::State state, NetworkManager::Device::State oldState, NetworkManager::Device::StateChangeReason reason); + #if WITH_MODEMMANAGER_SUPPORT +- void gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology); ++ void gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies); + void gsmNetworkCurrentModesChanged(); +- void gsmNetworkSignalQualityChanged(uint signal); ++ void gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality); + #endif + void ipConfigChanged(); + void ipInterfaceChanged(); + |