Hello community,
here is the log from the commit of package libKF5ModemManagerQt for
openSUSE:Factory checked in at 2018-10-22 11:16:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5ModemManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5ModemManagerQt"
Mon Oct 22 11:16:32 2018 rev:54 rq:642354 version:5.51.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5ModemManagerQt/libKF5ModemManagerQt.changes
2018-10-01 08:10:08.874233077 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new/libKF5ModemManagerQt.changes
2018-10-22 11:16:35.195575523 +0200
@@ -1,0 +2,15 @@
+Tue Oct 16 08:02:45 UTC 2018 - Luca Beltrame <[email protected]>
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Mon Oct 15 11:50:39 UTC 2018 - [email protected]
+
+- Update to 5.51.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.51.0.php
+- Changes since 5.50.0:
+ * Add QStringLiteral and co
+
+-------------------------------------------------------------------
Old:
----
modemmanager-qt-5.50.0.tar.xz
New:
----
modemmanager-qt-5.51.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5ModemManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.MT8sWq/_old 2018-10-22 11:16:36.695573922 +0200
+++ /var/tmp/diff_new_pack.MT8sWq/_new 2018-10-22 11:16:36.695573922 +0200
@@ -12,23 +12,23 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define soversion 6
-%define _tar_path 5.50
+%define _tar_path 5.51
# 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: %define _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: libKF5ModemManagerQt
-Version: 5.50.0
+Version: 5.51.0
Release: 0
Summary: Qt wrapper for ModemManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
Group: System/GUI/KDE
-URL: http://www.kde.org
+URL: https://www.kde.org
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/modemmanager-qt-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
++++++ modemmanager-qt-5.50.0.tar.xz -> modemmanager-qt-5.51.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/CMakeLists.txt
new/modemmanager-qt-5.51.0/CMakeLists.txt
--- old/modemmanager-qt-5.50.0/CMakeLists.txt 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/CMakeLists.txt 2018-10-07 12:10:41.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.50.0") # handled by release scripts
+set(KF5_VERSION "5.51.0") # handled by release scripts
project(ModemManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.50.0 NO_MODULE)
+find_package(ECM 5.51.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)
@@ -22,8 +22,6 @@
add_definitions(${QT_DEFINITIONS})
-remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
-
include(GenerateExportHeader)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/bearer.cpp
new/modemmanager-qt-5.51.0/src/bearer.cpp
--- old/modemmanager-qt-5.50.0/src/bearer.cpp 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/src/bearer.cpp 2018-10-07 12:10:41.000000000
+0200
@@ -146,9 +146,9 @@
ModemManager::BearerPrivate::BearerPrivate(const QString &path, Bearer *q)
#ifdef MMQT_STATIC
- : bearerIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ : bearerIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- : bearerIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ : bearerIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, uni(path)
, q_ptr(q)
@@ -171,10 +171,10 @@
Q_D(Bearer);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -241,15 +241,15 @@
ModemManager::IpConfig ModemManager::BearerPrivate::ipConfigFromMap(const
QVariantMap &map)
{
ModemManager::IpConfig result;
- result.setMethod((MMBearerIpMethod)map.value("method").toUInt());
+
result.setMethod((MMBearerIpMethod)map.value(QStringLiteral("method")).toUInt());
if (result.method() == MM_BEARER_IP_METHOD_STATIC) {
- result.setAddress(map.value("address").toString());
- result.setPrefix(map.value("prefix").toUInt());
- result.setDns1(map.value("dns1").toString());
- result.setDns2(map.value("dns2").toString());
- result.setDns3(map.value("dns3").toString());
- result.setGateway(map.value("gateway").toString());
+ result.setAddress(map.value(QStringLiteral("address")).toString());
+ result.setPrefix(map.value(QStringLiteral("prefix")).toUInt());
+ result.setDns1(map.value(QStringLiteral("dns1")).toString());
+ result.setDns2(map.value(QStringLiteral("dns2")).toString());
+ result.setDns3(map.value(QStringLiteral("dns3")).toString());
+ result.setGateway(map.value(QStringLiteral("gateway")).toString());
}
return result;
@@ -261,7 +261,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_BEARER)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_BEARER)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_BEARER_PROPERTY_INTERFACE));
if (it != properties.constEnd()) {
bearerInterface = it->toString();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/call.cpp
new/modemmanager-qt-5.51.0/src/call.cpp
--- old/modemmanager-qt-5.50.0/src/call.cpp 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/src/call.cpp 2018-10-07 12:10:41.000000000
+0200
@@ -32,9 +32,9 @@
ModemManager::CallPrivate::CallPrivate(const QString &path, Call *q)
#ifdef MMQT_STATIC
- : callIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ : callIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- : callIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ : callIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -58,10 +58,10 @@
qRegisterMetaType<MMCallDirection>();
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
@@ -147,7 +147,7 @@
Q_UNUSED(invalidatedProperties);
Q_Q(Call);
- if (interfaceName == QString(MMQT_DBUS_INTERFACE_CALL)) {
+ if (interfaceName == QLatin1String(MMQT_DBUS_INTERFACE_CALL)) {
QVariantMap::const_iterator it =
changedProperties.constFind(QLatin1String(MM_CALL_PROPERTY_NUMBER));
if (it != changedProperties.constEnd()) {
number = it->toString();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/fakemodem/fakemodem.cpp
new/modemmanager-qt-5.51.0/src/fakemodem/fakemodem.cpp
--- old/modemmanager-qt-5.50.0/src/fakemodem/fakemodem.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/fakemodem/fakemodem.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -51,7 +51,7 @@
void FakeModem::addModem(Modem* modem)
{
- QString newModemPath = QString("/org/kde/fakemodem/Modem/") +
QString::number(m_modemCounter++);
+ QString newModemPath = QStringLiteral("/org/kde/fakemodem/Modem/") +
QString::number(m_modemCounter++);
modem->setModemPath(newModemPath);
// Start monitoring property changes
modem->setEnableNotifications(true);
@@ -74,7 +74,7 @@
void FakeModem::addBearer(Bearer* bearer)
{
- QString newBearerPath = QString("/org/kde/fakemodem/Bearer/") +
QString::number(m_bearerCounter++);
+ QString newBearerPath = QStringLiteral("/org/kde/fakemodem/Bearer/") +
QString::number(m_bearerCounter++);
bearer->setBearerPath(newBearerPath);
bearer->setEnableNotifications(true);
m_bearers.insert(QDBusObjectPath(newBearerPath), bearer);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/modemmanager-qt-5.50.0/src/fakemodem/modemmessaging.cpp
new/modemmanager-qt-5.51.0/src/fakemodem/modemmessaging.cpp
--- old/modemmanager-qt-5.50.0/src/fakemodem/modemmessaging.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/fakemodem/modemmessaging.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -78,7 +78,7 @@
void ModemMessaging::addMessage(Sms* sms)
{
- QString newSmsPath = QString("/org/kde/fakemodem/Sms/") +
QString::number(m_messageCounter++);
+ QString newSmsPath = QStringLiteral("/org/kde/fakemodem/Sms/") +
QString::number(m_messageCounter++);
sms->setSmsPath(newSmsPath);
sms->setEnableNotifications(true);
m_messages.insert(QDBusObjectPath(newSmsPath), sms);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/fakemodem/modemtime.cpp
new/modemmanager-qt-5.51.0/src/fakemodem/modemtime.cpp
--- old/modemmanager-qt-5.50.0/src/fakemodem/modemtime.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/fakemodem/modemtime.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -37,7 +37,7 @@
QString ModemTime::GetNetworkTime()
{
- return "2010-08-06T18:34:14.3+02:00";
+ return QStringLiteral("2010-08-06T18:34:14.3+02:00");
}
void ModemTime::setModemPath(const QString& path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/manager.cpp
new/modemmanager-qt-5.51.0/src/manager.cpp
--- old/modemmanager-qt-5.50.0/src/manager.cpp 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/src/manager.cpp 2018-10-07 12:10:41.000000000
+0200
@@ -40,13 +40,13 @@
ModemManager::ModemManagerPrivate::ModemManagerPrivate()
#ifdef MMQT_STATIC
- : watcher(MMQT_DBUS_SERVICE, QDBusConnection::sessionBus(),
QDBusServiceWatcher::WatchForRegistration |
QDBusServiceWatcher::WatchForUnregistration, this)
- , iface(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH, QDBusConnection::sessionBus(),
this)
- , manager(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH,
QDBusConnection::sessionBus(), this)
+ : watcher(QLatin1String(MMQT_DBUS_SERVICE), QDBusConnection::sessionBus(),
QDBusServiceWatcher::WatchForRegistration |
QDBusServiceWatcher::WatchForUnregistration, this)
+ , iface(QLatin1String(MMQT_DBUS_SERVICE), QLatin1String(MMQT_DBUS_PATH),
QDBusConnection::sessionBus(), this)
+ , manager(QLatin1String(MMQT_DBUS_SERVICE), QLatin1String(MMQT_DBUS_PATH),
QDBusConnection::sessionBus(), this)
#else
- : watcher(MMQT_DBUS_SERVICE, QDBusConnection::systemBus(),
QDBusServiceWatcher::WatchForRegistration |
QDBusServiceWatcher::WatchForUnregistration, this)
- , iface(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH, QDBusConnection::systemBus(),
this)
- , manager(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH, QDBusConnection::systemBus(),
this)
+ : watcher(QLatin1String(MMQT_DBUS_SERVICE), QDBusConnection::systemBus(),
QDBusServiceWatcher::WatchForRegistration |
QDBusServiceWatcher::WatchForUnregistration, this)
+ , iface(QLatin1String(MMQT_DBUS_SERVICE), QLatin1String(MMQT_DBUS_PATH),
QDBusConnection::systemBus(), this)
+ , manager(QLatin1String(MMQT_DBUS_SERVICE), QLatin1String(MMQT_DBUS_PATH),
QDBusConnection::systemBus(), this)
#endif
{
qDBusRegisterMetaType<QList<QDBusObjectPath> >();
@@ -55,21 +55,21 @@
bool serviceFound = manager.isValid();
if (!serviceFound) {
// find out whether it will be activated automatically
- QDBusMessage message =
QDBusMessage::createMethodCall("org.freedesktop.DBus",
-
"/org/freedesktop/DBus",
-
"org.freedesktop.DBus",
-
"ListActivatableNames");
+ QDBusMessage message =
QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"),
+
QStringLiteral("/org/freedesktop/DBus"),
+
QStringLiteral("org.freedesktop.DBus"),
+
QStringLiteral("ListActivatableNames"));
#ifdef MMQT_STATIC
QDBusReply<QStringList> reply =
QDBusConnection::sessionBus().call(message);
- if (reply.isValid() && reply.value().contains(MMQT_DBUS_SERVICE)) {
-
QDBusConnection::sessionBus().interface()->startService(MMQT_DBUS_SERVICE);
+ if (reply.isValid() &&
reply.value().contains(QLatin1String(MMQT_DBUS_SERVICE))) {
+
QDBusConnection::sessionBus().interface()->startService(QLatin1String(MMQT_DBUS_SERVICE));
serviceFound = true;
}
}
#else
QDBusReply<QStringList> reply =
QDBusConnection::systemBus().call(message);
- if (reply.isValid() && reply.value().contains(MMQT_DBUS_SERVICE)) {
-
QDBusConnection::systemBus().interface()->startService(MMQT_DBUS_SERVICE);
+ if (reply.isValid() &&
reply.value().contains(QLatin1String(MMQT_DBUS_SERVICE))) {
+
QDBusConnection::systemBus().interface()->startService(QLatin1String(MMQT_DBUS_SERVICE));
serviceFound = true;
}
}
@@ -101,7 +101,7 @@
const QString uni = path.path();
qCDebug(MMQT) << "Adding device" << uni;
- if (uni == MMQT_DBUS_PATH ||
!uni.startsWith(MMQT_DBUS_MODEM_PREFIX))
+ if (uni == QLatin1String(MMQT_DBUS_PATH) ||
!uni.startsWith(QLatin1String(MMQT_DBUS_MODEM_PREFIX)))
continue;
modemList.insert(uni, ModemDevice::Ptr());
@@ -167,7 +167,7 @@
const QString uni = object_path.path();
/* Ignore non-modems */
- if (!uni.startsWith(MMQT_DBUS_MODEM_PREFIX)) {
+ if (!uni.startsWith(QLatin1String(MMQT_DBUS_MODEM_PREFIX))) {
return;
}
@@ -179,8 +179,8 @@
Q_EMIT modemAdded(uni);
}
// re-Q_EMIT in case of modem type change (GSM <-> CDMA)
- else if (modemList.contains(uni) &&
(interfaces_and_properties.keys().contains(MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP)
||
-
interfaces_and_properties.keys().contains(MMQT_DBUS_INTERFACE_MODEM_MODEMCDMA)))
{
+ else if (modemList.contains(uni) &&
(interfaces_and_properties.keys().contains(QLatin1String(MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP))
||
+
interfaces_and_properties.keys().contains(QLatin1String(MMQT_DBUS_INTERFACE_MODEM_MODEMCDMA))))
{
Q_EMIT modemAdded(uni);
}
}
@@ -192,7 +192,7 @@
const QString uni = object_path.path();
/* Ignore non-modems */
- if (!uni.startsWith(MMQT_DBUS_MODEM_PREFIX)) {
+ if (!uni.startsWith(QLatin1String(MMQT_DBUS_MODEM_PREFIX))) {
return;
}
@@ -201,7 +201,7 @@
ModemDevice::Ptr modem = findModemDevice(uni);
// Remove modem when there is no interface or Modem interfaces has been
removed
- if (!uni.isEmpty() && (interfaces.isEmpty() || (modem &&
modem->interfaces().isEmpty()) ||
interfaces.contains(MMQT_DBUS_INTERFACE_MODEM))) {
+ if (!uni.isEmpty() && (interfaces.isEmpty() || (modem &&
modem->interfaces().isEmpty()) ||
interfaces.contains(QLatin1String(MMQT_DBUS_INTERFACE_MODEM)))) {
Q_EMIT modemRemoved(uni);
modemList.remove(uni);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modem.cpp
new/modemmanager-qt-5.51.0/src/modem.cpp
--- old/modemmanager-qt-5.50.0/src/modem.cpp 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/src/modem.cpp 2018-10-07 12:10:41.000000000
+0200
@@ -165,9 +165,9 @@
ModemManager::ModemPrivate::ModemPrivate(const QString &path, Modem *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , modemIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -254,10 +254,10 @@
if (d->modemIface.isValid()) {
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, "PropertiesChanged", d,
+
QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE), d->uni,
QLatin1String(DBUS_INTERFACE_PROPS), QLatin1String("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, "PropertiesChanged", d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QLatin1String("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -297,20 +297,20 @@
{
Q_D(Modem);
QVariantMap map;
- map.insert("apn", bearerProperties.apn());
+ map.insert(QStringLiteral("apn"), bearerProperties.apn());
if (bearerProperties.ipType() != MM_BEARER_IP_FAMILY_NONE)
- map.insert("ip-type", (uint)bearerProperties.ipType());
+ map.insert(QStringLiteral("ip-type"), (uint)bearerProperties.ipType());
if (bearerProperties.allowedAuthentication() !=
MM_BEARER_ALLOWED_AUTH_UNKNOWN)
- map.insert("allowed-auth",
(uint)bearerProperties.allowedAuthentication());
+ map.insert(QStringLiteral("allowed-auth"),
(uint)bearerProperties.allowedAuthentication());
if (!bearerProperties.user().isEmpty())
- map.insert("user", bearerProperties.user());
+ map.insert(QStringLiteral("user"), bearerProperties.user());
if (!bearerProperties.password().isEmpty())
- map.insert("password", bearerProperties.password());
- map.insert("allow-roaming", bearerProperties.allowRoaming());
+ map.insert(QStringLiteral("password"), bearerProperties.password());
+ map.insert(QStringLiteral("allow-roaming"),
bearerProperties.allowRoaming());
if (bearerProperties.rmProtocol() != MM_MODEM_CDMA_RM_PROTOCOL_UNKNOWN)
- map.insert("rm-protocol", (uint)bearerProperties.rmProtocol());
+ map.insert(QStringLiteral("rm-protocol"),
(uint)bearerProperties.rmProtocol());
if (!bearerProperties.number().isEmpty())
- map.insert("number", bearerProperties.number());
+ map.insert(QStringLiteral("number"), bearerProperties.number());
return d->modemIface.CreateBearer(map);
}
@@ -581,7 +581,7 @@
Q_Q(Modem);
qCDebug(MMQT) << ifaceName << changedProps.keys();
- if (ifaceName == QString(MMQT_DBUS_INTERFACE_MODEM)) {
+ if (ifaceName == QLatin1String(MMQT_DBUS_INTERFACE_MODEM)) {
QVariantMap::const_iterator it =
changedProps.constFind(QLatin1String(MM_MODEM_PROPERTY_SIM));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modem3gpp.cpp
new/modemmanager-qt-5.51.0/src/modem3gpp.cpp
--- old/modemmanager-qt-5.50.0/src/modem3gpp.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modem3gpp.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -33,9 +33,9 @@
ModemManager::Modem3gppPrivate::Modem3gppPrivate(const QString &path,
Modem3gpp *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modem3gppIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , modem3gppIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modem3gppIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modem3gppIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -62,10 +62,10 @@
qRegisterMetaType<MMModem3gppSubscriptionState>();
#endif
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -130,7 +130,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_MODEM_MODEM3GPP_PROPERTY_IMEI));
if (it != properties.constEnd()) {
imei = it->toString();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modem3gppussd.cpp
new/modemmanager-qt-5.51.0/src/modem3gppussd.cpp
--- old/modemmanager-qt-5.50.0/src/modem3gppussd.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modem3gppussd.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -33,9 +33,9 @@
ModemManager::Modem3gppUssdPrivate::Modem3gppUssdPrivate(const QString &path,
Modem3gppUssd *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , ussdIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , ussdIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , ussdIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , ussdIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -54,10 +54,10 @@
qRegisterMetaType<MMModem3gppUssdSessionState>();
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -72,7 +72,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP_USSD)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP_USSD)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_MODEM_MODEM3GPP_USSD_PROPERTY_STATE));
if ( it != properties.constEnd()) {
state = (MMModem3gppUssdSessionState)it->toUInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemcdma.cpp
new/modemmanager-qt-5.51.0/src/modemcdma.cpp
--- old/modemmanager-qt-5.50.0/src/modemcdma.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemcdma.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -32,9 +32,9 @@
ModemManager::ModemCdmaPrivate::ModemCdmaPrivate(const QString &path,
ModemCdma *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemCdmaIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , modemCdmaIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemCdmaIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemCdmaIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -60,10 +60,10 @@
connect(&d->modemCdmaIface,
&OrgFreedesktopModemManager1ModemModemCdmaInterface::ActivationStateChanged, d,
&ModemCdmaPrivate::onActivationStateChanged);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -139,7 +139,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_MODEM_MODEMCDMA)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM_MODEMCDMA)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_MODEM_MODEMCDMA_PROPERTY_ACTIVATIONSTATE));
if (it != properties.constEnd()) {
// Should be handled by activationStateChanged signal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemdevice.cpp
new/modemmanager-qt-5.51.0/src/modemdevice.cpp
--- old/modemmanager-qt-5.50.0/src/modemdevice.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemdevice.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -61,14 +61,14 @@
{
Q_Q(ModemManager::ModemDevice);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH,
DBUS_INTERFACE_MANAGER, QStringLiteral("InterfacesAdded"),
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
QLatin1String(MMQT_DBUS_PATH), QLatin1String(DBUS_INTERFACE_MANAGER),
QStringLiteral("InterfacesAdded"),
q,
SLOT(onInterfacesAdded(QDBusObjectPath,MMVariantMapMap)));
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH,
DBUS_INTERFACE_MANAGER, QStringLiteral("InterfacesRemoved"),
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
QLatin1String(MMQT_DBUS_PATH), QLatin1String(DBUS_INTERFACE_MANAGER),
QStringLiteral("InterfacesRemoved"),
q,
SLOT(onInterfacesRemoved(QDBusObjectPath,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH,
DBUS_INTERFACE_MANAGER, QStringLiteral("InterfacesAdded"),
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
QLatin1String(MMQT_DBUS_PATH), QLatin1String(DBUS_INTERFACE_MANAGER),
QStringLiteral("InterfacesAdded"),
q,
SLOT(onInterfacesAdded(QDBusObjectPath,MMVariantMapMap)));
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, MMQT_DBUS_PATH,
DBUS_INTERFACE_MANAGER, QStringLiteral("InterfacesRemoved"),
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
QLatin1String(MMQT_DBUS_PATH), QLatin1String(DBUS_INTERFACE_MANAGER),
QStringLiteral("InterfacesRemoved"),
q,
SLOT(onInterfacesRemoved(QDBusObjectPath,QStringList)));
#endif
@@ -88,13 +88,13 @@
QDomDocument dom;
dom.setContent(xmlData);
- QDomNodeList ifaceNodeList = dom.elementsByTagName("interface");
+ QDomNodeList ifaceNodeList =
dom.elementsByTagName(QStringLiteral("interface"));
for (int i = 0; i < ifaceNodeList.count(); i++) {
QDomElement ifaceElem = ifaceNodeList.item(i).toElement();
/* Accept only MM interfaces so that when the device is unplugged,
* interfaceList goes empty and we can easily verify that the device
is gone. */
- if (!ifaceElem.isNull() &&
ifaceElem.attribute("name").startsWith(MMQT_DBUS_SERVICE)) {
- const QString name = ifaceElem.attribute("name");
+ if (!ifaceElem.isNull() &&
ifaceElem.attribute(QStringLiteral("name")).startsWith(QLatin1String(MMQT_DBUS_SERVICE)))
{
+ const QString name = ifaceElem.attribute(QStringLiteral("name"));
if (name == QLatin1String(MMQT_DBUS_INTERFACE_MODEM)) {
interfaceList.insert(ModemManager::ModemDevice::ModemInterface,
ModemManager::Modem::Ptr());
if
(interfaceList.contains(ModemManager::ModemDevice::ModemInterface)) {
@@ -140,7 +140,7 @@
QString ModemManager::ModemDevicePrivate::introspect() const
{
- QDBusMessage call = QDBusMessage::createMethodCall(MMQT_DBUS_SERVICE, uni,
DBUS_INTERFACE_INTROSPECT, "Introspect");
+ QDBusMessage call =
QDBusMessage::createMethodCall(QLatin1String(MMQT_DBUS_SERVICE), uni,
QLatin1String(DBUS_INTERFACE_INTROSPECT), QLatin1String("Introspect"));
#ifdef MMQT_STATIC
QDBusPendingReply<QString> reply =
QDBusConnection::sessionBus().call(call);
#else
@@ -351,7 +351,7 @@
Q_FOREACH (const QString & iface, interfaces_and_properties.keys()) {
/* Don't store generic DBus interfaces */
- if (iface.startsWith(MMQT_DBUS_SERVICE)) {
+ if (iface.startsWith(QLatin1String(MMQT_DBUS_SERVICE))) {
if (iface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM)) {
interfaceList.insert(ModemManager::ModemDevice::ModemInterface,
ModemManager::Modem::Ptr());
} else if (iface ==
QLatin1String(MMQT_DBUS_INTERFACE_MODEM_SIMPLE)) {
@@ -390,7 +390,7 @@
return;
}
- if (interfaces.contains(MMQT_DBUS_INTERFACE_MODEM) ||
interfaces.isEmpty()) {
+ if (interfaces.contains(QLatin1String(MMQT_DBUS_INTERFACE_MODEM)) ||
interfaces.isEmpty()) {
if (simCard) {
Q_EMIT q->simRemoved(simCard->uni());
simCard = ModemManager::Sim::Ptr();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemfirmware.cpp
new/modemmanager-qt-5.51.0/src/modemfirmware.cpp
--- old/modemmanager-qt-5.50.0/src/modemfirmware.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemfirmware.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -29,9 +29,9 @@
ModemManager::ModemFirmwarePrivate::ModemFirmwarePrivate(const QString &path,
ModemFirmware *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemFirmwareIface(MMQT_DBUS_SERVICE, path,
QDBusConnection::sessionBus())
+ , modemFirmwareIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemFirmwareIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemFirmwareIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemlocation.cpp
new/modemmanager-qt-5.51.0/src/modemlocation.cpp
--- old/modemmanager-qt-5.50.0/src/modemlocation.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemlocation.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -33,9 +33,9 @@
ModemManager::ModemLocationPrivate::ModemLocationPrivate(const QString &path,
ModemLocation *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemLocationIface(MMQT_DBUS_SERVICE, path,
QDBusConnection::sessionBus())
+ , modemLocationIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemLocationIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemLocationIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -55,10 +55,10 @@
qRegisterMetaType<LocationSources>();
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -115,7 +115,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_MODEM_LOCATION)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM_LOCATION)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_MODEM_LOCATION_PROPERTY_CAPABILITIES));
if ( it != properties.constEnd()) {
capabilities =
(ModemManager::ModemLocation::LocationSources)it->toUInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemmessaging.cpp
new/modemmanager-qt-5.51.0/src/modemmessaging.cpp
--- old/modemmanager-qt-5.50.0/src/modemmessaging.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemmessaging.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -36,9 +36,9 @@
ModemManager::ModemMessagingPrivate::ModemMessagingPrivate(const QString
&path, ModemMessaging *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemMessagingIface(MMQT_DBUS_SERVICE, path,
QDBusConnection::sessionBus())
+ , modemMessagingIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemMessagingIface(MMQT_DBUS_SERVICE, path,
QDBusConnection::systemBus())
+ , modemMessagingIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -60,10 +60,10 @@
{
Q_D(ModemMessaging);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), this,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
this,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), this,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
this,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
QList <QDBusObjectPath> messages = d->modemMessagingIface.messages();
@@ -165,9 +165,9 @@
QDBusPendingReply<QDBusObjectPath>
ModemManager::ModemMessaging::createMessage(const Message &message)
{
QVariantMap map;
- map.insert("number", message.number);
- map.insert("text", message.text);
- map.insert("data", message.data);
+ map.insert(QStringLiteral("number"), message.number);
+ map.insert(QStringLiteral("text"), message.text);
+ map.insert(QStringLiteral("data"), message.data);
return createMessage(map);
}
@@ -176,7 +176,7 @@
{
Q_D(ModemMessaging);
- if (!message.contains("number") || (!message.contains("text") &&
!message.contains("data"))) {
+ if (!message.contains(QLatin1String("number")) ||
(!message.contains(QLatin1String("text")) &&
!message.contains(QLatin1String("data")))) {
qCDebug(MMQT) << "Unable to create message, missing some property";
return QDBusPendingReply<QDBusObjectPath>();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemoma.cpp
new/modemmanager-qt-5.51.0/src/modemoma.cpp
--- old/modemmanager-qt-5.50.0/src/modemoma.cpp 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/src/modemoma.cpp 2018-10-07 12:10:41.000000000
+0200
@@ -31,9 +31,9 @@
ModemManager::ModemOmaPrivate::ModemOmaPrivate(const QString &path, ModemOma
*q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , omaIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , omaIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , omaIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , omaIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -57,10 +57,10 @@
connect(&d->omaIface,
&OrgFreedesktopModemManager1ModemOmaInterface::SessionStateChanged, d,
&ModemOmaPrivate::onSessionStateChanged);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -130,7 +130,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_MODEM_OMA)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM_OMA)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_MODEM_OMA_PROPERTY_FEATURES));
if (it != properties.constEnd()) {
features = (ModemOma::Features)it->toUInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemsignal.cpp
new/modemmanager-qt-5.51.0/src/modemsignal.cpp
--- old/modemmanager-qt-5.50.0/src/modemsignal.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemsignal.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -31,9 +31,9 @@
ModemManager::ModemSignalPrivate::ModemSignalPrivate(const QString &path,
ModemSignal *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemSignalIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , modemSignalIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemSignalIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemSignalIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -52,10 +52,10 @@
{
Q_D(ModemSignal);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -112,7 +112,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_MODEM_SIGNAL)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM_SIGNAL)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_MODEM_SIGNAL_PROPERTY_RATE));
if (it != properties.constEnd()) {
rate = it->toUInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemsimple.cpp
new/modemmanager-qt-5.51.0/src/modemsimple.cpp
--- old/modemmanager-qt-5.50.0/src/modemsimple.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemsimple.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -31,9 +31,9 @@
ModemManager::ModemSimplePrivate::ModemSimplePrivate(const QString &path,
ModemSimple *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemSimpleIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , modemSimpleIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemSimpleIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemSimpleIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemtime.cpp
new/modemmanager-qt-5.51.0/src/modemtime.cpp
--- old/modemmanager-qt-5.50.0/src/modemtime.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemtime.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -102,9 +102,9 @@
ModemManager::ModemTimePrivate::ModemTimePrivate(const QString &path,
ModemTime *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemTimeIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , modemTimeIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemTimeIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemTimeIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -120,10 +120,10 @@
connect(&d->modemTimeIface,
&OrgFreedesktopModemManager1ModemTimeInterface::NetworkTimeChanged, d,
&ModemTimePrivate::onNetworkTimeChanged);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, d->uni,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
d->uni, QLatin1String(DBUS_INTERFACE_PROPS),
QStringLiteral("PropertiesChanged"), d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -149,12 +149,12 @@
ModemManager::NetworkTimezone
ModemManager::ModemTimePrivate::variantMapToTimezone(const QVariantMap &map)
{
ModemManager::NetworkTimezone result;
- if (map.contains("offset")) {
- result.setOffset(map.value("offset").toInt());
- } if (map.contains("dst-offset")) {
- result.setDstOffset(map.value("dst-offset").toInt());
- } if (map.contains("leap-seconds")) {
- result.setLeapSecond(map.value("leap-seconds").toInt());
+ if (map.contains(QLatin1String("offset"))) {
+ result.setOffset(map.value(QStringLiteral("offset")).toInt());
+ } if (map.contains(QLatin1String("dst-offset"))) {
+ result.setDstOffset(map.value(QStringLiteral("dst-offset")).toInt());
+ } if (map.contains(QLatin1String("leap-seconds"))) {
+
result.setLeapSecond(map.value(QStringLiteral("leap-seconds")).toInt());
}
return result;
@@ -176,7 +176,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_MODEM_TIME)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_MODEM_TIME)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_MODEM_TIME_PROPERTY_NETWORKTIMEZONE));
if (it != properties.constEnd()) {
networkTimezone =
variantMapToTimezone(qdbus_cast<QVariantMap>(*it));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/modemvoice.cpp
new/modemmanager-qt-5.51.0/src/modemvoice.cpp
--- old/modemmanager-qt-5.50.0/src/modemvoice.cpp 2018-09-01
00:25:03.000000000 +0200
+++ new/modemmanager-qt-5.51.0/src/modemvoice.cpp 2018-10-07
12:10:41.000000000 +0200
@@ -34,9 +34,9 @@
ModemManager::ModemVoicePrivate::ModemVoicePrivate(const QString &path,
ModemVoice *q)
: InterfacePrivate(path, q)
#ifdef MMQT_STATIC
- , modemVoiceIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ , modemVoiceIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- , modemVoiceIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ , modemVoiceIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -120,7 +120,7 @@
QDBusPendingReply<QDBusObjectPath> ModemManager::ModemVoice::createCall(const
QString &number)
{
QVariantMap map;
- map.insert("number", number);
+ map.insert(QStringLiteral("number"), number);
return createCall(map);
}
@@ -128,7 +128,7 @@
{
Q_D(ModemVoice);
- if (!call.contains("number")) {
+ if (!call.contains(QLatin1String("number"))) {
qCDebug(MMQT) << "Unable to create call, missing some property";
return QDBusPendingReply<QDBusObjectPath>();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/sim.cpp
new/modemmanager-qt-5.51.0/src/sim.cpp
--- old/modemmanager-qt-5.50.0/src/sim.cpp 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/src/sim.cpp 2018-10-07 12:10:41.000000000
+0200
@@ -32,9 +32,9 @@
ModemManager::SimPrivate::SimPrivate(const QString &path, Sim *q)
#ifdef MMQT_STATIC
- : simIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ : simIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- : simIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ : simIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, uni(path)
, q_ptr(q)
@@ -53,10 +53,10 @@
{
Q_D(Sim);
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -126,7 +126,7 @@
Q_UNUSED(invalidatedProps);
qCDebug(MMQT) << interface << properties.keys();
- if (interface == QString(MMQT_DBUS_INTERFACE_SIM)) {
+ if (interface == QLatin1String(MMQT_DBUS_INTERFACE_SIM)) {
QVariantMap::const_iterator it =
properties.constFind(QLatin1String(MM_SIM_PROPERTY_SIMIDENTIFIER));
if (it != properties.constEnd()) {
simIdentifier = it->toString();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.50.0/src/sms.cpp
new/modemmanager-qt-5.51.0/src/sms.cpp
--- old/modemmanager-qt-5.50.0/src/sms.cpp 2018-09-01 00:25:03.000000000
+0200
+++ new/modemmanager-qt-5.51.0/src/sms.cpp 2018-10-07 12:10:41.000000000
+0200
@@ -34,9 +34,9 @@
ModemManager::SmsPrivate::SmsPrivate(const QString &path, Sms *q)
#ifdef MMQT_STATIC
- : smsIface(MMQT_DBUS_SERVICE, path, QDBusConnection::sessionBus())
+ : smsIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::sessionBus())
#else
- : smsIface(MMQT_DBUS_SERVICE, path, QDBusConnection::systemBus())
+ : smsIface(QLatin1String(MMQT_DBUS_SERVICE), path,
QDBusConnection::systemBus())
#endif
, q_ptr(q)
{
@@ -79,10 +79,10 @@
#endif
#ifdef MMQT_STATIC
- QDBusConnection::sessionBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#else
- QDBusConnection::systemBus().connect(MMQT_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), d,
+ QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE),
path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"),
d,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
#endif
}
@@ -213,7 +213,7 @@
Q_UNUSED(invalidatedProperties);
Q_Q(Sms);
- if (interfaceName == QString(MMQT_DBUS_INTERFACE_SMS)) {
+ if (interfaceName == QLatin1String(MMQT_DBUS_INTERFACE_SMS)) {
QVariantMap::const_iterator it =
changedProperties.constFind(QLatin1String(MM_SMS_PROPERTY_STATE));
if (it != changedProperties.constEnd()) {
state = (MMSmsState) it->toUInt();
