diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(NetworkManager 1.0.0 REQUIRED) +find_package(NetworkManager 1.4.0 REQUIRED) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) diff --git a/autotests/settings/8021xsettingtest.cpp b/autotests/settings/8021xsettingtest.cpp --- a/autotests/settings/8021xsettingtest.cpp +++ b/autotests/settings/8021xsettingtest.cpp @@ -24,10 +24,6 @@ #include -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match" -#endif - #include void Security8021xSettingTest::testSetting_data() diff --git a/autotests/settings/bridgesettingtest.cpp b/autotests/settings/bridgesettingtest.cpp --- a/autotests/settings/bridgesettingtest.cpp +++ b/autotests/settings/bridgesettingtest.cpp @@ -24,10 +24,6 @@ #include -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping" -#endif - #include void BridgeSettingTest::testSetting_data() diff --git a/autotests/settings/connectionsettingtest.cpp b/autotests/settings/connectionsettingtest.cpp --- a/autotests/settings/connectionsettingtest.cpp +++ b/autotests/settings/connectionsettingtest.cpp @@ -24,19 +24,6 @@ #include -#if !NM_CHECK_VERSION(1, 0, 6) -#define NM_SETTING_CONNECTION_METERED "metered" -#endif - -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_TUN_SETTING_NAME "tun" -#define NM_SETTING_CONNECTION_LLDP "lldp" -#endif - -#if !NM_CHECK_VERSION(1, 4, 0) -#define NM_SETTING_CONNECTION_STABLE_ID "stable-id" -#endif - #if !NM_CHECK_VERSION(1, 6, 0) #define NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES "autoconnect-retries" #endif diff --git a/autotests/settings/gsmsettingtest.cpp b/autotests/settings/gsmsettingtest.cpp --- a/autotests/settings/gsmsettingtest.cpp +++ b/autotests/settings/gsmsettingtest.cpp @@ -24,12 +24,6 @@ #include -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_GSM_DEVICE_ID "device-id" -#define NM_SETTING_GSM_SIM_ID "sim-id" -#define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id" -#endif - #include void GsmSettingTest::testSetting_data() diff --git a/autotests/settings/vpnsettingtest.cpp b/autotests/settings/vpnsettingtest.cpp --- a/autotests/settings/vpnsettingtest.cpp +++ b/autotests/settings/vpnsettingtest.cpp @@ -24,11 +24,6 @@ #include -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_VPN_PERSISTENT "persistent" -#define NM_SETTING_VPN_TIMEOUT "timeout" -#endif - #include void VpnSettingTest::testSetting_data() diff --git a/autotests/settings/wiredsettingtest.cpp b/autotests/settings/wiredsettingtest.cpp --- a/autotests/settings/wiredsettingtest.cpp +++ b/autotests/settings/wiredsettingtest.cpp @@ -25,15 +25,6 @@ #include -#if !NM_CHECK_VERSION(1, 0, 6) -#define NM_SETTING_WIRED_WAKE_ON_LAN "wake-on-lan" -#define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password" -#endif - -#if !NM_CHECK_VERSION(1, 4, 0) -#define NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK "generate-mac-address-mask" -#endif - #include void WiredSettingTest::testSetting_data() diff --git a/autotests/settings/wirelesssettingtest.cpp b/autotests/settings/wirelesssettingtest.cpp --- a/autotests/settings/wirelesssettingtest.cpp +++ b/autotests/settings/wirelesssettingtest.cpp @@ -26,16 +26,6 @@ #define NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS "assigned-mac-address" -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION "mac-address-randomization" -#define NM_SETTING_WIRELESS_POWERSAVE "powersave" -#endif - -#if !NM_CHECK_VERSION(1, 4, 0) -#define NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK "generate-mac-address-mask" -#endif - - #include void WirelessSettingTest::testSetting_data() diff --git a/src/accesspoint.cpp b/src/accesspoint.cpp --- a/src/accesspoint.cpp +++ b/src/accesspoint.cpp @@ -72,12 +72,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - QObject::connect(&d->iface, &OrgFreedesktopNetworkManagerAccessPointInterface::PropertiesChanged, d, &AccessPointPrivate::propertiesChanged); -#endif } NetworkManager::AccessPoint::~AccessPoint() diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp --- a/src/activeconnection.cpp +++ b/src/activeconnection.cpp @@ -67,12 +67,8 @@ } #ifndef NMQT_STATIC -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); -#endif #endif #ifdef NMQT_STATIC @@ -94,12 +90,8 @@ Q_D(ActiveConnection); #ifndef NMQT_STATIC -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); -#endif #endif #ifdef NMQT_STATIC diff --git a/src/adsldevice.cpp b/src/adsldevice.cpp --- a/src/adsldevice.cpp +++ b/src/adsldevice.cpp @@ -46,12 +46,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceAdslInterface::PropertiesChanged, d, &AdslDevicePrivate::propertiesChanged); -#endif } NetworkManager::AdslDevicePrivate::~AdslDevicePrivate() diff --git a/src/bluetoothdevice.cpp b/src/bluetoothdevice.cpp --- a/src/bluetoothdevice.cpp +++ b/src/bluetoothdevice.cpp @@ -45,12 +45,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->btIface, &OrgFreedesktopNetworkManagerDeviceBluetoothInterface::PropertiesChanged, d, &BluetoothDevicePrivate::propertiesChanged); -#endif } NetworkManager::BluetoothDevice::~BluetoothDevice() diff --git a/src/bonddevice.cpp b/src/bonddevice.cpp --- a/src/bonddevice.cpp +++ b/src/bonddevice.cpp @@ -48,12 +48,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceBondInterface::PropertiesChanged, d, &BondDevicePrivate::propertiesChanged); -#endif } NetworkManager::BondDevicePrivate::~BondDevicePrivate() diff --git a/src/bridgedevice.cpp b/src/bridgedevice.cpp --- a/src/bridgedevice.cpp +++ b/src/bridgedevice.cpp @@ -46,12 +46,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceBridgeInterface::PropertiesChanged, d, &BridgeDevicePrivate::propertiesChanged); -#endif } NetworkManager::BridgeDevice::~BridgeDevice() diff --git a/src/connection.cpp b/src/connection.cpp --- a/src/connection.cpp +++ b/src/connection.cpp @@ -61,12 +61,9 @@ connect(&d->iface, &OrgFreedesktopNetworkManagerSettingsConnectionInterface::Updated, d, &ConnectionPrivate::onConnectionUpdated); connect(&d->iface, &OrgFreedesktopNetworkManagerSettingsConnectionInterface::Removed, d, &ConnectionPrivate::onConnectionRemoved); d->unsaved = d->iface.unsaved(); -#if NM_CHECK_VERSION(1, 4, 0) + QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerSettingsConnectionInterface::PropertiesChanged, d, &ConnectionPrivate::onPropertiesChanged); -#endif } NetworkManager::Connection::~Connection() diff --git a/src/devicestatistics.cpp b/src/devicestatistics.cpp --- a/src/devicestatistics.cpp +++ b/src/devicestatistics.cpp @@ -48,12 +48,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - QObject::connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceStatisticsInterface::PropertiesChanged, d, &DeviceStatisticsPrivate::propertiesChanged); -#endif } NetworkManager::DeviceStatistics::~DeviceStatistics() diff --git a/src/dhcp4config.cpp b/src/dhcp4config.cpp --- a/src/dhcp4config.cpp +++ b/src/dhcp4config.cpp @@ -44,12 +44,9 @@ { Q_D(Dhcp4Config); Q_UNUSED(owner); -#if NM_CHECK_VERSION(1, 4, 0) + QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->myPath, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->dhcp4Iface, &OrgFreedesktopNetworkManagerDHCP4ConfigInterface::PropertiesChanged, d, &Dhcp4ConfigPrivate::dhcp4PropertiesChanged); -#endif d->options = d->dhcp4Iface.options(); } diff --git a/src/dhcp6config.cpp b/src/dhcp6config.cpp --- a/src/dhcp6config.cpp +++ b/src/dhcp6config.cpp @@ -43,12 +43,10 @@ { Q_D(Dhcp6Config); Q_UNUSED(owner); -#if NM_CHECK_VERSION(1, 4, 0) + QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->dhcp6Iface, &OrgFreedesktopNetworkManagerDHCP6ConfigInterface::PropertiesChanged, d, &Dhcp6ConfigPrivate::dhcp6PropertiesChanged); -#endif + d->options = d->dhcp6Iface.options(); } diff --git a/src/genericdevice.cpp b/src/genericdevice.cpp --- a/src/genericdevice.cpp +++ b/src/genericdevice.cpp @@ -46,12 +46,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceGenericInterface::PropertiesChanged, d, &GenericDevicePrivate::propertiesChanged); -#endif } NetworkManager::GenericDevice::~GenericDevice() diff --git a/src/gredevice.cpp b/src/gredevice.cpp --- a/src/gredevice.cpp +++ b/src/gredevice.cpp @@ -47,12 +47,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - QObject::connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceGreInterface::PropertiesChanged, d, &GreDevicePrivate::propertiesChanged); -#endif } NetworkManager::GreDevice::~GreDevice() diff --git a/src/infinibanddevice.cpp b/src/infinibanddevice.cpp --- a/src/infinibanddevice.cpp +++ b/src/infinibanddevice.cpp @@ -48,12 +48,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceInfinibandInterface::PropertiesChanged, d, &InfinibandDevicePrivate::propertiesChanged); -#endif } NetworkManager::InfinibandDevicePrivate::~InfinibandDevicePrivate() diff --git a/src/iptunneldevice.cpp b/src/iptunneldevice.cpp --- a/src/iptunneldevice.cpp +++ b/src/iptunneldevice.cpp @@ -46,12 +46,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - QObject::connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceIPTunnelInterface::PropertiesChanged, d, &IpTunnelDevicePrivate::propertiesChanged); -#endif } NetworkManager::IpTunnelDevice::~IpTunnelDevice() diff --git a/src/macvlandevice.cpp b/src/macvlandevice.cpp --- a/src/macvlandevice.cpp +++ b/src/macvlandevice.cpp @@ -46,12 +46,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceMacvlanInterface::PropertiesChanged, d, &MacVlanDevicePrivate::propertiesChanged); -#endif } NetworkManager::MacVlanDevice::~MacVlanDevice() diff --git a/src/manager.cpp b/src/manager.cpp --- a/src/manager.cpp +++ b/src/manager.cpp @@ -96,13 +96,8 @@ #ifndef NMQT_STATIC -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, NetworkManagerPrivate::DBUS_DAEMON_PATH, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), this, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&iface, &OrgFreedesktopNetworkManagerInterface::PropertiesChanged, - this, &NetworkManagerPrivate::propertiesChanged); -#endif #endif #ifdef NMQT_STATIC diff --git a/src/modemdevice.cpp b/src/modemdevice.cpp --- a/src/modemdevice.cpp +++ b/src/modemdevice.cpp @@ -53,25 +53,17 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - QObject::connect(&d->modemIface, &OrgFreedesktopNetworkManagerDeviceModemInterface::PropertiesChanged, d, &ModemDevicePrivate::propertiesChanged); -#endif } NetworkManager::ModemDevice::ModemDevice(NetworkManager::ModemDevicePrivate &dd, QObject *parent) : Device(dd, parent) { Q_D(ModemDevice); -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - QObject::connect(&d->modemIface, &OrgFreedesktopNetworkManagerDeviceModemInterface::PropertiesChanged, d, &ModemDevicePrivate::propertiesChanged); -#endif } NetworkManager::ModemDevice::~ModemDevice() diff --git a/src/olpcmeshdevice.cpp b/src/olpcmeshdevice.cpp --- a/src/olpcmeshdevice.cpp +++ b/src/olpcmeshdevice.cpp @@ -45,12 +45,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - QObject::connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceOlpcMeshInterface::PropertiesChanged, d, &OlpcMeshDevicePrivate::propertiesChanged); -#endif } NetworkManager::OlpcMeshDevice::~OlpcMeshDevice() diff --git a/src/settings.cpp b/src/settings.cpp --- a/src/settings.cpp +++ b/src/settings.cpp @@ -42,13 +42,8 @@ #endif , m_canModify(true) { -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, NetworkManagerPrivate::DBUS_SETTINGS_PATH, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), this, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&iface, &OrgFreedesktopNetworkManagerSettingsInterface::PropertiesChanged, - this, &SettingsPrivate::propertiesChanged); -#endif connect(&iface, &OrgFreedesktopNetworkManagerSettingsInterface::NewConnection, this, &SettingsPrivate::onConnectionAdded); connect(&iface, &OrgFreedesktopNetworkManagerSettingsInterface::ConnectionRemoved, diff --git a/src/settings/bridgesetting.cpp b/src/settings/bridgesetting.cpp --- a/src/settings/bridgesetting.cpp +++ b/src/settings/bridgesetting.cpp @@ -23,10 +23,6 @@ #define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name" -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping" -#endif - #include NetworkManager::BridgeSettingPrivate::BridgeSettingPrivate() diff --git a/src/settings/connectionsettings.cpp b/src/settings/connectionsettings.cpp --- a/src/settings/connectionsettings.cpp +++ b/src/settings/connectionsettings.cpp @@ -48,19 +48,6 @@ #undef signals #include -#if !NM_CHECK_VERSION(1, 0, 6) -#define NM_SETTING_CONNECTION_METERED "metered" -#endif - -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_TUN_SETTING_NAME "tun" -#define NM_SETTING_CONNECTION_LLDP "lldp" -#endif - -#if !NM_CHECK_VERSION(1, 4, 0) -#define NM_SETTING_CONNECTION_STABLE_ID "stable-id" -#endif - #if !NM_CHECK_VERSION(1, 6, 0) #define NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES "autoconnect-retries" #endif diff --git a/src/settings/gsmsetting.cpp b/src/settings/gsmsetting.cpp --- a/src/settings/gsmsetting.cpp +++ b/src/settings/gsmsetting.cpp @@ -24,12 +24,6 @@ #define NM_SETTING_GSM_NETWORK_TYPE "network-type" #define NM_SETTING_GSM_ALLOWED_BANDS "allowed-bands" -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_GSM_DEVICE_ID "device-id" -#define NM_SETTING_GSM_SIM_ID "sim-id" -#define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id" -#endif - #include NetworkManager::GsmSettingPrivate::GsmSettingPrivate() diff --git a/src/settings/security8021xsetting.cpp b/src/settings/security8021xsetting.cpp --- a/src/settings/security8021xsetting.cpp +++ b/src/settings/security8021xsetting.cpp @@ -21,10 +21,6 @@ #include "security8021xsetting.h" #include "security8021xsetting_p.h" -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match" -#endif - #include NetworkManager::Security8021xSettingPrivate::Security8021xSettingPrivate() diff --git a/src/settings/tunsetting.cpp b/src/settings/tunsetting.cpp --- a/src/settings/tunsetting.cpp +++ b/src/settings/tunsetting.cpp @@ -21,17 +21,6 @@ #include "tunsetting.h" #include "tunsetting_p.h" -#if !NM_CHECK_VERSION(1, 1, 92) -#define NM_SETTING_TUN_SETTING_NAME "tun" - -#define NM_SETTING_TUN_MODE "mode" -#define NM_SETTING_TUN_OWNER "owner" -#define NM_SETTING_TUN_GROUP "group" -#define NM_SETTING_TUN_PI "pi" -#define NM_SETTING_TUN_VNET_HDR "vnet-hdr" -#define NM_SETTING_TUN_MULTI_QUEUE "multi-queue" -#endif - #include NetworkManager::TunSettingPrivate::TunSettingPrivate() diff --git a/src/settings/vpnsetting.cpp b/src/settings/vpnsetting.cpp --- a/src/settings/vpnsetting.cpp +++ b/src/settings/vpnsetting.cpp @@ -22,11 +22,6 @@ #include "vpnsetting_p.h" #include "nmdebug.h" -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_VPN_PERSISTENT "persistent" -#define NM_SETTING_VPN_TIMEOUT "timeout" -#endif - NetworkManager::VpnSettingPrivate::VpnSettingPrivate() : name(NM_SETTING_VPN_SETTING_NAME) , persistent(false) diff --git a/src/settings/wiredsetting.cpp b/src/settings/wiredsetting.cpp --- a/src/settings/wiredsetting.cpp +++ b/src/settings/wiredsetting.cpp @@ -22,15 +22,6 @@ #include "wiredsetting_p.h" #include "manager.h" -#if !NM_CHECK_VERSION(1, 0, 6) -#define NM_SETTING_WIRED_WAKE_ON_LAN "wake-on-lan" -#define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password" -#endif - -#if !NM_CHECK_VERSION(1, 4, 0) -#define NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK "generate-mac-address-mask" -#endif - #include NetworkManager::WiredSettingPrivate::WiredSettingPrivate() diff --git a/src/settings/wirelesssetting.cpp b/src/settings/wirelesssetting.cpp --- a/src/settings/wirelesssetting.cpp +++ b/src/settings/wirelesssetting.cpp @@ -27,15 +27,6 @@ #define NM_SETTING_WIRELESS_SEC "security" #define NM_SETTING_WIRELESS_ASSIGNED_MAC_ADDRESS "assigned-mac-address" -#if !NM_CHECK_VERSION(1, 2, 0) -#define NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION "mac-address-randomization" -#define NM_SETTING_WIRELESS_POWERSAVE "powersave" -#endif - -#if !NM_CHECK_VERSION(1, 4, 0) -#define NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK "generate-mac-address-mask" -#endif - #include NetworkManager::WirelessSettingPrivate::WirelessSettingPrivate() diff --git a/src/teamdevice.cpp b/src/teamdevice.cpp --- a/src/teamdevice.cpp +++ b/src/teamdevice.cpp @@ -48,12 +48,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceTeamInterface::PropertiesChanged, d, &TeamDevicePrivate::propertiesChanged); -#endif } NetworkManager::TeamDevice::~TeamDevice() diff --git a/src/tundevice.cpp b/src/tundevice.cpp --- a/src/tundevice.cpp +++ b/src/tundevice.cpp @@ -46,12 +46,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceTunInterface::PropertiesChanged, d, &TunDevicePrivate::propertiesChanged); -#endif } NetworkManager::TunDevice::~TunDevice() diff --git a/src/vethdevice.cpp b/src/vethdevice.cpp --- a/src/vethdevice.cpp +++ b/src/vethdevice.cpp @@ -48,12 +48,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceVethInterface::PropertiesChanged, d, &VethDevicePrivate::propertiesChanged); -#endif } NetworkManager::VethDevice::~VethDevice() diff --git a/src/vlandevice.cpp b/src/vlandevice.cpp --- a/src/vlandevice.cpp +++ b/src/vlandevice.cpp @@ -47,12 +47,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceVlanInterface::PropertiesChanged, d, &VlanDevicePrivate::propertiesChanged); -#endif } NetworkManager::VlanDevicePrivate::~VlanDevicePrivate() diff --git a/src/vpnconnection.cpp b/src/vpnconnection.cpp --- a/src/vpnconnection.cpp +++ b/src/vpnconnection.cpp @@ -69,12 +69,8 @@ } } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->iface, &OrgFreedesktopNetworkManagerVPNConnectionInterface::PropertiesChanged, d, &VpnConnectionPrivate::propertiesChanged); -#endif connect(&d->iface, &OrgFreedesktopNetworkManagerVPNConnectionInterface::VpnStateChanged, d, &VpnConnectionPrivate::vpnStateChanged); } diff --git a/src/wimaxdevice.cpp b/src/wimaxdevice.cpp --- a/src/wimaxdevice.cpp +++ b/src/wimaxdevice.cpp @@ -52,12 +52,8 @@ d->propertiesChanged(initialProperties); } -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->wimaxIface, &OrgFreedesktopNetworkManagerDeviceWiMaxInterface::PropertiesChanged, d, &WimaxDevicePrivate::propertiesChanged); -#endif connect(&d->wimaxIface, &OrgFreedesktopNetworkManagerDeviceWiMaxInterface::NspAdded, d, &WimaxDevicePrivate::nspAdded); connect(&d->wimaxIface, &OrgFreedesktopNetworkManagerDeviceWiMaxInterface::NspRemoved, d, &WimaxDevicePrivate::nspRemoved); } diff --git a/src/wireddevice.cpp b/src/wireddevice.cpp --- a/src/wireddevice.cpp +++ b/src/wireddevice.cpp @@ -54,12 +54,8 @@ } #ifndef NMQT_STATIC -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->wiredIface, &OrgFreedesktopNetworkManagerDeviceWiredInterface::PropertiesChanged, d, &WiredDevicePrivate::propertiesChanged); -#endif #endif #ifdef NMQT_STATIC diff --git a/src/wirelessdevice.cpp b/src/wirelessdevice.cpp --- a/src/wirelessdevice.cpp +++ b/src/wirelessdevice.cpp @@ -64,12 +64,8 @@ } #ifndef NMQT_STATIC -#if NM_CHECK_VERSION(1, 4, 0) QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); -#else - connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::PropertiesChanged, d, &WirelessDevicePrivate::propertiesChanged); -#endif #endif #ifdef NMQT_STATIC