Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2018-04-19 15:19:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Thu Apr 19 15:19:28 2018 rev:49 rq:596910 version:5.45.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2018-03-20 21:48:36.543069759 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2018-04-19 15:19:30.535316387 +0200
@@ -1,0 +2,15 @@
+Sat Apr 14 13:19:07 CEST 2018 - [email protected]
+
+- Update to 5.45.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.45.0.php
+- Changes since 5.44.0:
+ * Export the NetworkManager include dirs.
+ * Start requiring NM 1.0.0
+ * We depend against 5.8.0
+ * We use qt5.8.0
+ * device: define StateChangeReason and MeteredStatus as Q_ENUMs
+ * Fix conversion of AccessPoint flags to capabilities
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.44.0.tar.xz
New:
----
networkmanager-qt-5.45.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.gnoVjq/_old 2018-04-19 15:19:31.199289783 +0200
+++ /var/tmp/diff_new_pack.gnoVjq/_new 2018-04-19 15:19:31.203289623 +0200
@@ -17,13 +17,13 @@
%define soversion 6
-%define _tar_path 5.44
+%define _tar_path 5.45
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: libKF5NetworkManagerQt
-Version: 5.44.0
+Version: 5.45.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ networkmanager-qt-5.44.0.tar.xz -> networkmanager-qt-5.45.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/CMakeLists.txt
new/networkmanager-qt-5.45.0/CMakeLists.txt
--- old/networkmanager-qt-5.44.0/CMakeLists.txt 2018-03-03 10:54:02.000000000
+0100
+++ new/networkmanager-qt-5.45.0/CMakeLists.txt 2018-04-07 09:48:55.000000000
+0200
@@ -1,23 +1,23 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.44.0") # handled by release scripts
+set(KF5_VERSION "5.45.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.44.0 NO_MODULE)
+find_package(ECM 5.45.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake
${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-find_package(NetworkManager 0.9.10.0 REQUIRED)
+find_package(NetworkManager 1.0.0 REQUIRED)
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.7.0)
+set(REQUIRED_QT_VERSION 5.8.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Network)
add_definitions(${QT_DEFINITIONS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/autotests/CMakeLists.txt
new/networkmanager-qt-5.45.0/autotests/CMakeLists.txt
--- old/networkmanager-qt-5.44.0/autotests/CMakeLists.txt 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/CMakeLists.txt 2018-04-07
09:48:55.000000000 +0200
@@ -1,15 +1,5 @@
-if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.0.0 OR ${NETWORKMANAGER_VERSION}
VERSION_GREATER 1.0.0)
-include_directories(
- ${NM-CORE_INCLUDE_DIRS}
-)
-else()
-include_directories(
- ${NETWORKMANAGER_INCLUDE_DIRS}
- ${NM-GLIB_INCLUDE_DIRS}
-)
-endif()
-
include_directories (
+ ${NETWORKMANAGER_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/src/settings
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/8021xsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/8021xsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/8021xsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/8021xsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/security8021xsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-8021x.h>
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/adslsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/adslsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/adslsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/adslsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/adslsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-adsl.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/bluetoothsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/bluetoothsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/bluetoothsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/bluetoothsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/bluetoothsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-bluetooth.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/bondsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/bondsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/bondsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/bondsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/bondsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-bond.h>
-#endif
#include <QTest>
@@ -51,11 +46,7 @@
QVariantMap map;
-#if NM_CHECK_VERSION(1, 0, 0)
map.insert(QLatin1String("interface-name"), interfaceName);
-#else
- map.insert(QLatin1String(NM_SETTING_BOND_INTERFACE_NAME), interfaceName);
-#endif
map.insert(QLatin1String(NM_SETTING_BOND_OPTIONS),
QVariant::fromValue<NMStringMap>(options));
NetworkManager::BondSetting setting;
@@ -63,11 +54,7 @@
QVariantMap map1 = setting.toMap();
-#if NM_CHECK_VERSION(1, 0, 0)
QCOMPARE(map.value(QLatin1String("interface-name")),
map1.value(QLatin1String("interface-name")));
-#else
- QCOMPARE(map.value(QLatin1String(NM_SETTING_BOND_INTERFACE_NAME)),
map1.value(QLatin1String(NM_SETTING_BOND_INTERFACE_NAME)));
-#endif
NMStringMap stringMap1 =
map.value(QLatin1String(NM_SETTING_BOND_OPTIONS)).value<NMStringMap>();
NMStringMap stringMap2 =
map1.value(QLatin1String(NM_SETTING_BOND_OPTIONS)).value<NMStringMap>();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/bridgeportsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/bridgeportsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/bridgeportsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/bridgeportsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -23,12 +23,8 @@
#include "settings/bridgeportsetting.h"
#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
-#include <libnm/NetworkManager.h>
+
#define NM_SETTING_BRIDGE_MAC_ADDRESS "mac-address"
-#else
-#include <nm-setting-bridge-port.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/bridgesettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/bridgesettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/bridgesettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/bridgesettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/bridgesetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-bridge.h>
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
@@ -73,11 +68,7 @@
QVariantMap map;
-#if NM_CHECK_VERSION(1, 0, 0)
map.insert(QLatin1String("interface-name"), interfaceName);
-#else
- map.insert(QLatin1String(NM_SETTING_BRIDGE_INTERFACE_NAME), interfaceName);
-#endif
map.insert(QLatin1String(NM_SETTING_BRIDGE_STP), stp);
map.insert(QLatin1String(NM_SETTING_BRIDGE_PRIORITY), priority);
map.insert(QLatin1String(NM_SETTING_BRIDGE_FORWARD_DELAY), forwardDelay);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/cdmasettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/cdmasettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/cdmasettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/cdmasettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/cdmasetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-cdma.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/connectionsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/connectionsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/connectionsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/connectionsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,14 +22,7 @@
#include "settings/connectionsettings.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-connection.h>
-#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY "autoconnect-priority"
-#define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES "autoconnect-slaves"
-#endif
#if !NM_CHECK_VERSION(1, 0, 6)
#define NM_SETTING_CONNECTION_METERED "metered"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/gsmsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/gsmsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/gsmsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/gsmsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/gsmsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-gsm.h>
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_GSM_DEVICE_ID "device-id"
@@ -96,13 +91,8 @@
map.insert(QLatin1String(NM_SETTING_GSM_PASSWORD_FLAGS), passwordFlags);
map.insert(QLatin1String(NM_SETTING_GSM_APN), apn);
map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), networkId);
-#if NM_CHECK_VERSION(1, 0, 0)
map.insert(QLatin1String("network-type"), networkType);
map.insert(QLatin1String("allowed-bands"), allowedBand);
-#else
- map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), networkType);
- map.insert(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS), allowedBand);
-#endif
map.insert(QLatin1String(NM_SETTING_GSM_PIN), pin);
map.insert(QLatin1String(NM_SETTING_GSM_PIN_FLAGS), pinFlags);
map.insert(QLatin1String(NM_SETTING_GSM_HOME_ONLY), homeOnly);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/infinibandsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/infinibandsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/infinibandsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/infinibandsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/infinibandsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-infiniband.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/ipv4settingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/ipv4settingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/ipv4settingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/ipv4settingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -25,12 +25,7 @@
#include <arpa/inet.h>
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-ip4-config.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/ipv6settingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/ipv6settingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/ipv6settingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/ipv6settingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -26,12 +26,7 @@
#include <arpa/inet.h>
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-ip6-config.h>
-#endif
#include <QHostAddress>
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/olpcmeshsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/olpcmeshsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/olpcmeshsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/olpcmeshsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/olpcmeshsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-olpc-mesh.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/pppoesettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/pppoesettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/pppoesettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/pppoesettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/pppoesetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-pppoe.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/pppsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/pppsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/pppsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/pppsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/pppsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-ppp.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/serialsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/serialsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/serialsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/serialsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/serialsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-serial.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/tunsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/tunsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/tunsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/tunsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/tunsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-tun.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/vlansettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/vlansettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/vlansettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/vlansettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/vlansetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-vlan.h>
-#endif
#include <QTest>
@@ -64,11 +59,7 @@
QVariantMap map;
-#if NM_CHECK_VERSION(1, 0, 0)
map.insert(QLatin1String("interface-name"), interfaceName);
-#else
- map.insert(QLatin1String(NM_SETTING_VLAN_INTERFACE_NAME), interfaceName);
-#endif
map.insert(QLatin1String(NM_SETTING_VLAN_PARENT), parent);
map.insert(QLatin1String(NM_SETTING_VLAN_ID), id);
map.insert(QLatin1String(NM_SETTING_VLAN_FLAGS), flags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/vpnsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/vpnsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/vpnsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/vpnsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/vpnsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-vpn.h>
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_VPN_PERSISTENT "persistent"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/wimaxsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/wimaxsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/wimaxsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/wimaxsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/wimaxsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-wimax.h>
-#endif
#include <QTest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/wiredsettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/wiredsettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/wiredsettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/wiredsettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -23,12 +23,7 @@
#include "generictypes.h"
#include "settings/wiredsetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-wired.h>
-#endif
#if !NM_CHECK_VERSION(1, 0, 6)
#define NM_SETTING_WIRED_WAKE_ON_LAN "wake-on-lan"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/wirelesssecuritysettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/wirelesssecuritysettingtest.cpp
---
old/networkmanager-qt-5.44.0/autotests/settings/wirelesssecuritysettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++
new/networkmanager-qt-5.45.0/autotests/settings/wirelesssecuritysettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -20,12 +20,7 @@
#include "wirelesssecuritysettingtest.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-wireless-security.h>
-#endif
#include "settings/wirelesssecuritysetting.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/autotests/settings/wirelesssettingtest.cpp
new/networkmanager-qt-5.45.0/autotests/settings/wirelesssettingtest.cpp
--- old/networkmanager-qt-5.44.0/autotests/settings/wirelesssettingtest.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/autotests/settings/wirelesssettingtest.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -22,12 +22,7 @@
#include "settings/wirelesssetting.h"
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-wireless.h>
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION
"mac-address-randomization"
@@ -124,11 +119,8 @@
map.insert(QLatin1String(NM_SETTING_WIRELESS_MTU), mtu);
map.insert(QLatin1String(NM_SETTING_WIRELESS_SEEN_BSSIDS), seenBssids);
map.insert(QLatin1String(NM_SETTING_WIRELESS_POWERSAVE), powerSave);
-#if NM_CHECK_VERSION(1, 0, 0)
map.insert(QLatin1String("security"), security);
-#else
- map.insert(QLatin1String(NM_SETTING_WIRELESS_SEC), security);
-#endif
+
map.insert(QLatin1String(NM_SETTING_WIRELESS_HIDDEN), hidden);
NetworkManager::WirelessSetting setting;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/cmake/FindNetworkManager.cmake
new/networkmanager-qt-5.45.0/cmake/FindNetworkManager.cmake
--- old/networkmanager-qt-5.44.0/cmake/FindNetworkManager.cmake 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/cmake/FindNetworkManager.cmake 2018-04-07
09:48:55.000000000 +0200
@@ -9,48 +9,49 @@
# Copyright (c) 2006, Alexander Neundorf, <[email protected]>
# Copyright (c) 2007, Will Stephenson, <[email protected]>
-# Copyright (c) 2015, Jan Grulich, <[email protected]>
+# Copyright (c) 2015-2018, Jan Grulich, <[email protected]>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
-IF (NETWORKMANAGER_INCLUDE_DIRS AND (NM-UTIL_INCLUDE_DIRS OR
NM-CORE_INCLUDE_DIRS))
+IF (NETWORKMANAGER_INCLUDE_DIRS)
# in cache already
SET(NetworkManager_FIND_QUIETLY TRUE)
-ENDIF (NETWORKMANAGER_INCLUDE_DIRS AND (NM-UTIL_INCLUDE_DIRS OR
NM-CORE_INCLUDE_DIRS))
+ENDIF (NETWORKMANAGER_INCLUDE_DIRS)
IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager )
-
+ PKG_SEARCH_MODULE(NETWORKMANAGER libnm)
IF (NETWORKMANAGER_FOUND)
IF (NetworkManager_FIND_VERSION AND ("${NETWORKMANAGER_VERSION}"
VERSION_LESS "${NetworkManager_FIND_VERSION}"))
MESSAGE(FATAL_ERROR "NetworkManager ${NETWORKMANAGER_VERSION} is
too old, need at least ${NetworkManager_FIND_VERSION}")
ELSE ()
- # Since NetworkManager 1.0.0 we need to find different libraries
- IF (NetworkManager_FIND_VERSION AND ("${NETWORKMANAGER_VERSION}"
VERSION_LESS "1.0.0"))
- PKG_SEARCH_MODULE( NM-UTIL libnm-util )
- PKG_SEARCH_MODULE( NM-GLIB libnm-glib )
- IF (NM-UTIL_FOUND AND NM-GLIB_FOUND)
- IF (NOT NetworkManager_FIND_QUIETLY)
- MESSAGE(STATUS "Found libnm-util:
${NM-UTIL_LIBRARY_DIRS}")
- MESSAGE(STATUS "Found libnm-glib:
${NM-GLIB_LIBRARY_DIRS}")
- ENDIF ()
- ELSE ()
- MESSAGE(FATAL_ERROR "Could NOT find libnm-util or
libnm-glib, check FindPkgConfig output above!")
- ENDIF ()
- ELSE ()
- PKG_SEARCH_MODULE( NM-CORE libnm )
- IF (NM-CORE_FOUND)
- IF (NOT NetworkManager_FIND_QUIETLY)
- MESSAGE(STATUS "Found libnm-core:
${NM-CORE_LIBRARY_DIRS}")
- ENDIF ()
- ELSE ()
- MESSAGE(FATAL_ERROR "Could NOT find libnm-core, check
FindPkgConfig output above!")
- ENDIF ()
+ IF (NOT NetworkManager_FIND_QUIETLY)
+ MESSAGE(STATUS "Found NetworkManager:
${NETWORKMANAGER_LIBRARY_DIRS}")
ENDIF ()
ENDIF ()
ELSE ()
@@ -58,5 +59,5 @@
ENDIF ()
ENDIF (NOT WIN32)
-MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS
NM-GLIB_INCLUDE_DIRS NM-CORE_INCLUDE_DIRS)
+MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/CMakeLists.txt
new/networkmanager-qt-5.45.0/src/CMakeLists.txt
--- old/networkmanager-qt-5.44.0/src/CMakeLists.txt 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/CMakeLists.txt 2018-04-07
09:48:55.000000000 +0200
@@ -1,20 +1,7 @@
# add_subdirectory(dbus)
-if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.0.0 OR ${NETWORKMANAGER_VERSION}
VERSION_GREATER 1.0.0)
-include_directories(
- ${NM-CORE_INCLUDE_DIRS}
-)
-else()
include_directories(
${NETWORKMANAGER_INCLUDE_DIRS}
-
- SYSTEM
- ${NM-UTIL_INCLUDE_DIRS}
- ${NM-GLIB_INCLUDE_DIRS}
-)
-endif()
-
-include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/dbus
${CMAKE_CURRENT_SOURCE_DIR}/settings
)
@@ -137,7 +124,7 @@
generate_export_header(KF5NetworkManagerQt EXPORT_FILE_NAME
${NetworkManagerQt_BINARY_DIR}/networkmanagerqt/networkmanagerqt_export.h
BASE_NAME NetworkManagerQt)
add_library(KF5::NetworkManagerQt ALIAS KF5NetworkManagerQt)
-target_include_directories(KF5NetworkManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/NetworkManagerQt>")
+target_include_directories(KF5NetworkManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/NetworkManagerQt;${NETWORKMANAGER_INCLUDE_DIRS}>")
# for examples to build
target_include_directories(KF5NetworkManagerQt PUBLIC
"$<BUILD_INTERFACE:${NetworkManagerQt_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/settings;${CMAKE_CURRENT_BINARY_DIR}>")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/accesspoint.cpp
new/networkmanager-qt-5.45.0/src/accesspoint.cpp
--- old/networkmanager-qt-5.44.0/src/accesspoint.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/accesspoint.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -47,11 +47,12 @@
NetworkManager::AccessPoint::Capabilities
NetworkManager::AccessPointPrivate::convertCapabilities(int caps)
{
- switch (caps) {
- case NM_802_11_AP_FLAGS_NONE: return AccessPoint::None;
- case NM_802_11_AP_FLAGS_PRIVACY: return AccessPoint::Privacy;
+ NetworkManager::AccessPoint::Capabilities capFlags;
+ if (caps & NM_802_11_AP_FLAGS_PRIVACY) {
+ capFlags |= AccessPoint::Privacy;
}
- return AccessPoint::None;
+
+ return capFlags;
}
NetworkManager::AccessPoint::WpaFlags
NetworkManager::AccessPointPrivate::convertWpaFlags(uint theirFlags)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/connection.cpp
new/networkmanager-qt-5.45.0/src/connection.cpp
--- old/networkmanager-qt-5.44.0/src/connection.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/connection.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -24,22 +24,7 @@
#include "connection_p.h"
#undef signals
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <NetworkManager.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wimax.h>
-#include <nm-setting-olpc-mesh.h>
-#endif
#define signals Q_SIGNALS
#include <QDBusConnection>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/device.cpp
new/networkmanager-qt-5.45.0/src/device.cpp
--- old/networkmanager-qt-5.44.0/src/device.cpp 2018-03-03 10:54:02.000000000
+0100
+++ new/networkmanager-qt-5.45.0/src/device.cpp 2018-04-07 09:48:55.000000000
+0200
@@ -31,12 +31,8 @@
#include <QDBusObjectPath>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
// logging category for this framework, default: log stuff >= warning
Q_LOGGING_CATEGORY(NMQT, "networkmanager-qt", QtWarningMsg)
-#else
-Q_LOGGING_CATEGORY(NMQT, "networkmanager-qt")
-#endif
namespace NetworkManager
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/device.h
new/networkmanager-qt-5.45.0/src/device.h
--- old/networkmanager-qt-5.44.0/src/device.h 2018-03-03 10:54:02.000000000
+0100
+++ new/networkmanager-qt-5.45.0/src/device.h 2018-04-07 09:48:55.000000000
+0200
@@ -120,6 +120,7 @@
NewActivation = 60, ParentChanged = 61,
ParentManagedChanged = 62,
Reserved = 65536
};
+ Q_ENUM(StateChangeReason)
enum MeteredStatus {
UnknownStatus = 0, /**< The device metered status is unknown. */
@@ -128,6 +129,7 @@
GuessYes = 3, /**< The device is metered and the value was guessed. */
GuessNo = 4 /**< The device is not metered and the value was guessed.
*/
};
+ Q_ENUM(MeteredStatus)
/**
* Possible device capabilities
@@ -584,4 +586,3 @@
}
#endif
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/fakenetwork/CMakeLists.txt
new/networkmanager-qt-5.45.0/src/fakenetwork/CMakeLists.txt
--- old/networkmanager-qt-5.44.0/src/fakenetwork/CMakeLists.txt 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/fakenetwork/CMakeLists.txt 2018-04-07
09:48:55.000000000 +0200
@@ -1,11 +1,6 @@
-if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.0.0 OR ${NETWORKMANAGER_VERSION}
VERSION_GREATER 1.0.0)
-include_directories(${NM-CORE_INCLUDE_DIRS})
-else()
-include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
-endif()
-
include_directories(
- ${CMAKE_SOURCE_DIR}/src/settings
+ ${NETWORKMANAGER_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/src/settings
)
set(fakeNetwork_SRCS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/generictypes.h
new/networkmanager-qt-5.45.0/src/generictypes.h
--- old/networkmanager-qt-5.44.0/src/generictypes.h 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/generictypes.h 2018-04-07
09:48:55.000000000 +0200
@@ -25,8 +25,6 @@
#include <networkmanagerqt/networkmanagerqt_export.h>
-#include <nm-version.h>
-
#include <QtCore/QVariantMap>
#include <QDBusArgument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/ipconfig.h
new/networkmanager-qt-5.45.0/src/ipconfig.h
--- old/networkmanager-qt-5.44.0/src/ipconfig.h 2018-03-03 10:54:02.000000000
+0100
+++ new/networkmanager-qt-5.45.0/src/ipconfig.h 2018-04-07 09:48:55.000000000
+0200
@@ -28,12 +28,7 @@
// To prevent signals in glib2 be defined by QT
#undef signals
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <NetworkManager.h>
-#endif
#define signals Q_SIGNALS
#include <QtCore/QStringList>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/manager.cpp
new/networkmanager-qt-5.45.0/src/manager.cpp
--- old/networkmanager-qt-5.44.0/src/manager.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/manager.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -27,12 +27,7 @@
#include "macros.h"
#undef signals
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <NetworkManager.h>
-#endif
#define signals Q_SIGNALS
#include "activeconnection.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/manager.h
new/networkmanager-qt-5.45.0/src/manager.h
--- old/networkmanager-qt-5.44.0/src/manager.h 2018-03-03 10:54:02.000000000
+0100
+++ new/networkmanager-qt-5.45.0/src/manager.h 2018-04-07 09:48:55.000000000
+0200
@@ -43,9 +43,7 @@
*/
namespace NetworkManager
{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_NAMESPACE
-#endif
enum Status {
Unknown, /**< the networking system is not active or unable to report its
status - proceed with caution */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/secretagent.cpp
new/networkmanager-qt-5.45.0/src/secretagent.cpp
--- old/networkmanager-qt-5.44.0/src/secretagent.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/secretagent.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -24,11 +24,9 @@
#include "nmdebug.h"
#undef signals
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
#include <NetworkManager.h>
-#endif
+
#define signals Q_SIGNALS
#include <QDBusArgument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/adslsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/adslsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/adslsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/adslsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -22,10 +22,6 @@
#include "adslsetting_p.h"
#include <manager.h>
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-adsl.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::AdslSettingPrivate::AdslSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/bluetoothsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/bluetoothsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/bluetoothsetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/bluetoothsetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "bluetoothsetting.h"
#include "bluetoothsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-bluetooth.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::BluetoothSettingPrivate::BluetoothSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/bondsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/bondsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/bondsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/bondsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,14 +21,7 @@
#include "bondsetting.h"
#include "bondsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-bond.h>
-#endif
-
-//define the deprecated&dropped values
-#if NM_CHECK_VERSION(1, 0, 0)
#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
-#endif
#include <QtCore/QDebug>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/bridgeportsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/bridgeportsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/bridgeportsetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/bridgeportsetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "bridgeportsetting.h"
#include "bridgeportsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-bridge-port.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::BridgePortSettingPrivate::BridgePortSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/bridgesetting.cpp
new/networkmanager-qt-5.45.0/src/settings/bridgesetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/bridgesetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/bridgesetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,12 +21,7 @@
#include "bridgesetting.h"
#include "bridgesetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-bridge.h>
-#define NM_SETTING_BRIDGE_MAC_ADDRESS "mac-address"
-#else
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/cdmasetting.cpp
new/networkmanager-qt-5.45.0/src/settings/cdmasetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/cdmasetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/cdmasetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "cdmasetting.h"
#include "cdmasetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-cdma.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::CdmaSettingPrivate::CdmaSettingPrivate():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/connectionsettings.cpp
new/networkmanager-qt-5.45.0/src/settings/connectionsettings.cpp
--- old/networkmanager-qt-5.44.0/src/settings/connectionsettings.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/connectionsettings.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -46,32 +46,7 @@
#include "wimaxsetting.h"
#undef signals
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <nm-setting-adsl.h>
-#include <nm-setting-bond.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-bridge.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-infiniband.h>
-#include <nm-setting-olpc-mesh.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-vlan.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wimax.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-team.h>
-#include <nm-setting-generic.h>
-#define signals Q_SIGNALS
-
-#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY "autoconnect-priority"
-#define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES "autoconnect-slaves"
-
-#endif
#if !NM_CHECK_VERSION(1, 0, 6)
#define NM_SETTING_CONNECTION_METERED "metered"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/connectionsettings.h
new/networkmanager-qt-5.45.0/src/settings/connectionsettings.h
--- old/networkmanager-qt-5.44.0/src/settings/connectionsettings.h
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/connectionsettings.h
2018-04-07 09:48:55.000000000 +0200
@@ -26,12 +26,7 @@
#include "setting.h"
#undef signals
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <NetworkManager.h>
-#endif
#define signals Q_SIGNALS
#include <QtCore/QString>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/genericsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/genericsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/genericsetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/genericsetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -23,10 +23,6 @@
#include "nmdebug.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-generic.h>
-#endif
-
NetworkManager::GenericSettingPrivate::GenericSettingPrivate()
: name(NM_SETTING_GENERIC_SETTING_NAME)
{ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/settings/gsmsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/gsmsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/gsmsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/gsmsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,15 +21,8 @@
#include "gsmsetting.h"
#include "gsmsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-gsm.h>
-#endif
-
-//define the deprecated&dropped values
-#if NM_CHECK_VERSION(1, 0, 0)
#define NM_SETTING_GSM_NETWORK_TYPE "network-type"
#define NM_SETTING_GSM_ALLOWED_BANDS "allowed-bands"
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_GSM_DEVICE_ID "device-id"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/infinibandsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/infinibandsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/infinibandsetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/infinibandsetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "infinibandsetting.h"
#include "infinibandsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-infiniband.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::InfinibandSettingPrivate::InfinibandSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/ipv4setting.cpp
new/networkmanager-qt-5.45.0/src/settings/ipv4setting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/ipv4setting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/ipv4setting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -26,16 +26,12 @@
#include <arpa/inet.h>
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-ip4-config.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::Ipv4SettingPrivate::Ipv4SettingPrivate()
: name(NMQT_SETTING_IP4_CONFIG_SETTING_NAME)
, method(NetworkManager::Ipv4Setting::Automatic)
- , routeMetric(-1)
+ , routeMetric(-1)
, ignoreAutoRoutes(false)
, ignoreAutoDns(false)
, dhcpSendHostname(true)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/settings/ipv4setting.h
new/networkmanager-qt-5.45.0/src/settings/ipv4setting.h
--- old/networkmanager-qt-5.44.0/src/settings/ipv4setting.h 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/ipv4setting.h 2018-04-07
09:48:55.000000000 +0200
@@ -28,7 +28,6 @@
#include <QtCore/QStringList>
#include <QtNetwork/QHostAddress>
-#if NM_CHECK_VERSION(1, 0, 0)
#define NMQT_SETTING_IP4_CONFIG_SETTING_NAME
NM_SETTING_IP4_CONFIG_SETTING_NAME
#define NMQT_SETTING_IP4_CONFIG_METHOD NM_SETTING_IP_CONFIG_METHOD
#define NMQT_SETTING_IP4_CONFIG_DNS NM_SETTING_IP_CONFIG_DNS
@@ -49,28 +48,7 @@
#define NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL
NM_SETTING_IP4_CONFIG_METHOD_MANUAL
#define NMQT_SETTING_IP4_CONFIG_METHOD_SHARED
NM_SETTING_IP4_CONFIG_METHOD_SHARED
#define NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED
NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-#else
-#define NMQT_SETTING_IP4_CONFIG_SETTING_NAME
NM_SETTING_IP4_CONFIG_SETTING_NAME
-#define NMQT_SETTING_IP4_CONFIG_METHOD NM_SETTING_IP4_CONFIG_METHOD
-#define NMQT_SETTING_IP4_CONFIG_DNS NM_SETTING_IP4_CONFIG_DNS
-#define NMQT_SETTING_IP4_CONFIG_DNS_SEARCH
NM_SETTING_IP4_CONFIG_DNS_SEARCH
-#define NMQT_SETTING_IP4_CONFIG_ADDRESSES
NM_SETTING_IP4_CONFIG_ADDRESSES
-#define NMQT_SETTING_IP4_CONFIG_GATEWAY
NM_SETTING_IP4_CONFIG_GATEWAY
-#define NMQT_SETTING_IP4_CONFIG_ROUTES NM_SETTING_IP4_CONFIG_ROUTES
-#define NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC
NM_SETTING_IP4_CONFIG_ROUTE_METRIC
-#define NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
-#define NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
-#define NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-#define NMQT_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
-#define NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-#define NMQT_SETTING_IP4_CONFIG_MAY_FAIL
NM_SETTING_IP4_CONFIG_MAY_FAIL
-#define NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-#define NMQT_SETTING_IP4_CONFIG_METHOD_AUTO
NM_SETTING_IP4_CONFIG_METHOD_AUTO
-#define NMQT_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
-#define NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL
NM_SETTING_IP4_CONFIG_METHOD_MANUAL
-#define NMQT_SETTING_IP4_CONFIG_METHOD_SHARED
NM_SETTING_IP4_CONFIG_METHOD_SHARED
-#define NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED
NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-#endif
+
namespace NetworkManager
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/ipv6setting.cpp
new/networkmanager-qt-5.45.0/src/settings/ipv6setting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/ipv6setting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/ipv6setting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -28,10 +28,6 @@
#include <arpa/inet.h>
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-ip6-config.h>
-#endif
-
NetworkManager::Ipv6SettingPrivate::Ipv6SettingPrivate()
: name(NMQT_SETTING_IP6_CONFIG_SETTING_NAME)
, method(NetworkManager::Ipv6Setting::Automatic)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/settings/ipv6setting.h
new/networkmanager-qt-5.45.0/src/settings/ipv6setting.h
--- old/networkmanager-qt-5.44.0/src/settings/ipv6setting.h 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/ipv6setting.h 2018-04-07
09:48:55.000000000 +0200
@@ -28,7 +28,6 @@
#include <QtCore/QStringList>
#include <QtNetwork/QHostAddress>
-#if NM_CHECK_VERSION(1, 0, 0)
#define NMQT_SETTING_IP6_CONFIG_SETTING_NAME
NM_SETTING_IP6_CONFIG_SETTING_NAME
#define NMQT_SETTING_IP6_CONFIG_METHOD NM_SETTING_IP_CONFIG_METHOD
#define NMQT_SETTING_IP6_CONFIG_DNS NM_SETTING_IP_CONFIG_DNS
@@ -51,30 +50,6 @@
#define NMQT_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
#define NMQT_SETTING_IP6_CONFIG_METHOD_MANUAL
NM_SETTING_IP6_CONFIG_METHOD_MANUAL
#define NMQT_SETTING_IP6_CONFIG_METHOD_SHARED
NM_SETTING_IP6_CONFIG_METHOD_SHARED
-#else
-#define NMQT_SETTING_IP6_CONFIG_SETTING_NAME
NM_SETTING_IP6_CONFIG_SETTING_NAME
-#define NMQT_SETTING_IP6_CONFIG_METHOD NM_SETTING_IP6_CONFIG_METHOD
-#define NMQT_SETTING_IP6_CONFIG_DNS NM_SETTING_IP6_CONFIG_DNS
-#define NMQT_SETTING_IP6_CONFIG_DNS_SEARCH
NM_SETTING_IP6_CONFIG_DNS_SEARCH
-#define NMQT_SETTING_IP6_CONFIG_ADDRESSES
NM_SETTING_IP6_CONFIG_ADDRESSES
-#define NMQT_SETTING_IP6_CONFIG_GATEWAY
NM_SETTING_IP6_CONFIG_GATEWAY
-#define NMQT_SETTING_IP6_CONFIG_ROUTES NM_SETTING_IP6_CONFIG_ROUTES
-#define NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC
NM_SETTING_IP6_CONFIG_ROUTE_METRIC
-#define NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-#define NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
-#define NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
-#define NMQT_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME
NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME
-#define NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-#define NMQT_SETTING_IP6_CONFIG_MAY_FAIL
NM_SETTING_IP6_CONFIG_MAY_FAIL
-#define NMQT_SETTING_IP6_CONFIG_DHCP_CLIENT_ID
NM_SETTING_IP6_CONFIG_DHCP_CLIENT_ID
-#define NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY
NM_SETTING_IP6_CONFIG_IP6_PRIVACY
-#define NMQT_SETTING_IP6_CONFIG_METHOD_IGNORE
NM_SETTING_IP6_CONFIG_METHOD_IGNORE
-#define NMQT_SETTING_IP6_CONFIG_METHOD_AUTO
NM_SETTING_IP6_CONFIG_METHOD_AUTO
-#define NMQT_SETTING_IP6_CONFIG_METHOD_DHCP
NM_SETTING_IP6_CONFIG_METHOD_DHCP
-#define NMQT_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
-#define NMQT_SETTING_IP6_CONFIG_METHOD_MANUAL
NM_SETTING_IP6_CONFIG_METHOD_MANUAL
-#define NMQT_SETTING_IP6_CONFIG_METHOD_SHARED
NM_SETTING_IP6_CONFIG_METHOD_SHARED
-#endif
namespace NetworkManager
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/olpcmeshsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/olpcmeshsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/olpcmeshsetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/olpcmeshsetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "olpcmeshsetting.h"
#include "olpcmeshsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-olpc-mesh.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::OlpcMeshSettingPrivate::OlpcMeshSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/pppoesetting.cpp
new/networkmanager-qt-5.45.0/src/settings/pppoesetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/pppoesetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/pppoesetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "pppoesetting.h"
#include "pppoesetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-pppoe.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::PppoeSettingPrivate::PppoeSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/settings/pppsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/pppsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/pppsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/pppsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "pppsetting.h"
#include "pppsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-ppp.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::PppSettingPrivate::PppSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/security8021xsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/security8021xsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/security8021xsetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/security8021xsetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "security8021xsetting.h"
#include "security8021xsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-8021x.h>
-#endif
-
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match"
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/serialsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/serialsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/serialsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/serialsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "serialsetting.h"
#include "serialsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-serial.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::SerialSettingPrivate::SerialSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/settings/setting.cpp
new/networkmanager-qt-5.45.0/src/settings/setting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/setting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/setting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -22,32 +22,7 @@
#undef signals
#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <NetworkManager.h>
-#include <nm-setting-bond.h>
-#include <nm-setting-bridge.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-8021x.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-olpc-mesh.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-serial.h>
-#include <nm-setting-team.h>
-#include <nm-setting-generic.h>
-#include <nm-setting-vlan.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-wimax.h>
-#endif
#define signals Q_SIGNALS
#include <QtCore/QDebug>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/settings/setting.h
new/networkmanager-qt-5.45.0/src/settings/setting.h
--- old/networkmanager-qt-5.44.0/src/settings/setting.h 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/setting.h 2018-04-07
09:48:55.000000000 +0200
@@ -26,10 +26,7 @@
#include "generictypes.h"
#undef signals
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#endif
#define signals Q_SIGNALS
#include <QtCore/QVariantMap>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/teamsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/teamsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/teamsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/teamsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -22,14 +22,7 @@
#include "teamsetting_p.h"
#include "manager.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-team.h>
-#endif
-
-//define the deprecated&dropped values
-#if NM_CHECK_VERSION(1, 0, 0)
#define NM_SETTING_TEAM_INTERFACE_NAME "interface-name"
-#endif
#include <QtCore/QDebug>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/vlansetting.cpp
new/networkmanager-qt-5.45.0/src/settings/vlansetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/vlansetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/vlansetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -21,14 +21,8 @@
#include "vlansetting.h"
#include "vlansetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-vlan.h>
-#endif
-
//define the deprecated&dropped values
-#if NM_CHECK_VERSION(1, 0, 0)
#define NM_SETTING_VLAN_INTERFACE_NAME "interface-name"
-#endif
#include <QtCore/QDebug>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/settings/vpnsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/vpnsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/vpnsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/vpnsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -22,10 +22,6 @@
#include "vpnsetting_p.h"
#include "nmdebug.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-vpn.h>
-#endif
-
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_VPN_PERSISTENT "persistent"
#define NM_SETTING_VPN_TIMEOUT "timeout"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/wimaxsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/wimaxsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/wimaxsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/wimaxsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -22,10 +22,6 @@
#include "wimaxsetting.h"
#include "wimaxsetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-wimax.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::WimaxSettingPrivate::WimaxSettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/wiredsetting.cpp
new/networkmanager-qt-5.45.0/src/settings/wiredsetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/wiredsetting.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/wiredsetting.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -22,10 +22,6 @@
#include "wiredsetting_p.h"
#include "manager.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-wired.h>
-#endif
-
#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"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/wirelesssecuritysetting.cpp
new/networkmanager-qt-5.45.0/src/settings/wirelesssecuritysetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/wirelesssecuritysetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/wirelesssecuritysetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -21,10 +21,6 @@
#include "wirelesssecuritysetting.h"
#include "wirelesssecuritysetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-wireless-security.h>
-#endif
-
#include <QtCore/QDebug>
NetworkManager::WirelessSecuritySettingPrivate::WirelessSecuritySettingPrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.44.0/src/settings/wirelesssetting.cpp
new/networkmanager-qt-5.45.0/src/settings/wirelesssetting.cpp
--- old/networkmanager-qt-5.44.0/src/settings/wirelesssetting.cpp
2018-03-03 10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/settings/wirelesssetting.cpp
2018-04-07 09:48:55.000000000 +0200
@@ -21,14 +21,8 @@
#include "wirelesssetting.h"
#include "wirelesssetting_p.h"
-#if !NM_CHECK_VERSION(1, 0, 0)
-#include <nm-setting-wireless.h>
-#endif
-
//define the deprecated&dropped values
-#if NM_CHECK_VERSION(1, 0, 0)
#define NM_SETTING_WIRELESS_SEC "security"
-#endif
#if !NM_CHECK_VERSION(1, 2, 0)
#define NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION
"mac-address-randomization"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.44.0/src/wirelessdevice.cpp
new/networkmanager-qt-5.45.0/src/wirelessdevice.cpp
--- old/networkmanager-qt-5.44.0/src/wirelessdevice.cpp 2018-03-03
10:54:02.000000000 +0100
+++ new/networkmanager-qt-5.45.0/src/wirelessdevice.cpp 2018-04-07
09:48:55.000000000 +0200
@@ -24,12 +24,7 @@
#include "wirelessdevice_p.h"
#undef signals
-#include <nm-version.h>
-#if NM_CHECK_VERSION(1, 0, 0)
#include <libnm/NetworkManager.h>
-#else
-#include <libnm-glib/nm-device-wifi.h>
-#endif
#define signals Q_SIGNALS
#include "accesspoint.h"
