Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2019-10-14 13:39:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Mon Oct 14 13:39:52 2019 rev:70 rq:738066 version:5.63.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2019-09-23 12:27:12.477710598 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.2352/libKF5NetworkManagerQt.changes
2019-10-14 13:39:56.413641702 +0200
@@ -1,0 +2,11 @@
+Sun Oct 6 13:27:04 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.63.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.63.0.php
+- Changes since 5.62.0:
+ * Port away from deprecated methods in Qt 5.14
+ * ActiveConnection: connect stateChanged() signal to correct interface
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.62.0.tar.xz
networkmanager-qt-5.62.0.tar.xz.sig
New:
----
networkmanager-qt-5.63.0.tar.xz
networkmanager-qt-5.63.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.eivALC/_old 2019-10-14 13:39:57.697638355 +0200
+++ /var/tmp/diff_new_pack.eivALC/_new 2019-10-14 13:39:57.697638355 +0200
@@ -17,7 +17,7 @@
%define soversion 6
-%define _tar_path 5.62
+%define _tar_path 5.63
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: libKF5NetworkManagerQt
-Version: 5.62.0
+Version: 5.63.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
@@ -41,9 +41,9 @@
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig
-BuildRequires: cmake(Qt5Core) >= 5.6.0
-BuildRequires: cmake(Qt5DBus) >= 5.6.0
-BuildRequires: cmake(Qt5Network) >= 5.6.0
+BuildRequires: cmake(Qt5Core) >= 5.11.0
+BuildRequires: cmake(Qt5DBus) >= 5.11.0
+BuildRequires: cmake(Qt5Network) >= 5.11.0
BuildRequires: pkgconfig(libnm) >= 1.0.0
%description
@@ -56,9 +56,9 @@
Summary: A Qt wrapper for NetworkManager DBus API
Group: Development/Libraries/KDE
Requires: libKF5NetworkManagerQt%{soversion} = %{version}
-Requires: cmake(Qt5Core) >= 5.6.0
-Requires: cmake(Qt5DBus) >= 5.6.0
-Requires: cmake(Qt5Network) >= 5.6.0
+Requires: cmake(Qt5Core) >= 5.11.0
+Requires: cmake(Qt5DBus) >= 5.11.0
+Requires: cmake(Qt5Network) >= 5.11.0
Requires: pkgconfig(libnm) >= 1.0.0
%description devel
++++++ networkmanager-qt-5.62.0.tar.xz -> networkmanager-qt-5.63.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.62.0/CMakeLists.txt
new/networkmanager-qt-5.63.0/CMakeLists.txt
--- old/networkmanager-qt-5.62.0/CMakeLists.txt 2019-09-12 10:52:53.000000000
+0200
+++ new/networkmanager-qt-5.63.0/CMakeLists.txt 2019-10-06 11:38:22.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.62.0") # handled by release scripts
+set(KF5_VERSION "5.63.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.62.0 NO_MODULE)
+find_package(ECM 5.63.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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/autotests/activeconnectiontest.cpp
new/networkmanager-qt-5.63.0/autotests/activeconnectiontest.cpp
--- old/networkmanager-qt-5.62.0/autotests/activeconnectiontest.cpp
2019-09-12 10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/autotests/activeconnectiontest.cpp
2019-10-06 11:38:22.000000000 +0200
@@ -43,24 +43,24 @@
device->setAutoconnect(true);
device->setCapabilities(3);
device->setDeviceType(1);
- device->setDriver(QLatin1Literal("e1000e"));
- device->setDriverVersion(QLatin1Literal("2.3.2-k"));
+ device->setDriver(QLatin1String("e1000e"));
+ device->setDriverVersion(QLatin1String("2.3.2-k"));
device->setFirmwareMissing(false);
- device->setFirmwareVersion(QLatin1Literal("0.13-3"));
- device->setInterface(QLatin1Literal("em1"));
+ device->setFirmwareVersion(QLatin1String("0.13-3"));
+ device->setInterface(QLatin1String("em1"));
device->setManaged(true);
-
device->setUdi(QLatin1Literal("/sys/devices/pci0000:00/0000:00:19.0/net/em1"));
+
device->setUdi(QLatin1String("/sys/devices/pci0000:00/0000:00:19.0/net/em1"));
/* Wired device properties */
device->setCarrier(true);
- device->setHwAddress(QLatin1Literal("F0:DE:F1:FB:30:C1"));
- device->setPermanentHwAddress(QLatin1Literal("F0:DE:F1:FB:30:C1"));
+ device->setHwAddress(QLatin1String("F0:DE:F1:FB:30:C1"));
+ device->setPermanentHwAddress(QLatin1String("F0:DE:F1:FB:30:C1"));
fakeNetwork->addDevice(device);
NetworkManager::ConnectionSettings::Ptr connectionSettings =
NetworkManager::ConnectionSettings::Ptr(new
NetworkManager::ConnectionSettings(NetworkManager::ConnectionSettings::Wired));
connectionSettings->setId("Wired connection");
-
connectionSettings->setUuid(QLatin1Literal("39af79a5-b053-4893-9378-7342a5a30d06"));
+
connectionSettings->setUuid(QLatin1String("39af79a5-b053-4893-9378-7342a5a30d06"));
NetworkManager::Ipv4Setting::Ptr ipv4Setting =
connectionSettings->setting(NetworkManager::Setting::Ipv4).dynamicCast<NetworkManager::Ipv4Setting>();
ipv4Setting->setInitialized(true);
ipv4Setting->setMethod(NetworkManager::Ipv4Setting::Automatic);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.62.0/autotests/managertest.cpp
new/networkmanager-qt-5.63.0/autotests/managertest.cpp
--- old/networkmanager-qt-5.62.0/autotests/managertest.cpp 2019-09-12
10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/autotests/managertest.cpp 2019-10-06
11:38:22.000000000 +0200
@@ -41,18 +41,18 @@
device->setAutoconnect(true);
device->setCapabilities(3);
device->setDeviceType(1);
- device->setDriver(QLatin1Literal("e1000e"));
- device->setDriverVersion(QLatin1Literal("2.3.2-k"));
+ device->setDriver(QLatin1String("e1000e"));
+ device->setDriverVersion(QLatin1String("2.3.2-k"));
device->setFirmwareMissing(false);
- device->setFirmwareVersion(QLatin1Literal("0.13-3"));
- device->setInterface(QLatin1Literal("em1"));
+ device->setFirmwareVersion(QLatin1String("0.13-3"));
+ device->setInterface(QLatin1String("em1"));
device->setManaged(true);
-
device->setUdi(QLatin1Literal("/sys/devices/pci0000:00/0000:00:19.0/net/em1"));
+
device->setUdi(QLatin1String("/sys/devices/pci0000:00/0000:00:19.0/net/em1"));
/* Wired device properties */
device->setCarrier(true);
- device->setHwAddress(QLatin1Literal("F0:DE:F1:FB:30:C1"));
- device->setPermanentHwAddress(QLatin1Literal("F0:DE:F1:FB:30:C1"));
+ device->setHwAddress(QLatin1String("F0:DE:F1:FB:30:C1"));
+ device->setPermanentHwAddress(QLatin1String("F0:DE:F1:FB:30:C1"));
QSignalSpy addDeviceSpy(NetworkManager::notifier(),
SIGNAL(deviceAdded(QString)));
connect(NetworkManager::notifier(),
&NetworkManager::Notifier::deviceAdded, this, &ManagerTest::testDeviceAdded);
@@ -98,26 +98,26 @@
QCOMPARE(device->autoconnect(), true);
QCOMPARE(device->capabilities(), 3);
QCOMPARE(device->type(), NetworkManager::Device::Ethernet);
- QCOMPARE(device->driver(), QLatin1Literal("e1000e"));
- QCOMPARE(device->driverVersion(), QLatin1Literal("2.3.2-k"));
+ QCOMPARE(device->driver(), QLatin1String("e1000e"));
+ QCOMPARE(device->driverVersion(), QLatin1String("2.3.2-k"));
QCOMPARE(device->firmwareMissing(), false);
- QCOMPARE(device->firmwareVersion(), QLatin1Literal("0.13-3"));
- QCOMPARE(device->interfaceName(), QLatin1Literal("em1"));
+ QCOMPARE(device->firmwareVersion(), QLatin1String("0.13-3"));
+ QCOMPARE(device->interfaceName(), QLatin1String("em1"));
QCOMPARE(device->managed(), true);
- QCOMPARE(device->udi(),
QLatin1Literal("/sys/devices/pci0000:00/0000:00:19.0/net/em1"));
+ QCOMPARE(device->udi(),
QLatin1String("/sys/devices/pci0000:00/0000:00:19.0/net/em1"));
NetworkManager::WiredDevice::Ptr wiredDevice =
device.objectCast<NetworkManager::WiredDevice>();
QCOMPARE(wiredDevice->carrier(), true);
- QCOMPARE(wiredDevice->hardwareAddress(),
QLatin1Literal("F0:DE:F1:FB:30:C1"));
- QCOMPARE(wiredDevice->permanentHardwareAddress(),
QLatin1Literal("F0:DE:F1:FB:30:C1"));
+ QCOMPARE(wiredDevice->hardwareAddress(),
QLatin1String("F0:DE:F1:FB:30:C1"));
+ QCOMPARE(wiredDevice->permanentHardwareAddress(),
QLatin1String("F0:DE:F1:FB:30:C1"));
}
void ManagerTest::testManager()
{
QCOMPARE(NetworkManager::connectivity(), NetworkManager::NoConnectivity);
// QCOMPARE(NetworkManager::status(), NetworkManager::Disconnected);
- QCOMPARE(NetworkManager::version(), QLatin1Literal("0.9.10.0"));
+ QCOMPARE(NetworkManager::version(), QLatin1String("0.9.10.0"));
QSignalSpy wirelessEnabledChanged(NetworkManager::notifier(),
SIGNAL(wirelessEnabledChanged(bool)));
QCOMPARE(NetworkManager::isWirelessEnabled(), true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.62.0/autotests/settingstest.cpp
new/networkmanager-qt-5.63.0/autotests/settingstest.cpp
--- old/networkmanager-qt-5.62.0/autotests/settingstest.cpp 2019-09-12
10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/autotests/settingstest.cpp 2019-10-06
11:38:22.000000000 +0200
@@ -40,7 +40,7 @@
{
NetworkManager::ConnectionSettings::Ptr connectionSettings =
NetworkManager::ConnectionSettings::Ptr(new
NetworkManager::ConnectionSettings(NetworkManager::ConnectionSettings::Wired));
connectionSettings->setId("Wired connection");
-
connectionSettings->setUuid(QLatin1Literal("39af79a5-b053-4893-9378-7342a5a30d06"));
+
connectionSettings->setUuid(QLatin1String("39af79a5-b053-4893-9378-7342a5a30d06"));
NetworkManager::Ipv4Setting::Ptr ipv4Setting =
connectionSettings->setting(NetworkManager::Setting::Ipv4).dynamicCast<NetworkManager::Ipv4Setting>();
ipv4Setting->setInitialized(true);
ipv4Setting->setMethod(NetworkManager::Ipv4Setting::Automatic);
@@ -69,13 +69,13 @@
QCOMPARE(connection->path(), connectionRemovedSpy.at(0).at(0).toString());
// Compare hostname we set in fake network
- QCOMPARE(NetworkManager::hostname(), QLatin1Literal("fake-hostname"));
+ QCOMPARE(NetworkManager::hostname(), QLatin1String("fake-hostname"));
}
void SettingsTest::testConnectionAdded(const QString &connection)
{
NetworkManager::Connection::Ptr addedConnection =
NetworkManager::findConnection(connection);
- QCOMPARE(addedConnection->uuid(),
QLatin1Literal("39af79a5-b053-4893-9378-7342a5a30d06"));
+ QCOMPARE(addedConnection->uuid(),
QLatin1String("39af79a5-b053-4893-9378-7342a5a30d06"));
QCOMPARE(addedConnection->path(), connection);
NetworkManager::ConnectionSettings::Ptr connectionSettings =
addedConnection->settings();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/src/fakenetwork/activeconnection.cpp
new/networkmanager-qt-5.63.0/src/fakenetwork/activeconnection.cpp
--- old/networkmanager-qt-5.62.0/src/fakenetwork/activeconnection.cpp
2019-09-12 10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/fakenetwork/activeconnection.cpp
2019-10-06 11:38:22.000000000 +0200
@@ -145,9 +145,9 @@
Connection *usedConnection = static_cast<Connection
*>(QDBusConnection::sessionBus().objectRegisteredAt(connection.path()));
if (usedConnection) {
NMVariantMapMap settings = usedConnection->GetSettings();
-
setId(settings.value(QLatin1Literal("connection")).value(QLatin1Literal("id")).toString());
-
setUuid(settings.value(QLatin1Literal("connection")).value(QLatin1Literal("uuid")).toString());
-
setType(settings.value(QLatin1Literal("connection")).value(QLatin1Literal("type")).toString());
+
setId(settings.value(QLatin1String("connection")).value(QLatin1String("id")).toString());
+
setUuid(settings.value(QLatin1String("connection")).value(QLatin1String("uuid")).toString());
+
setType(settings.value(QLatin1String("connection")).value(QLatin1String("type")).toString());
}
}
@@ -205,7 +205,7 @@
{
m_type = type;
- if (type == QLatin1Literal("vpn")) {
+ if (type == QLatin1String("vpn")) {
m_vpn = true;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/src/fakenetwork/connection.cpp
new/networkmanager-qt-5.63.0/src/fakenetwork/connection.cpp
--- old/networkmanager-qt-5.62.0/src/fakenetwork/connection.cpp 2019-09-12
10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/fakenetwork/connection.cpp 2019-10-06
11:38:22.000000000 +0200
@@ -42,7 +42,7 @@
void Connection::Delete()
{
// From some reason signal Removed is not send over DBus when using only
Q_EMIT
- QDBusMessage message = QDBusMessage::createSignal(m_connectionPath,
QLatin1String("org.kde.fakenetwork.Settings.Connection"),
QLatin1Literal("Removed"));
+ QDBusMessage message = QDBusMessage::createSignal(m_connectionPath,
QLatin1String("org.kde.fakenetwork.Settings.Connection"),
QLatin1String("Removed"));
QDBusConnection::sessionBus().send(message);
// Q_EMIT Removed();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.62.0/src/fakenetwork/device.cpp
new/networkmanager-qt-5.63.0/src/fakenetwork/device.cpp
--- old/networkmanager-qt-5.62.0/src/fakenetwork/device.cpp 2019-09-12
10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/fakenetwork/device.cpp 2019-10-06
11:38:22.000000000 +0200
@@ -75,12 +75,12 @@
QString Device::deviceInterface() const
{
if (m_deviceType == NetworkManager::Device::Ethernet) {
- return QLatin1Literal("org.kde.fakenetwork.Device.Wired");
+ return QLatin1String("org.kde.fakenetwork.Device.Wired");
} else if (m_deviceType == NetworkManager::Device::Wifi) {
- return QLatin1Literal("org.kde.fakenetwork.Device.Wireless");
+ return QLatin1String("org.kde.fakenetwork.Device.Wireless");
}
- return QLatin1Literal("org.kde.fakenetwork.Device.Wired");
+ return QLatin1String("org.kde.fakenetwork.Device.Wired");
}
QString Device::devicePath() const
@@ -274,7 +274,7 @@
m_state = state;
m_stateReason.state = state;
- QDBusMessage message = QDBusMessage::createSignal(m_devicePath,
QLatin1Literal("org.kde.fakenetwork.Device"), QLatin1Literal("StateChanged"));
+ QDBusMessage message = QDBusMessage::createSignal(m_devicePath,
QLatin1String("org.kde.fakenetwork.Device"), QLatin1String("StateChanged"));
message << previousState << state << m_stateReason.reason;
QDBusConnection::sessionBus().send(message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/src/fakenetwork/fakenetwork.cpp
new/networkmanager-qt-5.63.0/src/fakenetwork/fakenetwork.cpp
--- old/networkmanager-qt-5.62.0/src/fakenetwork/fakenetwork.cpp
2019-09-12 10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/fakenetwork/fakenetwork.cpp
2019-10-06 11:38:22.000000000 +0200
@@ -36,7 +36,7 @@
, m_networkingEnabled(true)
, m_primaryConnection(QDBusObjectPath("/"))
, m_state(20)
- , m_version(QLatin1Literal("0.9.10.0"))
+ , m_version(QLatin1String("0.9.10.0"))
, m_wimaxEnabled(true)
, m_wimaxHardwareEnabled(true)
, m_wirelessEnabled(true)
@@ -109,7 +109,7 @@
m_wimaxEnabled = enabled;
QVariantMap map;
- map.insert(QLatin1Literal("WimaxEnabled"), m_wimaxEnabled);
+ map.insert(QLatin1String("WimaxEnabled"), m_wimaxEnabled);
Q_EMIT PropertiesChanged(map);
}
@@ -123,7 +123,7 @@
m_wimaxHardwareEnabled = enabled;
QVariantMap map;
- map.insert(QLatin1Literal("WimaxHardwareEnabled"), m_wimaxHardwareEnabled);
+ map.insert(QLatin1String("WimaxHardwareEnabled"), m_wimaxHardwareEnabled);
Q_EMIT PropertiesChanged(map);
}
@@ -137,7 +137,7 @@
m_wirelessEnabled = enabled;
QVariantMap map;
- map.insert(QLatin1Literal("WirelessEnabled"), m_wirelessEnabled);
+ map.insert(QLatin1String("WirelessEnabled"), m_wirelessEnabled);
Q_EMIT PropertiesChanged(map);
}
@@ -151,7 +151,7 @@
m_wirelessHardwareEnabled = enabled;
QVariantMap map;
- map.insert(QLatin1Literal("WirelessHardwareEnabled"),
m_wirelessHardwareEnabled);
+ map.insert(QLatin1String("WirelessHardwareEnabled"),
m_wirelessHardwareEnabled);
Q_EMIT PropertiesChanged(map);
}
@@ -165,7 +165,7 @@
m_wwanEnabled = enabled;
QVariantMap map;
- map.insert(QLatin1Literal("WwanEnabled"), m_wwanEnabled);
+ map.insert(QLatin1String("WwanEnabled"), m_wwanEnabled);
Q_EMIT PropertiesChanged(map);
}
@@ -192,9 +192,9 @@
void FakeNetwork::registerService()
{
-
QDBusConnection::sessionBus().registerService(QLatin1Literal("org.kde.fakenetwork"));
-
QDBusConnection::sessionBus().registerObject(QLatin1Literal("/org/kde/fakenetwork"),
this, QDBusConnection::ExportScriptableContents);
-
QDBusConnection::sessionBus().registerObject(QLatin1Literal("/org/kde/fakenetwork/Settings"),
m_settings, QDBusConnection::ExportScriptableContents);
+
QDBusConnection::sessionBus().registerService(QLatin1String("org.kde.fakenetwork"));
+
QDBusConnection::sessionBus().registerObject(QLatin1String("/org/kde/fakenetwork"),
this, QDBusConnection::ExportScriptableContents);
+
QDBusConnection::sessionBus().registerObject(QLatin1String("/org/kde/fakenetwork/Settings"),
m_settings, QDBusConnection::ExportScriptableContents);
Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
QDBusConnection::sessionBus().registerObject(devicePath.path(),
m_devices.value(devicePath), QDBusConnection::ExportScriptableContents);
@@ -209,9 +209,9 @@
Q_EMIT DeviceRemoved(devicePath);
}
-
QDBusConnection::sessionBus().unregisterObject(QLatin1Literal("/org/kde/fakenetwork/Settings"));
-
QDBusConnection::sessionBus().unregisterObject(QLatin1Literal("/org/kde/fakenetwork"));
-
QDBusConnection::sessionBus().unregisterService(QLatin1Literal("org.kde.fakenetwork"));
+
QDBusConnection::sessionBus().unregisterObject(QLatin1String("/org/kde/fakenetwork/Settings"));
+
QDBusConnection::sessionBus().unregisterObject(QLatin1String("/org/kde/fakenetwork"));
+
QDBusConnection::sessionBus().unregisterService(QLatin1String("org.kde.fakenetwork"));
}
QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath
&connection, const QDBusObjectPath &device, const QDBusObjectPath
&specific_object)
@@ -230,8 +230,8 @@
m_activatingConnection = QDBusObjectPath(newActiveConnectionPath);
QVariantMap map;
- map.insert(QLatin1Literal("ActiveConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(m_activeConnections.keys()));
- map.insert(QLatin1Literal("ActivatingConnection"),
QVariant::fromValue(QDBusObjectPath(newActiveConnectionPath)));
+ map.insert(QLatin1String("ActiveConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(m_activeConnections.keys()));
+ map.insert(QLatin1String("ActivatingConnection"),
QVariant::fromValue(QDBusObjectPath(newActiveConnectionPath)));
Q_EMIT PropertiesChanged(map);
Device *usedDevice = static_cast<Device
*>(QDBusConnection::sessionBus().objectRegisteredAt(device.path()));
@@ -264,14 +264,14 @@
ActiveConnection *activeConnection = static_cast<ActiveConnection
*>(QDBusConnection::sessionBus().objectRegisteredAt(device->activeConnection().path()));
if (activeConnection) {
QVariantMap activeConnectionMap;
- activeConnectionMap.insert(QLatin1Literal("State"),
NetworkManager::ActiveConnection::Activated);
+ activeConnectionMap.insert(QLatin1String("State"),
NetworkManager::ActiveConnection::Activated);
activeConnection->setState(NetworkManager::ActiveConnection::Activated);
- QDBusMessage message =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1Literal("org.kde.fakenetwork.Connection.Active"),
QLatin1Literal("PropertiesChanged"));
+ QDBusMessage message =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1String("org.kde.fakenetwork.Connection.Active"),
QLatin1String("PropertiesChanged"));
message << activeConnectionMap;
QDBusConnection::sessionBus().send(message);
- QDBusMessage message2 =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1Literal("org.kde.fakenetwork.Connection.Active"),
QLatin1Literal("StateChanged"));
+ QDBusMessage message2 =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1String("org.kde.fakenetwork.Connection.Active"),
QLatin1String("StateChanged"));
message2 << (uint)2 << (uint)1; //
NM_ACTIVE_CONNECTION_STATE_ACTIVATED << NM_ACTIVE_CONNECTION_STATE_REASON_NONE
QDBusConnection::sessionBus().send(message2);
}
@@ -281,9 +281,9 @@
// Set some IP address
device->setIpv4Address(1763189258);
- deviceMap.insert(QLatin1Literal("IpInterface"), device->ipInterface());
- deviceMap.insert(QLatin1Literal("Ip4Address"), device->ip4Address());
- deviceMap.insert(QLatin1Literal("ActiveConnection"),
m_activatingConnection.path());
+ deviceMap.insert(QLatin1String("IpInterface"), device->ipInterface());
+ deviceMap.insert(QLatin1String("Ip4Address"), device->ip4Address());
+ deviceMap.insert(QLatin1String("ActiveConnection"),
m_activatingConnection.path());
// Update FakeNetwork state, connectivity, primary connection
m_connectivity = NetworkManager::Connectivity::Full;
@@ -291,20 +291,20 @@
m_activatingConnection = QDBusObjectPath("/");
m_state = 70;
QVariantMap networkMap;
- networkMap.insert(QLatin1Literal("ActivatingConnection"),
QVariant::fromValue(m_activatingConnection));
- networkMap.insert(QLatin1Literal("Connectivity"),
NetworkManager::Connectivity::Full);
- networkMap.insert(QLatin1Literal("PrimaryConnection"),
QVariant::fromValue(m_primaryConnection));
- networkMap.insert(QLatin1Literal("State"), m_state);
+ networkMap.insert(QLatin1String("ActivatingConnection"),
QVariant::fromValue(m_activatingConnection));
+ networkMap.insert(QLatin1String("Connectivity"),
NetworkManager::Connectivity::Full);
+ networkMap.insert(QLatin1String("PrimaryConnection"),
QVariant::fromValue(m_primaryConnection));
+ networkMap.insert(QLatin1String("State"), m_state);
- QDBusMessage message =
QDBusMessage::createSignal(QLatin1Literal("/org/kde/fakenetwork"),
QLatin1Literal("org.kde.fakenetwork"), QLatin1Literal("PropertiesChanged"));
+ QDBusMessage message =
QDBusMessage::createSignal(QLatin1String("/org/kde/fakenetwork"),
QLatin1String("org.kde.fakenetwork"), QLatin1String("PropertiesChanged"));
message << networkMap;
QDBusConnection::sessionBus().send(message);
Q_EMIT StateChanged(m_state);
}
- deviceMap.insert(QLatin1Literal("State"), device->state());
- QDBusMessage message = QDBusMessage::createSignal(device->devicePath(),
device->deviceInterface(), QLatin1Literal("PropertiesChanged"));
+ deviceMap.insert(QLatin1String("State"), device->state());
+ QDBusMessage message = QDBusMessage::createSignal(device->devicePath(),
device->deviceInterface(), QLatin1String("PropertiesChanged"));
message << deviceMap;
QDBusConnection::sessionBus().send(message);
@@ -325,14 +325,14 @@
activeConnection->setState(NetworkManager::ActiveConnection::Deactivating);
QVariantMap activeConnectionMap;
- activeConnectionMap.insert(QLatin1Literal("State"),
NetworkManager::ActiveConnection::Deactivating);
+ activeConnectionMap.insert(QLatin1String("State"),
NetworkManager::ActiveConnection::Deactivating);
activeConnection->setState(NetworkManager::ActiveConnection::Activated);
- QDBusMessage message =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1Literal("org.kde.fakenetwork.Connection.Active"),
QLatin1Literal("PropertiesChanged"));
+ QDBusMessage message =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1String("org.kde.fakenetwork.Connection.Active"),
QLatin1String("PropertiesChanged"));
message << activeConnectionMap;
QDBusConnection::sessionBus().send(message);
- QDBusMessage message2 =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1Literal("org.kde.fakenetwork.Connection.Active"),
QLatin1Literal("StateChanged"));
+ QDBusMessage message2 =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1String("org.kde.fakenetwork.Connection.Active"),
QLatin1String("StateChanged"));
message2 << (uint)4 << (uint)2; //
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED <<
NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED
QDBusConnection::sessionBus().send(message2);
@@ -348,11 +348,11 @@
m_primaryConnection = QDBusObjectPath("/");
m_state = 20;
QVariantMap networkMap;
- networkMap.insert(QLatin1Literal("Connectivity"), m_connectivity);
- networkMap.insert(QLatin1Literal("PrimaryConnection"),
QVariant::fromValue(m_primaryConnection));
- networkMap.insert(QLatin1Literal("State"), m_state);
+ networkMap.insert(QLatin1String("Connectivity"), m_connectivity);
+ networkMap.insert(QLatin1String("PrimaryConnection"),
QVariant::fromValue(m_primaryConnection));
+ networkMap.insert(QLatin1String("State"), m_state);
- message =
QDBusMessage::createSignal(QLatin1Literal("/org/kde/fakenetwork"),
QLatin1Literal("org.kde.fakenetwork"), QLatin1Literal("PropertiesChanged"));
+ message =
QDBusMessage::createSignal(QLatin1String("/org/kde/fakenetwork"),
QLatin1String("org.kde.fakenetwork"), QLatin1String("PropertiesChanged"));
message << networkMap;
QDBusConnection::sessionBus().send(message);
@@ -367,21 +367,21 @@
ActiveConnection *activeConnection = static_cast<ActiveConnection
*>(QDBusConnection::sessionBus().objectRegisteredAt(device->activeConnection().path()));
if (activeConnection) {
QVariantMap activeConnectionMap;
- activeConnectionMap.insert(QLatin1Literal("State"),
NetworkManager::ActiveConnection::Deactivated);
+ activeConnectionMap.insert(QLatin1String("State"),
NetworkManager::ActiveConnection::Deactivated);
activeConnection->setState(NetworkManager::ActiveConnection::Activated);
- QDBusMessage message =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1Literal("org.kde.fakenetwork.Connection.Active"),
QLatin1Literal("PropertiesChanged"));
+ QDBusMessage message =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1String("org.kde.fakenetwork.Connection.Active"),
QLatin1String("PropertiesChanged"));
message << activeConnectionMap;
QDBusConnection::sessionBus().send(message);
- QDBusMessage message2 =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1Literal("org.kde.fakenetwork.Connection.Active"),
QLatin1Literal("StateChanged"));
+ QDBusMessage message2 =
QDBusMessage::createSignal(activeConnection->activeConnectionPath(),
QLatin1String("org.kde.fakenetwork.Connection.Active"),
QLatin1String("StateChanged"));
message2 << (uint)3 << (uint)2; //
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING <<
NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED
QDBusConnection::sessionBus().send(message2);
removeActiveConnection(QDBusObjectPath(activeConnection->activeConnectionPath()));
}
- device->setActiveConnection(QLatin1Literal("/"));
+ device->setActiveConnection(QLatin1String("/"));
device->setState(NetworkManager::Device::Disconnected);
// TODO: set dhcp4Config, dhcp6Config, ip4Config, ip6Config
// IP Interface is usually same as interface
@@ -389,12 +389,12 @@
// Set some IP address
device->setIpv4Address(0);
- deviceMap.insert(QLatin1Literal("ActiveConnection"),
device->activeConnection().path());
- deviceMap.insert(QLatin1Literal("IpInterface"), device->ipInterface());
- deviceMap.insert(QLatin1Literal("Ip4Address"), device->ip4Address());
- deviceMap.insert(QLatin1Literal("State"), device->state());
+ deviceMap.insert(QLatin1String("ActiveConnection"),
device->activeConnection().path());
+ deviceMap.insert(QLatin1String("IpInterface"), device->ipInterface());
+ deviceMap.insert(QLatin1String("Ip4Address"), device->ip4Address());
+ deviceMap.insert(QLatin1String("State"), device->state());
- QDBusMessage message = QDBusMessage::createSignal(device->devicePath(),
device->deviceInterface(), QLatin1Literal("PropertiesChanged"));
+ QDBusMessage message = QDBusMessage::createSignal(device->devicePath(),
device->deviceInterface(), QLatin1String("PropertiesChanged"));
message << deviceMap;
QDBusConnection::sessionBus().send(message);
}
@@ -415,7 +415,7 @@
Connection *newConnection = static_cast<Connection
*>(QDBusConnection::sessionBus().objectRegisteredAt(connection.path()));
if (newConnection) {
NMVariantMapMap settings = newConnection->GetSettings();
- NetworkManager::ConnectionSettings::ConnectionType type =
NetworkManager::ConnectionSettings::typeFromString(settings.value(QLatin1Literal("connection")).value(QLatin1Literal("type")).toString());
+ NetworkManager::ConnectionSettings::ConnectionType type =
NetworkManager::ConnectionSettings::typeFromString(settings.value(QLatin1String("connection")).value(QLatin1String("type")).toString());
if (!m_devices.isEmpty()) {
Device *selectedDevice = nullptr;
Q_FOREACH (Device * device, m_devices.values()) {
@@ -432,9 +432,9 @@
if (selectedDevice) {
QVariantMap map;
- map.insert(QLatin1Literal("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath>
>(selectedDevice->availableConnections()));
+ map.insert(QLatin1String("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath>
>(selectedDevice->availableConnections()));
- QDBusMessage message =
QDBusMessage::createSignal(selectedDevice->devicePath(),
selectedDevice->deviceInterface(), QLatin1Literal("PropertiesChanged"));
+ QDBusMessage message =
QDBusMessage::createSignal(selectedDevice->devicePath(),
selectedDevice->deviceInterface(), QLatin1String("PropertiesChanged"));
message << map;
QDBusConnection::sessionBus().send(message);
}
@@ -449,9 +449,9 @@
device->removeAvailableConnection(connection);
QVariantMap map;
- map.insert(QLatin1Literal("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(device->availableConnections()));
+ map.insert(QLatin1String("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(device->availableConnections()));
- QDBusMessage message =
QDBusMessage::createSignal(device->devicePath(), device->deviceInterface(),
QLatin1Literal("PropertiesChanged"));
+ QDBusMessage message =
QDBusMessage::createSignal(device->devicePath(), device->deviceInterface(),
QLatin1String("PropertiesChanged"));
message << map;
QDBusConnection::sessionBus().send(message);
}
@@ -465,6 +465,6 @@
QDBusConnection::sessionBus().unregisterObject(activeConnection.path());
QVariantMap map;
- map.insert(QLatin1Literal("ActiveConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(m_activeConnections.keys()));
+ map.insert(QLatin1String("ActiveConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(m_activeConnections.keys()));
Q_EMIT PropertiesChanged(map);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/src/fakenetwork/settings.cpp
new/networkmanager-qt-5.63.0/src/fakenetwork/settings.cpp
--- old/networkmanager-qt-5.62.0/src/fakenetwork/settings.cpp 2019-09-12
10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/fakenetwork/settings.cpp 2019-10-06
11:38:22.000000000 +0200
@@ -25,7 +25,7 @@
Settings::Settings(QObject *parent)
: QObject(parent)
, m_canModify(true)
- , m_hostname(QLatin1Literal("fake-hostname"))
+ , m_hostname(QLatin1String("fake-hostname"))
, m_connectionCounter(0)
{
qDBusRegisterMetaType<NMVariantMapMap>();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/src/fakenetwork/wireddevice.cpp
new/networkmanager-qt-5.63.0/src/fakenetwork/wireddevice.cpp
--- old/networkmanager-qt-5.62.0/src/fakenetwork/wireddevice.cpp
2019-09-12 10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/fakenetwork/wireddevice.cpp
2019-10-06 11:38:22.000000000 +0200
@@ -29,7 +29,7 @@
WiredDevice::~WiredDevice()
{
QVariantMap map;
- map.insert(QLatin1Literal("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(QList<QDBusObjectPath>()));
+ map.insert(QLatin1String("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(QList<QDBusObjectPath>()));
Q_EMIT PropertiesChanged(map);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/src/fakenetwork/wirelessdevice.cpp
new/networkmanager-qt-5.63.0/src/fakenetwork/wirelessdevice.cpp
--- old/networkmanager-qt-5.62.0/src/fakenetwork/wirelessdevice.cpp
2019-09-12 10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/fakenetwork/wirelessdevice.cpp
2019-10-06 11:38:22.000000000 +0200
@@ -42,7 +42,7 @@
qDeleteAll(m_accessPoints);
QVariantMap map;
- map.insert(QLatin1Literal("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(QList<QDBusObjectPath>()));
+ map.insert(QLatin1String("AvailableConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(QList<QDBusObjectPath>()));
Q_EMIT PropertiesChanged(map);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.62.0/src/settings/connectionsettings.cpp
new/networkmanager-qt-5.63.0/src/settings/connectionsettings.cpp
--- old/networkmanager-qt-5.62.0/src/settings/connectionsettings.cpp
2019-09-12 10:52:53.000000000 +0200
+++ new/networkmanager-qt-5.63.0/src/settings/connectionsettings.cpp
2019-10-06 11:38:22.000000000 +0200
@@ -540,9 +540,7 @@
if
(connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_TIMESTAMP))) {
const int timestamp =
connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_TIMESTAMP)).toInt();
- QDateTime dateTime;
- dateTime.setTime_t(timestamp);
- setTimestamp(dateTime);
+ setTimestamp(QDateTime::fromSecsSinceEpoch(timestamp));
}
if
(connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_READ_ONLY))) {
@@ -642,7 +640,7 @@
}
if (timestamp().isValid()) {
-
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_TIMESTAMP),
timestamp().toTime_t());
+
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_TIMESTAMP),
timestamp().toSecsSinceEpoch());
}
if (readOnly()) {
@@ -1015,7 +1013,7 @@
dbg.nospace() << NM_SETTING_CONNECTION_PERMISSIONS << ": " <<
setting.permissions() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_AUTOCONNECT << ": " <<
setting.autoconnect() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY << ": " <<
setting.autoconnectPriority() << '\n';
- dbg.nospace() << NM_SETTING_CONNECTION_TIMESTAMP << ": " <<
setting.timestamp().toTime_t() << '\n';
+ dbg.nospace() << NM_SETTING_CONNECTION_TIMESTAMP << ": " <<
setting.timestamp().toSecsSinceEpoch() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_READ_ONLY << ": " <<
setting.readOnly() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_ZONE << ": " << setting.zone() <<
'\n';
dbg.nospace() << NM_SETTING_CONNECTION_MASTER << ": " << setting.master()
<< '\n';
