diffstat for modemmanager-qt-5.46.0 modemmanager-qt-5.59.0 .gitignore | 21 CMakeLists.txt | 16 autotests/bearerpropertiestest.cpp | 2 autotests/modem3gpppropertiestest.cpp | 2 autotests/modem3gppussdpropertiestest.cpp | 2 autotests/modemcdmapropertiestest.cpp | 2 autotests/modemlocationpropertiestest.cpp | 2 autotests/modemmessagingpropertiestest.cpp | 2 autotests/modemomapropertiestest.cpp | 2 autotests/modempropertiestest.cpp | 2 autotests/modemtest.cpp | 2 autotests/modemtimepropertiestest.cpp | 2 debian/changelog | 235 +++++++++- debian/control | 12 debian/libkf5modemmanagerqt6.install | 1 debian/libkf5modemmanagerqt6.symbols | 45 + debian/modemmanager-qt-dev.acc.in | 1 modemmanager-qt.categories | 1 src/CMakeLists.txt | 16 src/bearer.cpp | 24 - src/call.cpp | 157 ++++++ src/call.h | 108 ++++ src/call_p.h | 53 ++ src/dbus/CMakeLists.txt | 2 src/dbus/bearerinterface.h | 16 src/dbus/callinterface.cpp | 25 + src/dbus/callinterface.h | 86 +++ src/dbus/dbus.h | 3 src/dbus/dbus_manager.h | 16 src/dbus/fakedbus.h | 3 src/dbus/firmwareinterface.h | 16 src/dbus/introspection/org.freedesktop.ModemManager1.Call.xml | 115 ++++ src/dbus/introspection/org.freedesktop.ModemManager1.Modem.Voice.xml | 90 +++ src/dbus/locationinterface.h | 16 src/dbus/messaginginterface.h | 16 src/dbus/modem3gppinterface.h | 16 src/dbus/modemcdmainterface.h | 16 src/dbus/modeminterface.h | 16 src/dbus/modemmanager1interface.h | 16 src/dbus/omainterface.h | 16 src/dbus/signalinterface.h | 16 src/dbus/siminterface.h | 16 src/dbus/simpleinterface.h | 16 src/dbus/smsinterface.h | 16 src/dbus/timeinterface.h | 16 src/dbus/ussdinterface.h | 16 src/dbus/voiceinterface.cpp | 25 + src/dbus/voiceinterface.h | 69 ++ src/fakemodem/fakemodem.cpp | 4 src/fakemodem/modemmessaging.cpp | 2 src/fakemodem/modemtime.cpp | 2 src/generictypes.cpp | 2 src/generictypes.h | 7 src/manager.cpp | 43 - src/modem.cpp | 26 - src/modem3gpp.cpp | 10 src/modem3gpp_p.h | 2 src/modem3gppussd.cpp | 10 src/modem3gppussd_p.h | 2 src/modem_p.h | 2 src/modemcdma.cpp | 10 src/modemcdma_p.h | 2 src/modemdevice.cpp | 20 src/modemfirmware.cpp | 4 src/modemlocation.cpp | 10 src/modemlocation_p.h | 2 src/modemmessaging.cpp | 16 src/modemmessaging_p.h | 2 src/modemoma.cpp | 10 src/modemoma_p.h | 2 src/modemsignal.cpp | 10 src/modemsignal_p.h | 2 src/modemsimple.cpp | 4 src/modemtime.cpp | 22 src/modemtime_p.h | 2 src/modemvoice.cpp | 149 ++++++ src/modemvoice.h | 107 ++++ src/modemvoice_p.h | 51 ++ src/sim.cpp | 10 src/sms.cpp | 10 80 files changed, 1649 insertions(+), 292 deletions(-) diff -Nru modemmanager-qt-5.46.0/.gitignore modemmanager-qt-5.59.0/.gitignore --- modemmanager-qt-5.46.0/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/.gitignore 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -Nru modemmanager-qt-5.46.0/CMakeLists.txt modemmanager-qt-5.59.0/CMakeLists.txt --- modemmanager-qt-5.46.0/CMakeLists.txt 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/CMakeLists.txt 2019-06-01 16:41:23.000000000 +0000 @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.59.0") # handled by release scripts project(ModemManagerQt VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.59.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) @@ -17,16 +17,11 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -set(REQUIRED_QT_VERSION 5.8.0) +set(REQUIRED_QT_VERSION 5.10.0) find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Xml) add_definitions(${QT_DEFINITIONS}) -add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - -remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY) - include(GenerateExportHeader) @@ -42,7 +37,7 @@ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/modemmanagerqt_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ModemManagerQtConfigVersion.cmake" SOVERSION 6) - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) # Enable unit testing if (BUILD_TESTING) add_subdirectory(src/fakemodem) @@ -91,5 +86,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/modemmanagerqt_version.h DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) +install(FILES modemmanager-qt.categories DESTINATION ${KDE_INSTALL_CONFDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru modemmanager-qt-5.46.0/autotests/bearerpropertiestest.cpp modemmanager-qt-5.59.0/autotests/bearerpropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/bearerpropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/bearerpropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -28,7 +28,7 @@ #include #include -#include +#include void BearerPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modem3gpppropertiestest.cpp modemmanager-qt-5.59.0/autotests/modem3gpppropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modem3gpppropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modem3gpppropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#include +#include void Modem3gppPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modem3gppussdpropertiestest.cpp modemmanager-qt-5.59.0/autotests/modem3gppussdpropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modem3gppussdpropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modem3gppussdpropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#include +#include void Modem3gppUssdPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modemcdmapropertiestest.cpp modemmanager-qt-5.59.0/autotests/modemcdmapropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modemcdmapropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modemcdmapropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#include +#include void ModemCdmaPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modemlocationpropertiestest.cpp modemmanager-qt-5.59.0/autotests/modemlocationpropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modemlocationpropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modemlocationpropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#include +#include void ModemLocationPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modemmessagingpropertiestest.cpp modemmanager-qt-5.59.0/autotests/modemmessagingpropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modemmessagingpropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modemmessagingpropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#include +#include void ModemMessagingPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modemomapropertiestest.cpp modemmanager-qt-5.59.0/autotests/modemomapropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modemomapropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modemomapropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#include +#include void ModemOmaPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modempropertiestest.cpp modemmanager-qt-5.59.0/autotests/modempropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modempropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modempropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -28,7 +28,7 @@ #include #include -#include +#include void ModemPropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modemtest.cpp modemmanager-qt-5.59.0/autotests/modemtest.cpp --- modemmanager-qt-5.46.0/autotests/modemtest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modemtest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -27,7 +27,7 @@ #include #include -#include +#include void ModemTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/autotests/modemtimepropertiestest.cpp modemmanager-qt-5.59.0/autotests/modemtimepropertiestest.cpp --- modemmanager-qt-5.46.0/autotests/modemtimepropertiestest.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/autotests/modemtimepropertiestest.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#include +#include void ModemTimePropertiesTest::initTestCase() { diff -Nru modemmanager-qt-5.46.0/debian/changelog modemmanager-qt-5.59.0/debian/changelog --- modemmanager-qt-5.46.0/debian/changelog 2018-05-17 20:15:46.000000000 +0000 +++ modemmanager-qt-5.59.0/debian/changelog 2019-06-12 10:21:33.000000000 +0000 @@ -1,3 +1,89 @@ +modemmanager-qt (5.59.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.59.0) + + -- Rik Mills Wed, 12 Jun 2019 11:21:33 +0100 + +modemmanager-qt (5.58.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.58.0) + + -- Rik Mills Mon, 13 May 2019 15:42:43 +0100 + +modemmanager-qt (5.57.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.57.0) + + -- Rik Mills Mon, 22 Apr 2019 08:40:15 +0100 + +modemmanager-qt (5.56.0-0ubuntu1) disco; urgency=medium + + * New upstream release (5.56.0) + + -- José Manuel Santamaría Lema Sat, 09 Mar 2019 16:37:59 +0000 + +modemmanager-qt (5.55.0-0ubuntu1) disco; urgency=medium + + * New upstream release (5.55.0) + + -- Rik Mills Wed, 13 Feb 2019 08:33:26 +0000 + +modemmanager-qt (5.54.0-0ubuntu1) disco; urgency=medium + + * New upstream release (5.54.0) + + -- Rik Mills Sun, 13 Jan 2019 12:36:42 +0000 + +modemmanager-qt (5.53.0-0ubuntu1) disco; urgency=medium + + * New upstream release (5.53.0) + + -- José Manuel Santamaría Lema Sun, 09 Dec 2018 20:50:14 +0000 + +modemmanager-qt (5.52.0-0ubuntu1) disco; urgency=medium + + [ Rik Mills ] + * Install modemmanager-qt.categories file. + + [ José Manuel Santamaría Lema ] + * New upstream release (5.52.0) + + -- José Manuel Santamaría Lema Thu, 22 Nov 2018 14:43:36 +0000 + +modemmanager-qt (5.51.0-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release (5.51.0) + + -- Rik Mills Thu, 11 Oct 2018 08:12:09 +0000 + +modemmanager-qt (5.50.0-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.50.0) + + -- Rik Mills Mon, 10 Sep 2018 22:15:50 +0100 + +modemmanager-qt (5.49.0-0ubuntu1) cosmic; urgency=medium + + [ Rik Mills ] + * New upstream release (5.48.0) + * Update symbols from build logs + * New upstream release (5.49.0) + + [ José Manuel Santamaría Lema ] + * Move away from dhmk and set compat level to 11 in order to reduce + delta with Debian + + -- Rik Mills Tue, 21 Aug 2018 20:31:43 +0100 + +modemmanager-qt (5.47.0-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.47.0) + * Merge with debian, notes: + - keep using dhmk and debhelper compat level = 9, see: + https://phabricator.kde.org/w/kubuntu/black-operations/pyramid/ + + -- Rik Mills Thu, 14 Jun 2018 15:50:59 +0100 + modemmanager-qt (5.46.0-1) unstable; urgency=medium * New upstream release (5.46.0). @@ -9,6 +95,27 @@ -- Maximiliano Curia Thu, 17 May 2018 22:15:46 +0200 +modemmanager-qt (5.46.0-0ubuntu3) cosmic; urgency=medium + + * Add pkg-config call to fix FTBFS from Debian + (and Rik Mills) + + -- Gianfranco Costamagna Thu, 07 Jun 2018 10:16:04 +0200 + +modemmanager-qt (5.46.0-0ubuntu2) cosmic; urgency=medium + + * Cherry-pick change from debian to fix testsuite: + - Add libglib2.0-dev as a -dev dependency + + -- Gianfranco Costamagna Thu, 07 Jun 2018 08:46:22 +0200 + +modemmanager-qt (5.46.0-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.45.0) + * New upstream release (5.46.0) + + -- Rik Mills Tue, 15 May 2018 15:58:07 +0100 + modemmanager-qt (5.45.0-1) unstable; urgency=medium * New upstream release (5.45.0). @@ -33,6 +140,12 @@ -- Maximiliano Curia Wed, 21 Mar 2018 14:41:27 +0100 +modemmanager-qt (5.44.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.44.0) + + -- Rik Mills Mon, 12 Mar 2018 19:59:38 +0000 + modemmanager-qt (5.43.0-1) experimental; urgency=medium * Use the salsa canonical urls @@ -42,6 +155,12 @@ -- Maximiliano Curia Mon, 26 Feb 2018 11:44:17 +0100 +modemmanager-qt (5.43.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.43.0) + + -- Rik Mills Sun, 11 Feb 2018 11:17:05 +0000 + modemmanager-qt (5.42.0-2) sid; urgency=medium * New revision @@ -61,6 +180,12 @@ -- Maximiliano Curia Fri, 02 Feb 2018 12:06:08 +0100 +modemmanager-qt (5.42.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.42.0) + + -- Rik Mills Fri, 26 Jan 2018 22:23:29 +0000 + modemmanager-qt (5.41.0-1) experimental; urgency=medium * New upstream release (5.41.0). @@ -70,12 +195,25 @@ -- Maximiliano Curia Fri, 15 Dec 2017 10:43:18 -0300 +modemmanager-qt (5.41.0-0ubuntu1) bionic; urgency=low + + * New upstream release (5.41.0) + + -- Walter Lapchynski Sun, 10 Dec 2017 22:08:41 -0600 + modemmanager-qt (5.41.0-0neon) xenial; urgency=medium * New release -- Neon CI Fri, 08 Dec 2017 14:49:08 +0000 +modemmanager-qt (5.40.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.39.0) + * New upstream release (5.40.0) + + -- Rik Mills Fri, 24 Nov 2017 17:18:11 +0000 + modemmanager-qt (5.40.0-0neon) xenial; urgency=medium * New release @@ -88,6 +226,12 @@ -- Neon CI Sun, 15 Oct 2017 11:47:43 +0000 +modemmanager-qt (5.38.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.38.0) + + -- Rik Mills Mon, 11 Sep 2017 13:17:35 +0100 + modemmanager-qt (5.38.0-0neon) xenial; urgency=medium * New release @@ -114,6 +258,12 @@ -- Maximiliano Curia Wed, 16 Aug 2017 10:42:24 +0200 +modemmanager-qt (5.37.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.37.0) + + -- Rik Mills Sat, 12 Aug 2017 18:48:30 +0100 + modemmanager-qt (5.37.0-0neon) xenial; urgency=medium * New release @@ -139,24 +289,48 @@ -- Maximiliano Curia Sun, 09 Jul 2017 23:41:27 +0200 +modemmanager-qt (5.36.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.36.0) + + -- José Manuel Santamaría Lema Tue, 11 Jul 2017 23:53:18 +0100 + modemmanager-qt (5.36.0-0neon) xenial; urgency=medium * New release -- Neon CI Mon, 10 Jul 2017 17:15:22 +0000 +modemmanager-qt (5.35.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.35.0) + + -- José Manuel Santamaría Lema Mon, 12 Jun 2017 22:58:29 +0100 + modemmanager-qt (5.35.0-0neon) xenial; urgency=medium * New release -- Neon CI Sun, 11 Jun 2017 20:38:04 +0000 +modemmanager-qt (5.34.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.34.0) + + -- José Manuel Santamaría Lema Mon, 15 May 2017 21:26:23 +0100 + modemmanager-qt (5.34.0-0neon) xenial; urgency=medium * New release -- Neon CI Sun, 14 May 2017 17:43:04 +0000 +modemmanager-qt (5.33.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.33.0) + + -- José Manuel Santamaría Lema Sat, 29 Apr 2017 18:05:46 +0100 + modemmanager-qt (5.33.0-0neon) xenial; urgency=medium * New release @@ -169,12 +343,24 @@ -- Neon CI Sun, 12 Mar 2017 13:24:26 +0000 +modemmanager-qt (5.31.0-0ubuntu1) zesty; urgency=low + + * New upstream release (5.31.0) + + -- José Manuel Santamaría Lema Tue, 14 Feb 2017 22:51:24 +0000 + modemmanager-qt (5.31.0-0neon) xenial; urgency=medium * New release -- Neon CI Mon, 13 Feb 2017 14:42:02 +0000 +modemmanager-qt (5.30.0-0ubuntu1) zesty; urgency=low + + * New upstream release (5.30.0) + + -- Rik Mills Wed, 01 Feb 2017 18:35:09 +0000 + modemmanager-qt (5.30.0-0neon) xenial; urgency=medium * New release @@ -197,6 +383,20 @@ -- Maximiliano Curia Fri, 18 Nov 2016 16:02:55 +0100 +modemmanager-qt (5.28.0-0ubuntu1) zesty; urgency=low + + [ Rik Mills ] + * New upstream release (5.27.0) + + [ José Manuel Santamaría Lema ] + * Update Vcs-Git field to use https:// instead of git:// + * Merge with debian + * Pass '-fno-keep-inline-functions' to gcc for the acc tests in order + to make them pass. + * New upstream release (5.28.0) + + -- José Manuel Santamaría Lema Mon, 05 Dec 2016 20:17:17 +0000 + modemmanager-qt (5.28.0-0neon) xenial; urgency=medium * New release @@ -229,6 +429,12 @@ -- Maximiliano Curia Thu, 29 Sep 2016 11:57:14 +0200 +modemmanager-qt (5.26.0-0ubuntu1) yakkety; urgency=low + + * New upstream release (5.26.0) + + -- Rik Mills Thu, 22 Sep 2016 13:51:23 +0100 + modemmanager-qt (5.26.0-0neon) xenial; urgency=medium * New release @@ -248,6 +454,12 @@ -- Neon CI Sat, 13 Aug 2016 20:17:03 +0000 +modemmanager-qt (5.24.0-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.24.0) + + -- Philip Muškovac Tue, 26 Jul 2016 08:47:45 +0000 + modemmanager-qt (5.24.0-0neon) xenial; urgency=medium * New release @@ -261,6 +473,12 @@ -- Maximiliano Curia Sat, 18 Jun 2016 08:24:47 +0200 +modemmanager-qt (5.23.0-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.23.0) + + -- Clive Johnston Mon, 11 Jul 2016 22:19:10 +0200 + modemmanager-qt (5.23.0-0neon) xenial; urgency=medium * New release @@ -275,6 +493,21 @@ -- Maximiliano Curia Wed, 18 May 2016 23:46:32 +0200 +modemmanager-qt (5.22.0-0ubuntu1) yakkety; urgency=medium + + [ Scarlett Clark ] + * New upstream release. + * Debian merge: No remaining changes. + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Clive Johnston ] + * New upstream release + + -- Clive Johnston Tue, 17 May 2016 16:42:05 -0700 + modemmanager-qt (5.22.0-0neon) xenial; urgency=medium * New release @@ -320,7 +553,7 @@ -- Maximiliano Curia Wed, 27 Jan 2016 13:33:54 +0100 -modemmanager-qt (5.18.0-0ubuntu1) UNRELEASED; urgency=medium +modemmanager-qt (5.18.0-0ubuntu1) xenial; urgency=medium [ Scarlett Clark ] * Debian merge. No remaining changes. diff -Nru modemmanager-qt-5.46.0/debian/control modemmanager-qt-5.59.0/debian/control --- modemmanager-qt-5.46.0/debian/control 2018-05-17 20:15:46.000000000 +0000 +++ modemmanager-qt-5.59.0/debian/control 2019-06-12 10:21:33.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: cmake (>= 3.0~), debhelper (>= 11~), doxygen, - extra-cmake-modules (>= 5.46.0~), + extra-cmake-modules (>= 5.59.0~), graphviz, libglib2.0-dev, libqt5sql5-sqlite, @@ -17,18 +17,18 @@ qttools5-dev-tools (>= 5.4), Standards-Version: 4.1.4 Homepage: https://projects.kde.org/projects/frameworks/modemmanager-qt -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/modemmanager-qt -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/modemmanager-qt.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/modemmanager-qt +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/modemmanager-qt Package: libkf5modemmanagerqt-doc Architecture: all Multi-Arch: foreign +Section: doc Depends: ${misc:Depends} Description: Qt wrapper library for ModemManager (documentation) Qt wrapper for ModemManager DBus API. . This package contains the qch documentation files. -Section: doc Package: libkf5modemmanagerqt6 Architecture: any @@ -40,17 +40,17 @@ This package is part of the KDE Frameworks. Package: modemmanager-qt-dev -Section: libdevel Architecture: any +Section: libdevel Depends: libglib2.0-dev, libkf5modemmanagerqt6 (= ${binary:Version}), modemmanager-dev (>= 1.0), qtbase5-dev (>= 5.8.0~), ${misc:Depends}, ${shlibs:Depends}, +Recommends: libkf5modemmanagerqt-doc (= ${source:Version}) Breaks: libkf5modemmanagerqt-dev Replaces: libkf5modemmanagerqt-dev -Recommends: libkf5modemmanagerqt-doc (= ${source:Version}) Description: Qt wrapper for ModemManager - devel files Qt wrapper for ModemManager DBus API. . diff -Nru modemmanager-qt-5.46.0/debian/libkf5modemmanagerqt6.install modemmanager-qt-5.59.0/debian/libkf5modemmanagerqt6.install --- modemmanager-qt-5.46.0/debian/libkf5modemmanagerqt6.install 2018-05-17 20:15:46.000000000 +0000 +++ modemmanager-qt-5.59.0/debian/libkf5modemmanagerqt6.install 2019-06-12 10:21:33.000000000 +0000 @@ -1,2 +1,3 @@ +etc/xdg/modemmanager-qt.categories usr/lib/*/libKF5ModemManagerQt.so.5.* usr/lib/*/libKF5ModemManagerQt.so.6 diff -Nru modemmanager-qt-5.46.0/debian/libkf5modemmanagerqt6.symbols modemmanager-qt-5.59.0/debian/libkf5modemmanagerqt6.symbols --- modemmanager-qt-5.46.0/debian/libkf5modemmanagerqt6.symbols 2018-05-17 20:15:46.000000000 +0000 +++ modemmanager-qt-5.59.0/debian/libkf5modemmanagerqt6.symbols 2019-06-12 10:21:33.000000000 +0000 @@ -1,6 +1,20 @@ -# SymbolsHelper-Confirmed: 5.14.0 alpha amd64 arm64 armel armhf hppa i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x +# SymbolsHelper-Confirmed: 5.48.0 amd64 arm64 armhf i386 ppc64el s390x libKF5ModemManagerQt.so.6 libkf5modemmanagerqt6 #MINVER# _Z25registerModemManagerTypesv@Base 5.8.50 + _ZN12ModemManager10ModemVoice10createCallERK4QMapI7QString8QVariantE@Base 5.48.0 + _ZN12ModemManager10ModemVoice10createCallERK7QString@Base 5.48.0 + _ZN12ModemManager10ModemVoice10deleteCallERK7QString@Base 5.48.0 + _ZN12ModemManager10ModemVoice11callDeletedERK7QString@Base 5.48.0 + _ZN12ModemManager10ModemVoice11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.48.0 + _ZN12ModemManager10ModemVoice11qt_metacastEPKc@Base 5.48.0 + _ZN12ModemManager10ModemVoice16staticMetaObjectE@Base 5.48.0 + _ZN12ModemManager10ModemVoice8findCallERK7QString@Base 5.48.0 + _ZN12ModemManager10ModemVoice9callAddedERK7QString@Base 5.48.0 + _ZN12ModemManager10ModemVoiceC1ERK7QStringP7QObject@Base 5.48.0 + _ZN12ModemManager10ModemVoiceC2ERK7QStringP7QObject@Base 5.48.0 + _ZN12ModemManager10ModemVoiceD0Ev@Base 5.48.0 + _ZN12ModemManager10ModemVoiceD1Ev@Base 5.48.0 + _ZN12ModemManager10ModemVoiceD2Ev@Base 5.48.0 _ZN12ModemManager11ModemDevice10findBearerERK7QString@Base 5.8.50 _ZN12ModemManager11ModemDevice10simRemovedERK7QString@Base 5.8.50 _ZN12ModemManager11ModemDevice11bearerAddedERK7QString@Base 5.8.50 @@ -167,6 +181,21 @@ _ZN12ModemManager3SmsD0Ev@Base 5.8.50 _ZN12ModemManager3SmsD1Ev@Base 5.8.50 _ZN12ModemManager3SmsD2Ev@Base 5.8.50 + _ZN12ModemManager4Call11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.48.0 + _ZN12ModemManager4Call11qt_metacastEPKc@Base 5.48.0 + _ZN12ModemManager4Call12dtmfReceivedERK7QString@Base 5.48.0 + _ZN12ModemManager4Call12stateChangedE11MMCallStateS1_17MMCallStateReason@Base 5.48.0 + _ZN12ModemManager4Call13numberChangedERK7QString@Base 5.48.0 + _ZN12ModemManager4Call16staticMetaObjectE@Base 5.48.0 + _ZN12ModemManager4Call5startEv@Base 5.48.0 + _ZN12ModemManager4Call6acceptEv@Base 5.48.0 + _ZN12ModemManager4Call6hangupEv@Base 5.48.0 + _ZN12ModemManager4Call8sendDtmfERK7QString@Base 5.48.0 + _ZN12ModemManager4CallC1ERK7QStringP7QObject@Base 5.48.0 + _ZN12ModemManager4CallC2ERK7QStringP7QObject@Base 5.48.0 + _ZN12ModemManager4CallD0Ev@Base 5.48.0 + _ZN12ModemManager4CallD1Ev@Base 5.48.0 + _ZN12ModemManager4CallD2Ev@Base 5.48.0 _ZN12ModemManager5Modem10setEnabledEb@Base 5.8.50 _ZN12ModemManager5Modem11bearerAddedERK7QString@Base 5.8.50 _ZN12ModemManager5Modem11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.8.50 @@ -325,6 +354,8 @@ _ZN12ModemManager9ModemTimeD0Ev@Base 5.8.50 _ZN12ModemManager9ModemTimeD1Ev@Base 5.8.50 _ZN12ModemManager9ModemTimeD2Ev@Base 5.8.50 + _ZNK12ModemManager10ModemVoice10metaObjectEv@Base 5.48.0 + _ZNK12ModemManager10ModemVoice5callsEv@Base 5.48.0 _ZNK12ModemManager11ModemDevice10interfacesEv@Base 5.8.50 _ZNK12ModemManager11ModemDevice10isGsmModemEv@Base 5.8.50 _ZNK12ModemManager11ModemDevice10metaObjectEv@Base 5.8.50 @@ -393,6 +424,12 @@ _ZNK12ModemManager3Sms8smsClassEv@Base 5.8.50 _ZNK12ModemManager3Sms8validityEv@Base 5.8.50 _ZNK12ModemManager3Sms9timestampEv@Base 5.8.50 + _ZNK12ModemManager4Call10metaObjectEv@Base 5.48.0 + _ZNK12ModemManager4Call11stateReasonEv@Base 5.48.0 + _ZNK12ModemManager4Call3uniEv@Base 5.48.0 + _ZNK12ModemManager4Call5stateEv@Base 5.48.0 + _ZNK12ModemManager4Call6numberEv@Base 5.48.0 + _ZNK12ModemManager4Call9directionEv@Base 5.48.0 _ZNK12ModemManager5Modem10findBearerERK7QString@Base 5.8.50 _ZNK12ModemManager5Modem10maxBearersEv@Base 5.8.50 _ZNK12ModemManager5Modem10metaObjectEv@Base 5.8.50 @@ -468,6 +505,7 @@ _ZNK12ModemManager9ModemCdma4meidEv@Base 5.8.50 _ZNK12ModemManager9ModemTime10metaObjectEv@Base 5.8.50 _ZNK12ModemManager9ModemTime15networkTimezoneEv@Base 5.8.50 + _ZTIN12ModemManager10ModemVoiceE@Base 5.48.0 _ZTIN12ModemManager11ModemDeviceE@Base 5.8.50 _ZTIN12ModemManager11ModemSignalE@Base 5.8.50 _ZTIN12ModemManager11ModemSimpleE@Base 5.8.50 @@ -477,6 +515,7 @@ _ZTIN12ModemManager14ModemMessagingE@Base 5.8.50 _ZTIN12ModemManager3SimE@Base 5.8.50 _ZTIN12ModemManager3SmsE@Base 5.8.50 + _ZTIN12ModemManager4CallE@Base 5.48.0 _ZTIN12ModemManager5ModemE@Base 5.8.50 _ZTIN12ModemManager6BearerE@Base 5.8.50 _ZTIN12ModemManager8ModemOmaE@Base 5.8.50 @@ -485,6 +524,7 @@ _ZTIN12ModemManager9Modem3gppE@Base 5.8.50 _ZTIN12ModemManager9ModemCdmaE@Base 5.8.50 _ZTIN12ModemManager9ModemTimeE@Base 5.8.50 + _ZTSN12ModemManager10ModemVoiceE@Base 5.48.0 _ZTSN12ModemManager11ModemDeviceE@Base 5.8.50 _ZTSN12ModemManager11ModemSignalE@Base 5.8.50 _ZTSN12ModemManager11ModemSimpleE@Base 5.8.50 @@ -494,6 +534,7 @@ _ZTSN12ModemManager14ModemMessagingE@Base 5.8.50 _ZTSN12ModemManager3SimE@Base 5.8.50 _ZTSN12ModemManager3SmsE@Base 5.8.50 + _ZTSN12ModemManager4CallE@Base 5.48.0 _ZTSN12ModemManager5ModemE@Base 5.8.50 _ZTSN12ModemManager6BearerE@Base 5.8.50 _ZTSN12ModemManager8ModemOmaE@Base 5.8.50 @@ -502,6 +543,7 @@ _ZTSN12ModemManager9Modem3gppE@Base 5.8.50 _ZTSN12ModemManager9ModemCdmaE@Base 5.8.50 _ZTSN12ModemManager9ModemTimeE@Base 5.8.50 + _ZTVN12ModemManager10ModemVoiceE@Base 5.48.0 _ZTVN12ModemManager11ModemDeviceE@Base 5.8.50 _ZTVN12ModemManager11ModemSignalE@Base 5.8.50 _ZTVN12ModemManager11ModemSimpleE@Base 5.8.50 @@ -511,6 +553,7 @@ _ZTVN12ModemManager14ModemMessagingE@Base 5.8.50 _ZTVN12ModemManager3SimE@Base 5.8.50 _ZTVN12ModemManager3SmsE@Base 5.8.50 + _ZTVN12ModemManager4CallE@Base 5.48.0 _ZTVN12ModemManager5ModemE@Base 5.8.50 _ZTVN12ModemManager6BearerE@Base 5.8.50 _ZTVN12ModemManager8ModemOmaE@Base 5.8.50 diff -Nru modemmanager-qt-5.46.0/debian/modemmanager-qt-dev.acc.in modemmanager-qt-5.59.0/debian/modemmanager-qt-dev.acc.in --- modemmanager-qt-5.46.0/debian/modemmanager-qt-dev.acc.in 2018-05-17 20:15:46.000000000 +0000 +++ modemmanager-qt-5.59.0/debian/modemmanager-qt-dev.acc.in 2019-06-12 10:21:33.000000000 +0000 @@ -15,6 +15,7 @@ -fPIC + -fno-keep-inline-functions -std=c++11 diff -Nru modemmanager-qt-5.46.0/modemmanager-qt.categories modemmanager-qt-5.59.0/modemmanager-qt.categories --- modemmanager-qt-5.46.0/modemmanager-qt.categories 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/modemmanager-qt.categories 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1 @@ +modemmanager-qt ModemManagerQt DEFAULT_SEVERITY [WARNING] IDENTIFIER [MMQT] diff -Nru modemmanager-qt-5.46.0/src/CMakeLists.txt modemmanager-qt-5.59.0/src/CMakeLists.txt --- modemmanager-qt-5.46.0/src/CMakeLists.txt 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/CMakeLists.txt 2019-06-01 16:41:23.000000000 +0000 @@ -54,6 +54,20 @@ ) endif() +if (${MODEMMANAGER_VERSION} VERSION_EQUAL 1.6.0 OR ${MODEMMANAGER_VERSION} VERSION_GREATER 1.6.0) + set(ModemManagerQt_SRCS + ${ModemManagerQt_SRCS} + modemvoice.cpp + call.cpp + ) + + set(DBUS_INTERFACES_FILES + ${DBUS_INTERFACES_FILES} + dbus/callinterface.cpp + dbus/voiceinterface.cpp + ) +endif() + add_library(KF5ModemManagerQt SHARED ${ModemManagerQt_SRCS} ${DBUS_INTERFACES_FILES}) generate_export_header(KF5ModemManagerQt BASE_NAME ModemManagerQt) add_library(KF5::ModemManagerQt ALIAS KF5ModemManagerQt) @@ -78,6 +92,7 @@ ecm_generate_headers(ModemManagerQt_HEADERS HEADER_NAMES + Call Bearer GenericTypes Interface @@ -94,6 +109,7 @@ ModemSimple ModemTime ModemOma + ModemVoice Sim Sms diff -Nru modemmanager-qt-5.46.0/src/bearer.cpp modemmanager-qt-5.59.0/src/bearer.cpp --- modemmanager-qt-5.46.0/src/bearer.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/bearer.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/call.cpp modemmanager-qt-5.59.0/src/call.cpp --- modemmanager-qt-5.46.0/src/call.cpp 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/call.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,157 @@ +/* + Copyright 2018 Aleksander Morgado + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#include "call.h" +#include "call_p.h" +#include "mmdebug_p.h" + +#ifdef MMQT_STATIC +#include "dbus/fakedbus.h" +#else +#include "dbus/dbus.h" +#endif + +#include + +ModemManager::CallPrivate::CallPrivate(const QString &path, Call *q) +#ifdef MMQT_STATIC + : callIface(QLatin1String(MMQT_DBUS_SERVICE), path, QDBusConnection::sessionBus()) +#else + : callIface(QLatin1String(MMQT_DBUS_SERVICE), path, QDBusConnection::systemBus()) +#endif + , q_ptr(q) +{ + if (callIface.isValid()) { + uni = path; + state = (MMCallState) callIface.state(); + stateReason = (MMCallStateReason) callIface.stateReason(); + direction = (MMCallDirection) callIface.direction(); + number = callIface.number(); + } +} + +ModemManager::Call::Call(const QString &path, QObject *parent) + : QObject(parent) + , d_ptr(new CallPrivate(path, this)) +{ + Q_D(Call); + + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + +#ifdef MMQT_STATIC + QDBusConnection::sessionBus().connect(QLatin1String(MMQT_DBUS_SERVICE), path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"), d, + SLOT(onPropertiesChanged(QString,QVariantMap,QStringList))); +#else + QDBusConnection::systemBus().connect(QLatin1String(MMQT_DBUS_SERVICE), path, QLatin1String(DBUS_INTERFACE_PROPS), QStringLiteral("PropertiesChanged"), d, + SLOT(onPropertiesChanged(QString,QVariantMap,QStringList))); +#endif + + connect(&d->callIface, &OrgFreedesktopModemManager1CallInterface::StateChanged, d, &CallPrivate::onStateChanged); + connect(&d->callIface, &OrgFreedesktopModemManager1CallInterface::DtmfReceived, d, &CallPrivate::onDtmfReceived); +} + +ModemManager::Call::~Call() +{ + delete d_ptr; +} + +QString ModemManager::Call::uni() const +{ + Q_D(const Call); + return d->uni; +} + +QDBusPendingReply<> ModemManager::Call::start() +{ + Q_D(Call); + return d->callIface.Start(); +} + +QDBusPendingReply<> ModemManager::Call::accept() +{ + Q_D(Call); + return d->callIface.Accept(); +} + +QDBusPendingReply<> ModemManager::Call::hangup() +{ + Q_D(Call); + return d->callIface.Hangup(); +} + +QDBusPendingReply<> ModemManager::Call::sendDtmf(const QString &dtmf) +{ + Q_D(Call); + return d->callIface.SendDtmf(dtmf); +} + +MMCallState ModemManager::Call::state() const +{ + Q_D(const Call); + return d->state; +} + +MMCallStateReason ModemManager::Call::stateReason() const +{ + Q_D(const Call); + return d->stateReason; +} + +MMCallDirection ModemManager::Call::direction() const +{ + Q_D(const Call); + return d->direction; +} + +QString ModemManager::Call::number() const +{ + Q_D(const Call); + return d->number; +} + +void ModemManager::CallPrivate::onStateChanged(int oldState, int newState, uint reason) +{ + Q_Q(Call); + state = (MMCallState)newState; + stateReason = (MMCallStateReason)reason; + Q_EMIT q->stateChanged((MMCallState) oldState, (MMCallState) newState, (MMCallStateReason) reason); +} + +void ModemManager::CallPrivate::onDtmfReceived(const QString &dtmf) +{ + Q_Q(Call); + Q_EMIT q->dtmfReceived(dtmf); +} + +void ModemManager::CallPrivate::onPropertiesChanged(const QString &interfaceName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties) +{ + Q_UNUSED(invalidatedProperties); + Q_Q(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(); + Q_EMIT q->numberChanged(number); + } + } +} diff -Nru modemmanager-qt-5.46.0/src/call.h modemmanager-qt-5.59.0/src/call.h --- modemmanager-qt-5.46.0/src/call.h 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/call.h 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,108 @@ +/* + Copyright 2018 Aleksander Morgado + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef MODEMMANAGERQT_CALL_H +#define MODEMMANAGERQT_CALL_H + +#include + +#include +#include +#include + +#include "generictypes.h" + +namespace ModemManager +{ + +class CallPrivate; + +/** +* Provides an interface to manipulate and control a call +* +* Note: MMCallState, MMCallStateReason and MMCallDirection enums are defined in +* See http://www.freedesktop.org/software/ModemManager/api/latest/ModemManager-Flags-and-Enumerations.html +*/ +class MODEMMANAGERQT_EXPORT Call : public QObject +{ +Q_OBJECT +Q_DECLARE_PRIVATE(Call) + +public: + typedef QSharedPointer Ptr; + typedef QList List; + + explicit Call(const QString &path, QObject *parent = nullptr); + ~Call(); + + QString uni() const; + + /** + * Start a call + */ + QDBusPendingReply<> start(); + + /** + * Accept a call + */ + QDBusPendingReply<> accept(); + + /** + * Hangup a call + */ + QDBusPendingReply<> hangup(); + + /** + * Send DTMF + */ + QDBusPendingReply<> sendDtmf(const QString &dtmf); + + /** + * This method returns the state of the call + */ + MMCallState state() const; + + /** + * This method returns the reason for the call state change + */ + MMCallStateReason stateReason() const; + + /** + * This method returns the direction of the call + */ + MMCallDirection direction() const; + + /** + * This method returns the remote phone number + */ + QString number() const; + +Q_SIGNALS: + void stateChanged(MMCallState oldState, MMCallState newState, MMCallStateReason reason); + void numberChanged(const QString &number); + void dtmfReceived(const QString &dtmf); + +private: + CallPrivate *const d_ptr; +}; + +} // namespace ModemManager + +#endif diff -Nru modemmanager-qt-5.46.0/src/call_p.h modemmanager-qt-5.59.0/src/call_p.h --- modemmanager-qt-5.46.0/src/call_p.h 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/call_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,53 @@ +/* + Copyright 2018 Aleksander Morgado + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef MODEMMANAGER_CALL_P_H +#define MODEMMANAGER_CALL_P_H + +#include "dbus/callinterface.h" +#include "call.h" + +namespace ModemManager +{ + +class CallPrivate : public QObject +{ + Q_OBJECT +public: + explicit CallPrivate(const QString &path, Call *q); + OrgFreedesktopModemManager1CallInterface callIface; + + QString uni; + MMCallState state; + MMCallStateReason stateReason; + MMCallDirection direction; + QString number; + + Q_DECLARE_PUBLIC(Call) + Call *q_ptr; +private Q_SLOTS: + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps); + void onStateChanged(int oldState, int newState, uint reason); + void onDtmfReceived(const QString &dtmf); +}; + +} // namespace ModemManager + +#endif diff -Nru modemmanager-qt-5.46.0/src/dbus/CMakeLists.txt modemmanager-qt-5.59.0/src/dbus/CMakeLists.txt --- modemmanager-qt-5.46.0/src/dbus/CMakeLists.txt 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/CMakeLists.txt 2019-06-01 16:41:23.000000000 +0000 @@ -2,6 +2,7 @@ add_definitions(${QT_DEFINITIONS}) set( INTERFACE_INTROSPECTION_XML_FILES + introspection/org.freedesktop.ModemManager1.Call.xml introspection/org.freedesktop.ModemManager1.Bearer.xml introspection/org.freedesktop.ModemManager1.Modem.Firmware.xml introspection/org.freedesktop.ModemManager1.Modem.Location.xml @@ -13,6 +14,7 @@ introspection/org.freedesktop.ModemManager1.Modem.Signal.xml introspection/org.freedesktop.ModemManager1.Modem.Simple.xml introspection/org.freedesktop.ModemManager1.Modem.Time.xml + introspection/org.freedesktop.ModemManager1.Modem.Voice.xml introspection/org.freedesktop.ModemManager1.Modem.xml introspection/org.freedesktop.ModemManager1.Sim.xml introspection/org.freedesktop.ModemManager1.Sms.xml diff -Nru modemmanager-qt-5.46.0/src/dbus/bearerinterface.h modemmanager-qt-5.59.0/src/dbus/bearerinterface.h --- modemmanager-qt-5.46.0/src/dbus/bearerinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/bearerinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_BEARERINTERFACE_H #define MODEMMANAGERQT_BEARERINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/callinterface.cpp modemmanager-qt-5.59.0/src/dbus/callinterface.cpp --- modemmanager-qt-5.46.0/src/dbus/callinterface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/callinterface.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,25 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -N -m -i generictypes.h -p callinterface ./introspection/org.freedesktop.ModemManager1.Call.xml + * + * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd. + * + * This is an auto-generated file. + * This file may have been hand-edited. Look for HAND-EDIT comments + * before re-generating it. + */ + +#include "callinterface.h" + +/* + * Implementation of interface class OrgFreedesktopModemManager1CallInterface + */ + +OrgFreedesktopModemManager1CallInterface::OrgFreedesktopModemManager1CallInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) + : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) +{ +} + +OrgFreedesktopModemManager1CallInterface::~OrgFreedesktopModemManager1CallInterface() +{ +} diff -Nru modemmanager-qt-5.46.0/src/dbus/callinterface.h modemmanager-qt-5.59.0/src/dbus/callinterface.h --- modemmanager-qt-5.46.0/src/dbus/callinterface.h 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/callinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,86 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -N -m -i generictypes.h -p callinterface ./introspection/org.freedesktop.ModemManager1.Call.xml + * + * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd. + * + * This is an auto-generated file. + * Do not edit! All changes made to it will be lost. + */ + +#ifndef CALLINTERFACE_H +#define CALLINTERFACE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include "generictypes.h" + +/* + * Proxy class for interface org.freedesktop.ModemManager1.Call + */ +class OrgFreedesktopModemManager1CallInterface: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticInterfaceName() + { return "org.freedesktop.ModemManager1.Call"; } + +public: + OrgFreedesktopModemManager1CallInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); + + ~OrgFreedesktopModemManager1CallInterface(); + + Q_PROPERTY(int Direction READ direction) + inline int direction() const + { return qvariant_cast< int >(property("Direction")); } + + Q_PROPERTY(QString Number READ number) + inline QString number() const + { return qvariant_cast< QString >(property("Number")); } + + Q_PROPERTY(int State READ state) + inline int state() const + { return qvariant_cast< int >(property("State")); } + + Q_PROPERTY(int StateReason READ stateReason) + inline int stateReason() const + { return qvariant_cast< int >(property("StateReason")); } + +public Q_SLOTS: // METHODS + inline QDBusPendingReply<> Accept() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("Accept"), argumentList); + } + + inline QDBusPendingReply<> Hangup() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("Hangup"), argumentList); + } + + inline QDBusPendingReply<> SendDtmf(const QString &dtmf) + { + QList argumentList; + argumentList << QVariant::fromValue(dtmf); + return asyncCallWithArgumentList(QStringLiteral("SendDtmf"), argumentList); + } + + inline QDBusPendingReply<> Start() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("Start"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void DtmfReceived(const QString &dtmf); + void StateChanged(int oldState, int newState, uint reason); +}; + +#endif diff -Nru modemmanager-qt-5.46.0/src/dbus/dbus.h modemmanager-qt-5.59.0/src/dbus/dbus.h --- modemmanager-qt-5.46.0/src/dbus/dbus.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/dbus.h 2019-06-01 16:41:23.000000000 +0000 @@ -36,11 +36,13 @@ #define MMQT_DBUS_BEARER_PREFIX MM_DBUS_PATH "/Bearer" #define MMQT_DBUS_SIM_PREFIX MM_DBUS_PATH "/SIM" #define MMQT_DBUS_SMS_PREFIX MM_DBUS_PATH "/SMS" +#define MMQT_DBUS_CALL_PREFIX MM_DBUS_PATH "/Call" /* Interfaces */ #define MMQT_DBUS_INTERFACE MM_DBUS_INTERFACE #define MMQT_DBUS_INTERFACE_SIM MM_DBUS_INTERFACE_SIM #define MMQT_DBUS_INTERFACE_BEARER MM_DBUS_INTERFACE_BEARER #define MMQT_DBUS_INTERFACE_SMS MM_DBUS_INTERFACE_SMS +#define MMQT_DBUS_INTERFACE_CALL MM_DBUS_INTERFACE_CALL #define MMQT_DBUS_INTERFACE_MODEM MM_DBUS_INTERFACE_MODEM #define MMQT_DBUS_INTERFACE_MODEM_SIMPLE "org.freedesktop.ModemManager1.Modem.Simple" #define MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP MM_DBUS_INTERFACE_MODEM_MODEM3GPP @@ -52,5 +54,6 @@ #define MMQT_DBUS_INTERFACE_MODEM_FIRMWARE MM_DBUS_INTERFACE_MODEM_FIRMWARE #define MMQT_DBUS_INTERFACE_MODEM_SIGNAL MM_DBUS_INTERFACE_MODEM_SIGNAL #define MMQT_DBUS_INTERFACE_MODEM_OMA MM_DBUS_INTERFACE_MODEM_OMA +#define MMQT_DBUS_INTERFACE_MODEM_VOICE MM_DBUS_INTERFACE_MODEM_VOICE #endif diff -Nru modemmanager-qt-5.46.0/src/dbus/dbus_manager.h modemmanager-qt-5.59.0/src/dbus/dbus_manager.h --- modemmanager-qt-5.46.0/src/dbus/dbus_manager.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/dbus_manager.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_DBUS_MANAGER_H #define MODEMMANAGERQT_DBUS_MANAGER_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" #include "generictypes_p.h" diff -Nru modemmanager-qt-5.46.0/src/dbus/fakedbus.h modemmanager-qt-5.59.0/src/dbus/fakedbus.h --- modemmanager-qt-5.46.0/src/dbus/fakedbus.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/fakedbus.h 2019-06-01 16:41:23.000000000 +0000 @@ -36,11 +36,13 @@ #define MMQT_DBUS_BEARER_PREFIX MMQT_DBUS_PATH "/Bearer" #define MMQT_DBUS_SIM_PREFIX MMQT_DBUS_PATH "/SIM" #define MMQT_DBUS_SMS_PREFIX MMQT_DBUS_PATH "/SMS" +#define MMQT_DBUS_CALL_PREFIX MMQT_DBUS_PATH "/Call" /* Interfaces */ #define MMQT_DBUS_INTERFACE "org.kde.fakemodem" #define MMQT_DBUS_INTERFACE_SIM "org.kde.fakemodem.Sim" #define MMQT_DBUS_INTERFACE_BEARER "org.kde.fakemodem.Bearer" #define MMQT_DBUS_INTERFACE_SMS "org.kde.fakemodem.Sms" +#define MMQT_DBUS_INTERFACE_CALL "org.kde.fakemodem.Call" #define MMQT_DBUS_INTERFACE_MODEM "org.kde.fakemodem.Modem" #define MMQT_DBUS_INTERFACE_MODEM_SIMPLE "org.kde.fakemodem.Modem.Simple" #define MMQT_DBUS_INTERFACE_MODEM_MODEM3GPP "org.kde.fakemodem.Modem.Modem3gpp" @@ -52,5 +54,6 @@ #define MMQT_DBUS_INTERFACE_MODEM_FIRMWARE "org.kde.fakemodem.Modem.Firmware" #define MMQT_DBUS_INTERFACE_MODEM_SIGNAL "org.kde.fakemodem.Modem.Signal" #define MMQT_DBUS_INTERFACE_MODEM_OMA "org.kde.fakemodem.Modem.Oma" +#define MMQT_DBUS_INTERFACE_MODEM_VOICE "org.kde.fakemodem.Modem.Voice" #endif diff -Nru modemmanager-qt-5.46.0/src/dbus/firmwareinterface.h modemmanager-qt-5.59.0/src/dbus/firmwareinterface.h --- modemmanager-qt-5.46.0/src/dbus/firmwareinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/firmwareinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_FIRMWAREINTERFACE_H #define MODEMMANAGERQT_FIRMWAREINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/introspection/org.freedesktop.ModemManager1.Call.xml modemmanager-qt-5.59.0/src/dbus/introspection/org.freedesktop.ModemManager1.Call.xml --- modemmanager-qt-5.46.0/src/dbus/introspection/org.freedesktop.ModemManager1.Call.xml 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/introspection/org.freedesktop.ModemManager1.Call.xml 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru modemmanager-qt-5.46.0/src/dbus/introspection/org.freedesktop.ModemManager1.Modem.Voice.xml modemmanager-qt-5.59.0/src/dbus/introspection/org.freedesktop.ModemManager1.Modem.Voice.xml --- modemmanager-qt-5.46.0/src/dbus/introspection/org.freedesktop.ModemManager1.Modem.Voice.xml 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/introspection/org.freedesktop.ModemManager1.Modem.Voice.xml 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru modemmanager-qt-5.46.0/src/dbus/locationinterface.h modemmanager-qt-5.59.0/src/dbus/locationinterface.h --- modemmanager-qt-5.46.0/src/dbus/locationinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/locationinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_LOCATIONINTERFACE_H #define MODEMMANAGERQT_LOCATIONINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/messaginginterface.h modemmanager-qt-5.59.0/src/dbus/messaginginterface.h --- modemmanager-qt-5.46.0/src/dbus/messaginginterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/messaginginterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_MESSAGINGINTERFACE_H #define MODEMMANAGERQT_MESSAGINGINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" #include "generictypes_p.h" diff -Nru modemmanager-qt-5.46.0/src/dbus/modem3gppinterface.h modemmanager-qt-5.59.0/src/dbus/modem3gppinterface.h --- modemmanager-qt-5.46.0/src/dbus/modem3gppinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/modem3gppinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_MODEM3GPPINTERFACE_H #define MODEMMANAGERQT_MODEM3GPPINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/modemcdmainterface.h modemmanager-qt-5.59.0/src/dbus/modemcdmainterface.h --- modemmanager-qt-5.46.0/src/dbus/modemcdmainterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/modemcdmainterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_MODEMCDMAINTERFACE_H #define MODEMMANAGERQT_MODEMCDMAINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/modeminterface.h modemmanager-qt-5.59.0/src/dbus/modeminterface.h --- modemmanager-qt-5.46.0/src/dbus/modeminterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/modeminterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_MODEMINTERFACE_H #define MODEMMANAGERQT_MODEMINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" #include "generictypes_p.h" diff -Nru modemmanager-qt-5.46.0/src/dbus/modemmanager1interface.h modemmanager-qt-5.59.0/src/dbus/modemmanager1interface.h --- modemmanager-qt-5.46.0/src/dbus/modemmanager1interface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/modemmanager1interface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_MODEMMANAGER1INTERFACE_H #define MODEMMANAGERQT_MODEMMANAGER1INTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/omainterface.h modemmanager-qt-5.59.0/src/dbus/omainterface.h --- modemmanager-qt-5.46.0/src/dbus/omainterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/omainterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_OMAINTERFACE_H #define MODEMMANAGERQT_OMAINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/signalinterface.h modemmanager-qt-5.59.0/src/dbus/signalinterface.h --- modemmanager-qt-5.46.0/src/dbus/signalinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/signalinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_SIGNALINTERFACE_H #define MODEMMANAGERQT_SIGNALINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/siminterface.h modemmanager-qt-5.59.0/src/dbus/siminterface.h --- modemmanager-qt-5.46.0/src/dbus/siminterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/siminterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_SIMINTERFACE_H #define MODEMMANAGERQT_SIMINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/simpleinterface.h modemmanager-qt-5.59.0/src/dbus/simpleinterface.h --- modemmanager-qt-5.46.0/src/dbus/simpleinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/simpleinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_SIMPLEINTERFACE_H #define MODEMMANAGERQT_SIMPLEINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/smsinterface.h modemmanager-qt-5.59.0/src/dbus/smsinterface.h --- modemmanager-qt-5.46.0/src/dbus/smsinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/smsinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_SMSINTERFACE_H #define MODEMMANAGERQT_SMSINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/timeinterface.h modemmanager-qt-5.59.0/src/dbus/timeinterface.h --- modemmanager-qt-5.46.0/src/dbus/timeinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/timeinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_TIMEINTERFACE_H #define MODEMMANAGERQT_TIMEINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/ussdinterface.h modemmanager-qt-5.59.0/src/dbus/ussdinterface.h --- modemmanager-qt-5.46.0/src/dbus/ussdinterface.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/ussdinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -11,14 +11,14 @@ #ifndef MODEMMANAGERQT_USSDINTERFACE_H #define MODEMMANAGERQT_USSDINTERFACE_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "generictypes.h" /* diff -Nru modemmanager-qt-5.46.0/src/dbus/voiceinterface.cpp modemmanager-qt-5.59.0/src/dbus/voiceinterface.cpp --- modemmanager-qt-5.46.0/src/dbus/voiceinterface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/voiceinterface.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,25 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -N -m -i generictypes.h -p voiceinterface ./introspection/org.freedesktop.ModemManager1.Modem.Voice.xml + * + * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd. + * + * This is an auto-generated file. + * This file may have been hand-edited. Look for HAND-EDIT comments + * before re-generating it. + */ + +#include "voiceinterface.h" + +/* + * Implementation of interface class OrgFreedesktopModemManager1ModemVoiceInterface + */ + +OrgFreedesktopModemManager1ModemVoiceInterface::OrgFreedesktopModemManager1ModemVoiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) + : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) +{ +} + +OrgFreedesktopModemManager1ModemVoiceInterface::~OrgFreedesktopModemManager1ModemVoiceInterface() +{ +} diff -Nru modemmanager-qt-5.46.0/src/dbus/voiceinterface.h modemmanager-qt-5.59.0/src/dbus/voiceinterface.h --- modemmanager-qt-5.46.0/src/dbus/voiceinterface.h 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/dbus/voiceinterface.h 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,69 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -N -m -i generictypes.h -p voiceinterface ./introspection/org.freedesktop.ModemManager1.Modem.Voice.xml + * + * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd. + * + * This is an auto-generated file. + * Do not edit! All changes made to it will be lost. + */ + +#ifndef VOICEINTERFACE_H +#define VOICEINTERFACE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include "generictypes.h" + +/* + * Proxy class for interface org.freedesktop.ModemManager1.Modem.Voice + */ +class OrgFreedesktopModemManager1ModemVoiceInterface: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticInterfaceName() + { return "org.freedesktop.ModemManager1.Modem.Voice"; } + +public: + OrgFreedesktopModemManager1ModemVoiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); + + ~OrgFreedesktopModemManager1ModemVoiceInterface(); + + Q_PROPERTY(QList Calls READ calls) + inline QList calls() const + { return qvariant_cast< QList >(property("Calls")); } + +public Q_SLOTS: // METHODS + inline QDBusPendingReply CreateCall(const QVariantMap &properties) + { + QList argumentList; + argumentList << QVariant::fromValue(properties); + return asyncCallWithArgumentList(QStringLiteral("CreateCall"), argumentList); + } + + inline QDBusPendingReply<> DeleteCall(const QDBusObjectPath &path) + { + QList argumentList; + argumentList << QVariant::fromValue(path); + return asyncCallWithArgumentList(QStringLiteral("DeleteCall"), argumentList); + } + + inline QDBusPendingReply > ListCalls() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("ListCalls"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void CallAdded(const QDBusObjectPath &path); + void CallDeleted(const QDBusObjectPath &path); +}; + +#endif diff -Nru modemmanager-qt-5.46.0/src/fakemodem/fakemodem.cpp modemmanager-qt-5.59.0/src/fakemodem/fakemodem.cpp --- modemmanager-qt-5.46.0/src/fakemodem/fakemodem.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/fakemodem/fakemodem.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/fakemodem/modemmessaging.cpp modemmanager-qt-5.59.0/src/fakemodem/modemmessaging.cpp --- modemmanager-qt-5.46.0/src/fakemodem/modemmessaging.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/fakemodem/modemmessaging.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/fakemodem/modemtime.cpp modemmanager-qt-5.59.0/src/fakemodem/modemtime.cpp --- modemmanager-qt-5.46.0/src/fakemodem/modemtime.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/fakemodem/modemtime.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/generictypes.cpp modemmanager-qt-5.59.0/src/generictypes.cpp --- modemmanager-qt-5.46.0/src/generictypes.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/generictypes.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -183,7 +183,7 @@ variantMapList.clear(); while (!argument.atEnd()) { - QList element; + QVariantMap element; argument >> element; variantMapList.append( element ); } diff -Nru modemmanager-qt-5.46.0/src/generictypes.h modemmanager-qt-5.59.0/src/generictypes.h --- modemmanager-qt-5.46.0/src/generictypes.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/generictypes.h 2019-06-01 16:41:23.000000000 +0000 @@ -27,7 +27,7 @@ #include #include -#include +#include // Enums from ModemManager-enums.h which needs to be defined all the time, // because it's not possible to use MM_CHECK_VERSION for signals @@ -173,6 +173,11 @@ Q_DECLARE_METATYPE(MMSmsCdmaServiceCategory) Q_DECLARE_METATYPE(MMSmsCdmaTeleserviceId) #endif +#if MM_CHECK_VERSION(1, 6, 0) +Q_DECLARE_METATYPE(MMCallState) +Q_DECLARE_METATYPE(MMCallStateReason) +Q_DECLARE_METATYPE(MMCallDirection) +#endif // Others Q_DECLARE_METATYPE(ModemManager::DBUSManagerStruct) diff -Nru modemmanager-qt-5.46.0/src/manager.cpp modemmanager-qt-5.59.0/src/manager.cpp --- modemmanager-qt-5.46.0/src/manager.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/manager.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -40,39 +40,36 @@ 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 { - QLoggingCategory::setFilterRules(QStringLiteral("modemmaanger-qt.debug = true")); - QLoggingCategory::setFilterRules(QStringLiteral("modemmanager-qt.warning = true")); - qDBusRegisterMetaType >(); registerModemManagerTypes(); 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 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 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; } } @@ -104,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()); @@ -170,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; } @@ -182,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); } } @@ -195,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; } @@ -204,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 -Nru modemmanager-qt-5.46.0/src/modem.cpp modemmanager-qt-5.59.0/src/modem.cpp --- modemmanager-qt-5.46.0/src/modem.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modem.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/modem3gpp.cpp modemmanager-qt-5.59.0/src/modem3gpp.cpp --- modemmanager-qt-5.46.0/src/modem3gpp.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modem3gpp.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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(); #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 -Nru modemmanager-qt-5.46.0/src/modem3gpp_p.h modemmanager-qt-5.59.0/src/modem3gpp_p.h --- modemmanager-qt-5.46.0/src/modem3gpp_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modem3gpp_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -48,7 +48,7 @@ Q_DECLARE_PUBLIC(Modem3gpp) Modem3gpp *q_ptr; private Q_SLOTS: - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; }; } // namespace ModemManager diff -Nru modemmanager-qt-5.46.0/src/modem3gppussd.cpp modemmanager-qt-5.59.0/src/modem3gppussd.cpp --- modemmanager-qt-5.46.0/src/modem3gppussd.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modem3gppussd.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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(); #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 -Nru modemmanager-qt-5.46.0/src/modem3gppussd_p.h modemmanager-qt-5.59.0/src/modem3gppussd_p.h --- modemmanager-qt-5.46.0/src/modem3gppussd_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modem3gppussd_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -44,7 +44,7 @@ Q_DECLARE_PUBLIC(Modem3gppUssd) Modem3gppUssd *q_ptr; private Q_SLOTS: - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; }; } // namespace ModemManager diff -Nru modemmanager-qt-5.46.0/src/modem_p.h modemmanager-qt-5.59.0/src/modem_p.h --- modemmanager-qt-5.46.0/src/modem_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modem_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -75,7 +75,7 @@ Modem *q_ptr; private Q_SLOTS: void initializeBearers(); - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; void onStateChanged(int oldState, int newState, uint reason); }; diff -Nru modemmanager-qt-5.46.0/src/modemcdma.cpp modemmanager-qt-5.59.0/src/modemcdma.cpp --- modemmanager-qt-5.46.0/src/modemcdma.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemcdma.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/modemcdma_p.h modemmanager-qt-5.59.0/src/modemcdma_p.h --- modemmanager-qt-5.46.0/src/modemcdma_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemcdma_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -48,7 +48,7 @@ ModemCdma *q_ptr; private Q_SLOTS: void onActivationStateChanged(uint activation_state, uint activation_error, const QVariantMap &status_changes); - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; }; } // namespace ModemManager diff -Nru modemmanager-qt-5.46.0/src/modemdevice.cpp modemmanager-qt-5.59.0/src/modemdevice.cpp --- modemmanager-qt-5.46.0/src/modemdevice.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemdevice.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 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 -Nru modemmanager-qt-5.46.0/src/modemfirmware.cpp modemmanager-qt-5.59.0/src/modemfirmware.cpp --- modemmanager-qt-5.46.0/src/modemfirmware.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemfirmware.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/modemlocation.cpp modemmanager-qt-5.59.0/src/modemlocation.cpp --- modemmanager-qt-5.46.0/src/modemlocation.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemlocation.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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(); #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 -Nru modemmanager-qt-5.46.0/src/modemlocation_p.h modemmanager-qt-5.59.0/src/modemlocation_p.h --- modemmanager-qt-5.46.0/src/modemlocation_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemlocation_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -44,7 +44,7 @@ Q_DECLARE_PUBLIC(ModemLocation) ModemLocation *q_ptr; private Q_SLOTS: - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; }; } // namespace ModemManager diff -Nru modemmanager-qt-5.46.0/src/modemmessaging.cpp modemmanager-qt-5.59.0/src/modemmessaging.cpp --- modemmanager-qt-5.46.0/src/modemmessaging.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemmessaging.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 messages = d->modemMessagingIface.messages(); @@ -165,9 +165,9 @@ QDBusPendingReply 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(); } diff -Nru modemmanager-qt-5.46.0/src/modemmessaging_p.h modemmanager-qt-5.59.0/src/modemmessaging_p.h --- modemmanager-qt-5.46.0/src/modemmessaging_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemmessaging_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -46,7 +46,7 @@ Q_DECLARE_PUBLIC(ModemMessaging) ModemMessaging *q_ptr; private Q_SLOTS: - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; void onMessageAdded(const QDBusObjectPath &path, bool received); void onMessageDeleted(const QDBusObjectPath &path); }; diff -Nru modemmanager-qt-5.46.0/src/modemoma.cpp modemmanager-qt-5.59.0/src/modemoma.cpp --- modemmanager-qt-5.46.0/src/modemoma.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemoma.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/modemoma_p.h modemmanager-qt-5.59.0/src/modemoma_p.h --- modemmanager-qt-5.46.0/src/modemoma_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemoma_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -44,7 +44,7 @@ ModemOma *q_ptr; private Q_SLOTS: void onSessionStateChanged(int oldState, int newState, uint failedReason); - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; }; } // namespace ModemManager diff -Nru modemmanager-qt-5.46.0/src/modemsignal.cpp modemmanager-qt-5.59.0/src/modemsignal.cpp --- modemmanager-qt-5.46.0/src/modemsignal.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemsignal.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/modemsignal_p.h modemmanager-qt-5.59.0/src/modemsignal_p.h --- modemmanager-qt-5.46.0/src/modemsignal_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemsignal_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -45,7 +45,7 @@ Q_DECLARE_PUBLIC(ModemSignal) ModemSignal *q_ptr; private Q_SLOTS: - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; }; } // namespace ModemManager diff -Nru modemmanager-qt-5.46.0/src/modemsimple.cpp modemmanager-qt-5.59.0/src/modemsimple.cpp --- modemmanager-qt-5.46.0/src/modemsimple.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemsimple.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/modemtime.cpp modemmanager-qt-5.59.0/src/modemtime.cpp --- modemmanager-qt-5.46.0/src/modemtime.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemtime.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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(*it)); diff -Nru modemmanager-qt-5.46.0/src/modemtime_p.h modemmanager-qt-5.59.0/src/modemtime_p.h --- modemmanager-qt-5.46.0/src/modemtime_p.h 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemtime_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -42,7 +42,7 @@ ModemTime *q_ptr; private Q_SLOTS: void onNetworkTimeChanged(const QString &isoDateTime); - void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE; + void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) override; }; } // namespace ModemManager diff -Nru modemmanager-qt-5.46.0/src/modemvoice.cpp modemmanager-qt-5.59.0/src/modemvoice.cpp --- modemmanager-qt-5.46.0/src/modemvoice.cpp 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemvoice.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,149 @@ +/* + Copyright 2018 Aleksander Morgado + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#include "modemvoice.h" +#include "modemvoice_p.h" + +#ifdef MMQT_STATIC +#include "dbus/fakedbus.h" +#else +#include "dbus/dbus.h" +#endif +#include "mmdebug_p.h" + +#include "call.h" +#include + +ModemManager::ModemVoicePrivate::ModemVoicePrivate(const QString &path, ModemVoice *q) + : InterfacePrivate(path, q) +#ifdef MMQT_STATIC + , modemVoiceIface(QLatin1String(MMQT_DBUS_SERVICE), path, QDBusConnection::sessionBus()) +#else + , modemVoiceIface(QLatin1String(MMQT_DBUS_SERVICE), path, QDBusConnection::systemBus()) +#endif + , q_ptr(q) +{ + if (modemVoiceIface.isValid()) { + connect(&modemVoiceIface, &OrgFreedesktopModemManager1ModemVoiceInterface::CallAdded, this, &ModemVoicePrivate::onCallAdded); + connect(&modemVoiceIface, &OrgFreedesktopModemManager1ModemVoiceInterface::CallDeleted, this, &ModemVoicePrivate::onCallDeleted); + } +} + +ModemManager::ModemVoice::ModemVoice(const QString &path, QObject *parent) + : Interface(*new ModemVoicePrivate(path, this), parent) +{ + Q_D(ModemVoice); + + // Note: no need to listen for PropertiesChanged signals. Additions and + // removals of calls are already notified via CallAdded and CallRemoved + + QList calls = d->modemVoiceIface.calls(); + Q_FOREACH (const QDBusObjectPath &op, calls) { + const QString path = op.path(); + d->callList.insert(path, ModemManager::Call::Ptr()); + Q_EMIT callAdded(path); + } +} + +ModemManager::ModemVoice::~ModemVoice() +{ +} + +ModemManager::Call::Ptr ModemManager::ModemVoicePrivate::findCall(const QString &uni) +{ + ModemManager::Call::Ptr call; + if (callList.contains(uni)) { + if (callList.value(uni)) { + call = callList.value(uni); + } else { + call = ModemManager::Call::Ptr(new ModemManager::Call(uni), &QObject::deleteLater); + callList[uni] = call; + } + } + return call; +} + +ModemManager::Call::List ModemManager::ModemVoicePrivate::ModemVoicePrivate::calls() +{ + ModemManager::Call::List list; + + QMap::const_iterator i; + for (i = callList.constBegin(); i != callList.constEnd(); ++i) { + ModemManager::Call::Ptr call = findCall(i.key()); + if (call) { + list.append(call); + } else { + qCWarning(MMQT) << "warning: null call for" << i.key(); + } + } + + return list; +} + +void ModemManager::ModemVoicePrivate::onCallAdded(const QDBusObjectPath &path) +{ + Q_Q(ModemVoice); + callList.insert(path.path(), ModemManager::Call::Ptr()); + Q_EMIT q->callAdded(path.path()); +} + +void ModemManager::ModemVoicePrivate::onCallDeleted(const QDBusObjectPath &path) +{ + Q_Q(ModemVoice); + callList.remove(path.path()); + Q_EMIT q->callDeleted(path.path()); +} + +ModemManager::Call::List ModemManager::ModemVoice::calls() const +{ + Q_D(const ModemVoice); + return const_cast(d)->calls(); +} + +QDBusPendingReply ModemManager::ModemVoice::createCall(const QString &number) +{ + QVariantMap map; + map.insert(QStringLiteral("number"), number); + return createCall(map); +} + +QDBusPendingReply ModemManager::ModemVoice::createCall(const QVariantMap& call) +{ + Q_D(ModemVoice); + + if (!call.contains(QLatin1String("number"))) { + qCDebug(MMQT) << "Unable to create call, missing some property"; + return QDBusPendingReply(); + } + + return d->modemVoiceIface.CreateCall(call); +} + +QDBusPendingReply ModemManager::ModemVoice::deleteCall(const QString &uni) +{ + Q_D(ModemVoice); + return d->modemVoiceIface.DeleteCall(QDBusObjectPath(uni)); +} + +ModemManager::Call::Ptr ModemManager::ModemVoice::findCall(const QString& uni) +{ + Q_D(ModemVoice); + return d->findCall(uni); +} diff -Nru modemmanager-qt-5.46.0/src/modemvoice.h modemmanager-qt-5.59.0/src/modemvoice.h --- modemmanager-qt-5.46.0/src/modemvoice.h 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemvoice.h 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,107 @@ +/* + Copyright 2018 Aleksander Morgado + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef MODEMMANAGERQT_MODEMVOICE_H +#define MODEMMANAGERQT_MODEMVOICE_H + +#include + +#include +#include + +#include "call.h" +#include "generictypes.h" +#include "interface.h" + +namespace ModemManager +{ + +class ModemVoicePrivate; + +/** + * @brief The ModemVoice class + * + * The Voice interface handles call related actions + */ +class MODEMMANAGERQT_EXPORT ModemVoice : public Interface +{ + Q_OBJECT + Q_DECLARE_PRIVATE(ModemVoice) + +public: + typedef QSharedPointer Ptr; + typedef QList List; + + explicit ModemVoice(const QString &path, QObject *parent = nullptr); + ~ModemVoice(); + + /** + * Retrieve all calls. + * + * This method should only be used once and subsequent information retrieved + * either by listening for the callAdded() signal, or by + * querying the specific call object of interest using findCall() + */ + ModemManager::Call::List calls() const; + + /** + * Creates a new call object. + * @param number Number property + */ + QDBusPendingReply createCall(const QString &number); + + /** + * Creates a new call object. + * @param call QVariantMap containing call properties + * The 'number' property is mandatory. + */ + QDBusPendingReply createCall(const QVariantMap &call); + + /** + * Delete a call. + * + * @param uni path to the Call object + */ + QDBusPendingReply deleteCall(const QString &uni); + + /** + * @param uni path to the Call object + * @return pointer to the found Call (may be null if not found) + */ + ModemManager::Call::Ptr findCall(const QString &uni); + +Q_SIGNALS: + /** + * Emitted when an new Call is detected. + * + * @param uni path to the Call object + */ + void callAdded(const QString &uni); + + /** + * Emitted when a call has been deleted. + * @param uni path to the Call object + */ + void callDeleted(const QString &uni); +}; + +} // namespace ModemManager + +#endif diff -Nru modemmanager-qt-5.46.0/src/modemvoice_p.h modemmanager-qt-5.59.0/src/modemvoice_p.h --- modemmanager-qt-5.46.0/src/modemvoice_p.h 1970-01-01 00:00:00.000000000 +0000 +++ modemmanager-qt-5.59.0/src/modemvoice_p.h 2019-06-01 16:41:23.000000000 +0000 @@ -0,0 +1,51 @@ +/* + Copyright 2018 Aleksander Morgado + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef MODEMMANAGER_MODEMVOICE_P_H +#define MODEMMANAGER_MODEMVOICE_P_H + +#include "dbus/voiceinterface.h" +#include "interface_p.h" +#include "modemvoice.h" +#include "call.h" + +namespace ModemManager +{ + +class ModemVoicePrivate : public InterfacePrivate +{ +public: + explicit ModemVoicePrivate(const QString &path, ModemVoice *q); + OrgFreedesktopModemManager1ModemVoiceInterface modemVoiceIface; + + QMap callList; + ModemManager::Call::Ptr findCall(const QString &uni); + ModemManager::Call::List calls(); + + Q_DECLARE_PUBLIC(ModemVoice) + ModemVoice *q_ptr; +private Q_SLOTS: + void onCallAdded(const QDBusObjectPath &path); + void onCallDeleted(const QDBusObjectPath &path); +}; + +} // namespace ModemManager + +#endif diff -Nru modemmanager-qt-5.46.0/src/sim.cpp modemmanager-qt-5.59.0/src/sim.cpp --- modemmanager-qt-5.46.0/src/sim.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/sim.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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 -Nru modemmanager-qt-5.46.0/src/sms.cpp modemmanager-qt-5.59.0/src/sms.cpp --- modemmanager-qt-5.46.0/src/sms.cpp 2018-05-05 12:40:03.000000000 +0000 +++ modemmanager-qt-5.59.0/src/sms.cpp 2019-06-01 16:41:23.000000000 +0000 @@ -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();