Commit d77d4cb4 authored by Jan Grulich's avatar Jan Grulich

Do not check NM version++

parent 12ebc3fd
......@@ -169,11 +169,7 @@ void NetworkStatus::changeActiveConnections()
if (!active->devices().isEmpty() && UiUtils::isConnectionTypeSupported(active->type())) {
NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(active->devices().first());
#if NM_CHECK_VERSION(0, 9, 10)
if (device && device->type() != NetworkManager::Device::Generic && device->type() <= NetworkManager::Device::Team) {
#else
if (device) {
#endif
bool connecting = false;
bool connected = false;
QString conType;
......
......@@ -278,14 +278,9 @@ void ConnectionEditorBase::initialize()
if ((type == NetworkManager::ConnectionSettings::Wired
|| type == NetworkManager::ConnectionSettings::Wireless
|| type == NetworkManager::ConnectionSettings::Infiniband
#if NM_CHECK_VERSION(0, 9, 10)
|| type == NetworkManager::ConnectionSettings::Team
#endif
#if NM_CHECK_VERSION(1, 0, 0)
|| type == NetworkManager::ConnectionSettings::Cdma
|| type == NetworkManager::ConnectionSettings::Gsm
#endif
|| type == NetworkManager::ConnectionSettings::Bond
|| type == NetworkManager::ConnectionSettings::Bridge
|| type == NetworkManager::ConnectionSettings::Vlan
......
......@@ -29,9 +29,7 @@
#include <NetworkManagerQt/Manager>
#include <NetworkManagerQt/ModemDevice>
#include <NetworkManagerQt/Settings>
#if NM_CHECK_VERSION (0, 9, 10)
#include <NetworkManagerQt/TeamDevice>
#endif
#include <NetworkManagerQt/Utils>
#include <NetworkManagerQt/VlanDevice>
#include <NetworkManagerQt/VpnConnection>
......@@ -251,9 +249,7 @@ NetworkModelItem::ItemType NetworkModelItem::itemType() const
m_type == NetworkManager::ConnectionSettings::Bond ||
m_type == NetworkManager::ConnectionSettings::Bridge ||
m_type == NetworkManager::ConnectionSettings::Vlan ||
#if NM_CHECK_VERSION(0, 9, 10)
m_type == NetworkManager::ConnectionSettings::Team ||
#endif
((NetworkManager::status() == NetworkManager::Connected ||
NetworkManager::status() == NetworkManager::ConnectedLinkLocal ||
NetworkManager::status() == NetworkManager::ConnectedSiteOnly) && m_type == NetworkManager::ConnectionSettings::Vpn)) {
......@@ -585,7 +581,6 @@ void NetworkModelItem::updateDetails() const
} else if (m_type == NetworkManager::ConnectionSettings::Adsl) {
m_details << i18n("Type") << i18n("Adsl");
}
#if NM_CHECK_VERSION (0, 9, 10)
else if (m_type == NetworkManager::ConnectionSettings::Team) {
NetworkManager::TeamDevice::Ptr teamDevice = device.objectCast<NetworkManager::TeamDevice>();
m_details << i18n("Type") << i18n("Team");
......@@ -593,5 +588,4 @@ void NetworkModelItem::updateDetails() const
m_details << i18n("MAC Address") << teamDevice->hwAddress();
}
}
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment