Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2017-03-03 17:29:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Fri Mar 3 17:29:06 2017 rev:40 rq:461498 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2017-02-03 20:02:08.319434128 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2017-03-03 17:29:07.343801786 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 10:20:30 UTC 2017 - hrvoje.sen...@gmail.com + +- Update to 5.31.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.31.0.php + +------------------------------------------------------------------- Old: ---- solid-5.30.0.tar.xz New: ---- solid-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.4HBmO4/_old 2017-03-03 17:29:07.931718620 +0100 +++ /var/tmp/diff_new_pack.4HBmO4/_new 2017-03-03 17:29:07.935718054 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Solid5 -%define _tar_path 5.30 +%define _tar_path 5.31 Name: solid -Version: 5.30.0 +Version: 5.31.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 3.0 @@ -29,14 +29,14 @@ BuildRequires: flex BuildRequires: kf5-filesystem %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.5.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 %endif -BuildRequires: cmake(Qt5Concurrent) >= 5.5.0 -BuildRequires: cmake(Qt5DBus) >= 5.5.0 -BuildRequires: cmake(Qt5Qml) >= 5.5.0 -BuildRequires: cmake(Qt5Test) >= 5.5.0 -BuildRequires: cmake(Qt5Widgets) >= 5.5.0 -BuildRequires: cmake(Qt5Xml) >= 5.5.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.6.0 +BuildRequires: cmake(Qt5DBus) >= 5.6.0 +BuildRequires: cmake(Qt5Qml) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 +BuildRequires: cmake(Qt5Xml) >= 5.6.0 BuildRequires: pkgconfig(libudev) Summary: KDE Desktop hardware abstraction License: LGPL-2.1+ @@ -93,7 +93,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Core) >= 5.5.0 +Requires: cmake(Qt5Core) >= 5.6.0 %description devel Solid is a device integration framework. It provides a way of querying and ++++++ solid-5.30.0.tar.xz -> solid-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/CMakeLists.txt new/solid-5.31.0/CMakeLists.txt --- old/solid-5.30.0/CMakeLists.txt 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/CMakeLists.txt 2017-02-05 12:20:35.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.30.0") # handled by release scripts +set(KF5_VERSION "5.31.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.30.0 NO_MODULE) +find_package(ECM 5.31.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) @@ -16,7 +16,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml DBus Widgets) if(WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/autotests/fakehardwaretest.cpp new/solid-5.31.0/autotests/fakehardwaretest.cpp --- old/solid-5.30.0/autotests/fakehardwaretest.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/autotests/fakehardwaretest.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -36,12 +36,12 @@ void FakeHardwareTest::testFakeBackend() { - Solid::Backends::Fake::FakeManager *fakeManager = new Solid::Backends::Fake::FakeManager(0, TEST_DATA); + Solid::Backends::Fake::FakeManager *fakeManager = new Solid::Backends::Fake::FakeManager(nullptr, TEST_DATA); QVERIFY(!fakeManager->allDevices().isEmpty()); QObject *computer = fakeManager->createDevice("/org/kde/solid/fakehw/computer"); - QVERIFY(computer != 0); - QVERIFY(fakeManager->createDevice("/com/helloworld/troll/compiutor") == 0); + QVERIFY(computer != nullptr); + QVERIFY(fakeManager->createDevice("/com/helloworld/troll/compiutor") == nullptr); Solid::Backends::Fake::FakeDevice *device = static_cast<Solid::Backends::Fake::FakeDevice *>(fakeManager->createDevice("/org/kde/solid/fakehw/acpi_CPU0")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/autotests/solidhwtest.cpp new/solid-5.31.0/autotests/solidhwtest.cpp --- old/solid-5.30.0/autotests/solidhwtest.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/autotests/solidhwtest.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -93,7 +93,7 @@ // Query properties QCOMPARE(valid_dev.as<Solid::GenericInterface>()->propertyExists("name"), true); QCOMPARE(valid_dev.as<Solid::GenericInterface>()->propertyExists("foo.bar"), false); - QCOMPARE((QObject *)invalid_dev.as<Solid::GenericInterface>(), (QObject *)0); + QCOMPARE((QObject *)invalid_dev.as<Solid::GenericInterface>(), (QObject *)nullptr); QCOMPARE(valid_dev.as<Solid::GenericInterface>()->property("name"), QVariant("Solid IDE DVD Writer")); QVERIFY(!valid_dev.as<Solid::GenericInterface>()->property("foo.bar").isValid()); @@ -229,7 +229,7 @@ Solid::DeviceInterface *processor = cpu.as<Solid::Processor>(); QVERIFY(cpu.isDeviceInterface(Solid::DeviceInterface::Processor)); - QVERIFY(iface != 0); + QVERIFY(iface != nullptr); QCOMPARE(iface, processor); Solid::Device cpu2("/org/kde/solid/fakehw/acpi_CPU0"); @@ -237,9 +237,9 @@ QCOMPARE(cpu.as<Solid::GenericInterface>(), cpu2.as<Solid::GenericInterface>()); QPointer<Solid::Processor> p = cpu.as<Solid::Processor>(); - QVERIFY(p != 0); + QVERIFY(p != nullptr); fakeManager->unplug("/org/kde/solid/fakehw/acpi_CPU0"); - QVERIFY(p == 0); + QVERIFY(p == nullptr); fakeManager->plug("/org/kde/solid/fakehw/acpi_CPU0"); QPointer<Solid::StorageVolume> v; @@ -247,21 +247,21 @@ { Solid::Device partition("/org/kde/solid/fakehw/volume_uuid_f00ba7"); v = partition.as<Solid::StorageVolume>(); - QVERIFY(v != 0); + QVERIFY(v != nullptr); { Solid::Device partition2("/org/kde/solid/fakehw/volume_uuid_f00ba7"); v2 = partition2.as<Solid::StorageVolume>(); - QVERIFY(v2 != 0); + QVERIFY(v2 != nullptr); QVERIFY(v == v2); } - QVERIFY(v != 0); - QVERIFY(v2 != 0); + QVERIFY(v != nullptr); + QVERIFY(v2 != nullptr); } - QVERIFY(v != 0); - QVERIFY(v2 != 0); + QVERIFY(v != nullptr); + QVERIFY(v2 != nullptr); fakeManager->unplug("/org/kde/solid/fakehw/volume_uuid_f00ba7"); - QVERIFY(v == 0); - QVERIFY(v2 == 0); + QVERIFY(v == nullptr); + QVERIFY(v2 == nullptr); fakeManager->plug("/org/kde/solid/fakehw/volume_uuid_f00ba7"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/po/gl/solid5_qt.po new/solid-5.31.0/po/gl/solid5_qt.po --- old/solid-5.30.0/po/gl/solid5_qt.po 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/po/gl/solid5_qt.po 2017-02-05 12:20:35.000000000 +0100 @@ -420,7 +420,7 @@ #: solid/devices/backends/udev/udevdevice.cpp:116 msgctxt "Solid::Backends::UDev::UDevDevice|" msgid "Computer" -msgstr "Ordenador" +msgstr "Computador" #: solid/devices/backends/udev/udevdevice.cpp:120 msgctxt "Solid::Backends::UDev::UDevDevice|" @@ -1102,7 +1102,7 @@ " # - De especificarse a opción «detalles», as interfaces do\n" " # dispositivo e as propiedades correspondentes listaranse\n" " # dun xeito independente da plataforma,\n" -" # - Caso contrario só se listan as UDI do dispositivo.\n" +" # - En caso contrario só se listan as UDI do dispositivo.\n" #: tools/solid-hardware/solid-hardware.cpp:213 msgctxt "solid-hardware|" @@ -1139,7 +1139,7 @@ "«predicado».\n" " # - De especificarse «parentUdi», a busca restrínxese á\n" " # póla do dispositivo correspondente,\n" -" # - Caso contrario a busca faise en todos os dispositivos.\n" +" # - En caso contrario a busca faise en todos os dispositivos.\n" #: tools/solid-hardware/solid-hardware.cpp:230 msgctxt "solid-hardware|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/po/ia/solid5_qt.po new/solid-5.31.0/po/ia/solid5_qt.po --- old/solid-5.30.0/po/ia/solid5_qt.po 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/po/ia/solid5_qt.po 2017-02-05 12:20:35.000000000 +0100 @@ -1,20 +1,20 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# g.sora <g.s...@tiscali.it>, 2010, 2011, 2013, 2014. +# g.sora <g.s...@tiscali.it>, 2010, 2011, 2013, 2014, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2014-04-04 16:07+0200\n" -"Last-Translator: G.Sora <g.s...@tiscali.it>\n" -"Language-Team: Interlingua <kde-l10n...@kde.org>\n" +"PO-Revision-Date: 2017-01-15 22:09+0100\n" +"Last-Translator: giovanni <g.s...@tiscali.it>\n" +"Language-Team: Interlingua <kde-i18n...@kde.org>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" @@ -1211,19 +1211,15 @@ msgctxt "solid-power|" msgid "Tool to know and set the power management state of your device" msgstr "" +"Instrumento per saper e fixar le stato de gestion de energia de tu " +"dispositivo" #: tools/solid-power/main.cpp:38 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Command to execute" msgctxt "solid-power|" msgid "Command to execute" msgstr "Commando que il debe exequer" #: tools/solid-power/main.cpp:40 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Show available commands" msgctxt "solid-power|" msgid "Show available commands" msgstr "Monstra commandos disponibile" @@ -1235,3 +1231,6 @@ " # - acPlugged: whether the device is connected to the AC or " "not\n" msgstr "" +" # Monstra tote le information de gestion de energia ex le " +"systema.\n" +" # - acPlugged: si le dispositivo es connectite a le AC o no\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/imports/devices.h new/solid-5.31.0/src/imports/devices.h --- old/solid-5.30.0/src/imports/devices.h 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/imports/devices.h 2017-02-05 12:20:35.000000000 +0100 @@ -76,7 +76,7 @@ Q_PROPERTY(QStringList devices READ devices NOTIFY devicesChanged) public: - explicit Devices(QObject *parent = Q_NULLPTR); + explicit Devices(QObject *parent = nullptr); ~Devices(); Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/imports/solidextensionplugin.h new/solid-5.31.0/src/imports/solidextensionplugin.h --- old/solid-5.30.0/src/imports/solidextensionplugin.h 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/imports/solidextensionplugin.h 2017-02-05 12:20:35.000000000 +0100 @@ -26,7 +26,7 @@ Q_PLUGIN_METADATA(IID "org.kde.solid") public: - SolidExtensionPlugin(QObject *parent = Q_NULLPTR); + SolidExtensionPlugin(QObject *parent = nullptr); void registerTypes(const char *uri) Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/fakehw/fakedevice.cpp new/solid-5.31.0/src/solid/devices/backends/fakehw/fakedevice.cpp --- old/solid-5.30.0/src/solid/devices/backends/fakehw/fakedevice.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/fakehw/fakedevice.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -255,10 +255,10 @@ { // Do not try to cast with a unsupported device interface. if (!queryDeviceInterface(type)) { - return 0; + return nullptr; } - FakeDeviceInterface *iface = 0; + FakeDeviceInterface *iface = nullptr; switch (type) { case Solid::DeviceInterface::GenericInterface: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/fakehw/fakemanager.cpp new/solid-5.31.0/src/solid/devices/backends/fakehw/fakemanager.cpp --- old/solid-5.30.0/src/solid/devices/backends/fakehw/fakemanager.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/fakehw/fakemanager.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -130,7 +130,7 @@ return new FakeDevice(*d->loadedDevices[udi]); } - return 0; + return nullptr; } FakeDevice *FakeManager::findDevice(const QString &udi) @@ -219,7 +219,7 @@ FakeDevice *FakeManager::parseDeviceElement(const QDomElement &deviceElement) { - FakeDevice *device = 0; + FakeDevice *device = nullptr; QMap<QString, QVariant> propertyMap; QString udi = deviceElement.attribute("udi"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/fstab/fstabdevice.cpp new/solid-5.31.0/src/solid/devices/backends/fstab/fstabdevice.cpp --- old/solid-5.30.0/src/solid/devices/backends/fstab/fstabdevice.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/fstab/fstabdevice.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -114,7 +114,7 @@ } else if (type == Solid::DeviceInterface::NetworkShare) { return new FstabNetworkShare(this); } - return 0; + return nullptr; } QString FstabDevice::device() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/fstab/fstabhandling.cpp new/solid-5.31.0/src/solid/devices/backends/fstab/fstabhandling.cpp --- old/solid-5.30.0/src/solid/devices/backends/fstab/fstabhandling.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/fstab/fstabhandling.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -133,12 +133,12 @@ #if HAVE_SETMNTENT FILE *fstab; - if ((fstab = setmntent(FSTAB, "r")) == 0) { + if ((fstab = setmntent(FSTAB, "r")) == nullptr) { return; } struct mntent *fe; - while ((fe = getmntent(fstab)) != 0) { + while ((fe = getmntent(fstab)) != nullptr) { if (_k_isFstabNetworkFileSystem(fe->mnt_type, fe->mnt_fsname)) { const QString device = QFile::decodeName(fe->mnt_fsname); const QString mountpoint = QFile::decodeName(fe->mnt_dir); @@ -232,7 +232,7 @@ return process; } else { delete process; - return 0; + return nullptr; } } @@ -333,7 +333,7 @@ free(mntctl_buffer); #else STRUCT_SETMNTENT mnttab; - if ((mnttab = SETMNTENT(MNTTAB, "r")) == 0) { + if ((mnttab = SETMNTENT(MNTTAB, "r")) == nullptr) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/fstab/fstabmanager.cpp new/solid-5.31.0/src/solid/devices/backends/fstab/fstabmanager.cpp --- old/solid-5.30.0/src/solid/devices/backends/fstab/fstabmanager.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/fstab/fstabmanager.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -95,7 +95,7 @@ // global device manager makes sure udi starts with udi prefix + '/' QString internalName = udi.mid(udiPrefix().length() + 1, -1); if (!m_deviceList.contains(internalName)) { - return 0; + return nullptr; } QObject *device = new FstabDevice(udi); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp new/solid-5.31.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp --- old/solid-5.30.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -93,7 +93,7 @@ m_process = FstabHandling::callSystemCommand("mount", filePath(), this, SLOT(slotSetupFinished(int,QProcess::ExitStatus))); - return m_process != 0; + return m_process != nullptr; } void FstabStorageAccess::slotSetupRequested() @@ -110,7 +110,7 @@ m_process = FstabHandling::callSystemCommand("umount", filePath(), this, SLOT(slotTeardownFinished(int,QProcess::ExitStatus))); - return m_process != 0; + return m_process != nullptr; } void FstabStorageAccess::slotTeardownRequested() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/fstab/fstabwatcher.cpp new/solid-5.31.0/src/solid/devices/backends/fstab/fstabwatcher.cpp --- old/solid-5.30.0/src/solid/devices/backends/fstab/fstabwatcher.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/fstab/fstabwatcher.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -73,13 +73,13 @@ #if 0 //qRemovePostRoutine(globalFstabWatcher.destroy); #else - m_fileSystemWatcher->setParent(0); + m_fileSystemWatcher->setParent(nullptr); #endif } void FstabWatcher::orphanFileSystemWatcher() { - m_fileSystemWatcher->setParent(0); + m_fileSystemWatcher->setParent(nullptr); } FstabWatcher *FstabWatcher::instance() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/hal/halstorageaccess.cpp new/solid-5.31.0/src/solid/devices/backends/hal/halstorageaccess.cpp --- old/solid-5.30.0/src/solid/devices/backends/hal/halstorageaccess.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/hal/halstorageaccess.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -354,7 +354,7 @@ callCryptoSetup(passphrase); } else { m_setupInProgress = false; - m_device->broadcastActionDone("setup"); + m_device->broadcastActionDone("setup", Solid::UserCanceled); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/shared/rootdevice.cpp new/solid-5.31.0/src/solid/devices/backends/shared/rootdevice.cpp --- old/solid-5.30.0/src/solid/devices/backends/shared/rootdevice.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/shared/rootdevice.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -102,5 +102,5 @@ QObject *RootDevice::createDeviceInterface(const Solid::DeviceInterface::Type &) { - return 0; + return nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/shared/udevqtclient.cpp new/solid-5.31.0/src/solid/devices/backends/shared/udevqtclient.cpp --- old/solid-5.30.0/src/solid/devices/backends/shared/udevqtclient.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/shared/udevqtclient.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -28,7 +28,7 @@ { ClientPrivate::ClientPrivate(Client *q_) - : udev(0), monitor(0), q(q_), monitorNotifier(0) + : udev(nullptr), monitor(nullptr), q(q_), monitorNotifier(nullptr) { } @@ -70,7 +70,7 @@ QByteArray devType = subsysDevtype.mid(ix + 1).toLatin1(); udev_monitor_filter_add_match_subsystem_devtype(newM, subsystem.constData(), devType.constData()); } else { - udev_monitor_filter_add_match_subsystem_devtype(newM, subsysDevtype.toLatin1().constData(), NULL); + udev_monitor_filter_add_match_subsystem_devtype(newM, subsysDevtype.toLatin1().constData(), nullptr); } } @@ -195,7 +195,7 @@ if (value.isValid()) { udev_enumerate_add_match_property(en, property.toLatin1().constData(), value.toString().toLatin1().constData()); } else { - udev_enumerate_add_match_property(en, property.toLatin1().constData(), NULL); + udev_enumerate_add_match_property(en, property.toLatin1().constData(), nullptr); } return d->deviceListFromEnumerate(en); @@ -223,7 +223,7 @@ return Device(); } - struct udev_device *ud = 0; + struct udev_device *ud = nullptr; if (S_ISBLK(sb.st_mode)) { ud = udev_device_new_from_devnum(d->udev, 'b', sb.st_rdev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/shared/udevqtclient.h new/solid-5.31.0/src/solid/devices/backends/shared/udevqtclient.h --- old/solid-5.30.0/src/solid/devices/backends/shared/udevqtclient.h 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/shared/udevqtclient.h 2017-02-05 12:20:35.000000000 +0100 @@ -40,8 +40,8 @@ Q_PROPERTY(QStringList watchedSubsystems READ watchedSubsystems WRITE setWatchedSubsystems) public: - Client(QObject *parent = 0); - Client(const QStringList &subsystemList, QObject *parent = 0); + Client(QObject *parent = nullptr); + Client(const QStringList &subsystemList, QObject *parent = nullptr); ~Client(); QStringList watchedSubsystems() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/shared/udevqtdevice.cpp new/solid-5.31.0/src/solid/devices/backends/shared/udevqtdevice.cpp --- old/solid-5.30.0/src/solid/devices/backends/shared/udevqtdevice.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/shared/udevqtdevice.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -77,7 +77,7 @@ } Device::Device() - : d(0) + : d(nullptr) { } @@ -86,7 +86,7 @@ if (other.d) { d = new DevicePrivate(other.d->udev); } else { - d = 0; + d = nullptr; } } @@ -107,7 +107,7 @@ } if (!other.d) { delete d; - d = 0; + d = nullptr; return *this; } if (!d) { @@ -121,7 +121,7 @@ bool Device::isValid() const { - return (d != 0); + return (d != nullptr); } QString Device::subsystem() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udev/udevdevice.cpp new/solid-5.31.0/src/solid/devices/backends/udev/udevdevice.cpp --- old/solid-5.30.0/src/solid/devices/backends/udev/udevdevice.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udev/udevdevice.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -163,7 +163,7 @@ QObject *UDevDevice::createDeviceInterface(const Solid::DeviceInterface::Type &type) { if (!queryDeviceInterface(type)) { - return 0; + return nullptr; } switch (type) { @@ -184,7 +184,7 @@ default: qFatal("Shouldn't happen"); - return 0; + return nullptr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udev/udevmanager.cpp new/solid-5.31.0/src/solid/devices/backends/udev/udevmanager.cpp --- old/solid-5.30.0/src/solid/devices/backends/udev/udevmanager.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udev/udevmanager.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -217,7 +217,7 @@ return new UDevDevice(device); } - return 0; + return nullptr; } void UDevManager::slotDeviceAdded(const UdevQt::Device &device) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udisks2/dbus/manager.h new/solid-5.31.0/src/solid/devices/backends/udisks2/dbus/manager.h --- old/solid-5.30.0/src/solid/devices/backends/udisks2/dbus/manager.h 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udisks2/dbus/manager.h 2017-02-05 12:20:35.000000000 +0100 @@ -35,7 +35,7 @@ } public: - OrgFreedesktopDBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + OrgFreedesktopDBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); ~OrgFreedesktopDBusObjectManagerInterface(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksdevice.cpp new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksdevice.cpp --- old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksdevice.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksdevice.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -159,10 +159,10 @@ QObject *Device::createDeviceInterface(const Solid::DeviceInterface::Type &type) { if (!queryDeviceInterface(type)) { - return 0; + return nullptr; } - DeviceInterface *iface = 0; + DeviceInterface *iface = nullptr; switch (type) { case Solid::DeviceInterface::GenericInterface: iface = new GenericInterface(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp --- old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -36,7 +36,7 @@ DeviceBackend *DeviceBackend::backendForUDI(const QString &udi, bool create) { - DeviceBackend *backend = 0; + DeviceBackend *backend = nullptr; if (udi.isEmpty()) { return backend; } @@ -182,15 +182,19 @@ return; } - QVariant reply = m_device->property(key.toUtf8()); - m_propertyCache.insert(key, reply); - - if (!reply.isValid()) { - /* Store the item in the cache anyway so next time we don't have to - * do the DBus call to find out it does not exist but just check whether - * prop(key).isValid() */ -// qDebug() << m_udi << ": property" << key << "does not exist"; - } + QDBusMessage call = QDBusMessage::createMethodCall(UD2_DBUS_SERVICE, m_udi, DBUS_INTERFACE_PROPS, "Get"); + /* + * Interface is set to an empty string as in this QDBusInterface is a meta-object of multiple interfaces on the same path + * The DBus properties also interface supports this, and will find the appropriate interface if none is explicitly set. + * This matches what QDBusAbstractInterface would do + */ + call.setArguments(QVariantList() << QString() << key); + QDBusPendingReply<QVariant> reply = QDBusConnection::systemBus().call(call); + + /* We don't check for error here and store the item in the cache anyway so next time we don't have to + * do the DBus call to find out it does not exist but just check whether + * prop(key).isValid() */ + m_propertyCache.insert(key, reply.value()); } void DeviceBackend::slotPropertiesChanged(const QString &ifaceName, const QVariantMap &changedProps, const QStringList &invalidatedProps) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksmanager.cpp new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksmanager.cpp --- old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksmanager.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksmanager.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -94,7 +94,7 @@ } else if (deviceCache().contains(udi)) { return new Device(udi); } else { - return 0; + return nullptr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp --- old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -239,7 +239,7 @@ public: SharedContentTypesCache() - : m_pointer(0), + : m_pointer(nullptr), m_semaphore(getKey() + "sem", 1), m_shmem(getKey() + "mem") { if (!m_semaphore.acquire()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp --- old/solid-5.30.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -326,7 +326,7 @@ QWidget *activeWindow = QApplication::activeWindow(); uint wId = 0; - if (activeWindow != 0) { + if (activeWindow != nullptr) { wId = (uint)activeWindow->winId(); } @@ -352,7 +352,7 @@ callCryptoSetup(passphrase); } else { m_setupInProgress = false; - m_device->broadcastActionDone("setup"); + m_device->broadcastActionDone("setup", Solid::UserCanceled); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/upower/upowerdevice.cpp new/solid-5.31.0/src/solid/devices/backends/upower/upowerdevice.cpp --- old/solid-5.30.0/src/solid/devices/backends/upower/upowerdevice.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/upower/upowerdevice.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -65,10 +65,10 @@ QObject *UPowerDevice::createDeviceInterface(const Solid::DeviceInterface::Type &type) { if (!queryDeviceInterface(type)) { - return 0; + return nullptr; } - DeviceInterface *iface = 0; + DeviceInterface *iface = nullptr; switch (type) { case Solid::DeviceInterface::GenericInterface: iface = new GenericInterface(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/backends/upower/upowermanager.cpp new/solid-5.31.0/src/solid/devices/backends/upower/upowermanager.cpp --- old/solid-5.30.0/src/solid/devices/backends/upower/upowermanager.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/backends/upower/upowermanager.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -97,7 +97,7 @@ return new UPowerDevice(udi); } else { - return 0; + return nullptr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/frontend/device.cpp new/solid-5.31.0/src/solid/devices/frontend/device.cpp --- old/solid-5.30.0/src/solid/devices/frontend/device.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/frontend/device.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -77,7 +77,7 @@ bool Solid::Device::isValid() const { - return d->backendObject() != 0; + return d->backendObject() != nullptr; } QString Solid::Device::udi() const @@ -144,16 +144,16 @@ { Ifaces::Device *device = qobject_cast<Ifaces::Device *>(d->backendObject()); - if (device != 0) { + if (device != nullptr) { DeviceInterface *iface = d->interface(type); - if (iface != 0) { + if (iface != nullptr) { return iface; } QObject *dev_iface = device->createDeviceInterface(type); - if (dev_iface != 0) { + if (dev_iface != nullptr) { switch (type) { case DeviceInterface::GenericInterface: iface = deviceinterface_cast(Ifaces::GenericInterface, GenericInterface, dev_iface); @@ -197,7 +197,7 @@ } } - if (iface != 0) { + if (iface != nullptr) { // Lie on the constness since we're simply doing caching here const_cast<Device *>(this)->d->setInterface(type, iface); iface->d_ptr->setDevicePrivate(d.data()); @@ -205,7 +205,7 @@ return iface; } else { - return 0; + return nullptr; } } @@ -221,13 +221,13 @@ Q_FOREACH (DeviceInterface *iface, m_ifaces) { delete iface->d_ptr->backendObject(); } - setBackendObject(0); + setBackendObject(nullptr); } void Solid::DevicePrivate::_k_destroyed(QObject *object) { Q_UNUSED(object); - setBackendObject(0); + setBackendObject(nullptr); } void Solid::DevicePrivate::setBackendObject(Ifaces::Device *object) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/frontend/deviceinterface.cpp new/solid-5.31.0/src/solid/devices/frontend/deviceinterface.cpp --- old/solid-5.30.0/src/solid/devices/frontend/deviceinterface.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/frontend/deviceinterface.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -36,13 +36,13 @@ Solid::DeviceInterface::~DeviceInterface() { delete d_ptr; - d_ptr = 0; + d_ptr = nullptr; } bool Solid::DeviceInterface::isValid() const { Q_D(const DeviceInterface); - return d->backendObject() != 0; + return d->backendObject() != nullptr; } QString Solid::DeviceInterface::typeToString(Type type) @@ -95,7 +95,7 @@ } Solid::DeviceInterfacePrivate::DeviceInterfacePrivate() - : m_devicePrivate(0) + : m_devicePrivate(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/frontend/devicemanager.cpp new/solid-5.31.0/src/solid/devices/frontend/devicemanager.cpp --- old/solid-5.30.0/src/solid/devices/frontend/devicemanager.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/frontend/devicemanager.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -50,7 +50,7 @@ { QList<QObject *> backends = managerBackends(); Q_FOREACH (QObject *backend, backends) { - disconnect(backend, 0, this, 0); + disconnect(backend, nullptr, this, nullptr); } Q_FOREACH (QPointer<DevicePrivate> dev, m_devicesMap) { @@ -70,7 +70,7 @@ Q_FOREACH (QObject *backendObj, backends) { Ifaces::DeviceManager *backend = qobject_cast<Ifaces::DeviceManager *>(backendObj); - if (backend == 0) { + if (backend == nullptr) { continue; } @@ -105,7 +105,7 @@ Q_FOREACH (QObject *backendObj, backends) { Ifaces::DeviceManager *backend = qobject_cast<Ifaces::DeviceManager *>(backendObj); - if (backend == 0) { + if (backend == nullptr) { continue; } if (!backend->supportedInterfaces().contains(type)) { @@ -132,7 +132,7 @@ Q_FOREACH (QObject *backendObj, backends) { Ifaces::DeviceManager *backend = qobject_cast<Ifaces::DeviceManager *>(backendObj); - if (backend == 0) { + if (backend == nullptr) { continue; } @@ -190,9 +190,9 @@ // Ok, this one was requested somewhere was invalid // and now becomes magically valid! - if (dev && dev->backendObject() == 0) { + if (dev && dev->backendObject() == nullptr) { dev->setBackendObject(createBackendObject(udi)); - Q_ASSERT(dev->backendObject() != 0); + Q_ASSERT(dev->backendObject() != nullptr); } } @@ -208,9 +208,9 @@ // and now becomes magically invalid! if (dev) { - Q_ASSERT(dev->backendObject() != 0); - dev->setBackendObject(0); - Q_ASSERT(dev->backendObject() == 0); + Q_ASSERT(dev->backendObject() != nullptr); + dev->setBackendObject(nullptr); + Q_ASSERT(dev->backendObject() == nullptr); } } @@ -256,26 +256,26 @@ Q_FOREACH (QObject *backendObj, backends) { Ifaces::DeviceManager *backend = qobject_cast<Ifaces::DeviceManager *>(backendObj); - if (backend == 0) { + if (backend == nullptr) { continue; } if (!udi.startsWith(backend->udiPrefix())) { continue; } - Ifaces::Device *iface = 0; + Ifaces::Device *iface = nullptr; QObject *object = backend->createDevice(udi); iface = qobject_cast<Ifaces::Device *>(object); - if (iface == 0) { + if (iface == nullptr) { delete object; } return iface; } - return 0; + return nullptr; } Solid::DeviceManagerStorage::DeviceManagerStorage() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/frontend/predicate.cpp new/solid-5.31.0/src/solid/devices/frontend/predicate.cpp --- old/solid-5.30.0/src/solid/devices/frontend/predicate.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/frontend/predicate.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -33,7 +33,7 @@ Private() : isValid(false), type(PropertyCheck), compOperator(Predicate::Equals), - operand1(0), operand2(0) {} + operand1(nullptr), operand2(nullptr) {} bool isValid; Type type; @@ -196,7 +196,7 @@ case PropertyCheck: { const DeviceInterface *iface = device.asDeviceInterface(d->ifaceType); - if (iface != 0) { + if (iface != nullptr) { const int index = iface->metaObject()->indexOfProperty(d->property.toLatin1()); QMetaProperty metaProp = iface->metaObject()->property(index); QVariant value = metaProp.isReadable() ? metaProp.read(iface) : QVariant(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/frontend/storagevolume.cpp new/solid-5.31.0/src/solid/devices/frontend/storagevolume.cpp --- old/solid-5.30.0/src/solid/devices/frontend/storagevolume.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/frontend/storagevolume.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -83,7 +83,7 @@ Ifaces::StorageVolume *iface = qobject_cast<Ifaces::StorageVolume *>(d->backendObject()); - if (iface != 0) { + if (iface != nullptr) { return Device(iface->encryptedContainerUdi()); } else { return Device(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/ifaces/device.h new/solid-5.31.0/src/solid/devices/ifaces/device.h --- old/solid-5.30.0/src/solid/devices/ifaces/device.h 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/ifaces/device.h 2017-02-05 12:20:35.000000000 +0100 @@ -51,7 +51,7 @@ /** * Constructs a Device */ - Device(QObject *parent = 0); + Device(QObject *parent = nullptr); /** * Destruct the Device object */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/ifaces/devicemanager.h new/solid-5.31.0/src/solid/devices/ifaces/devicemanager.h --- old/solid-5.30.0/src/solid/devices/ifaces/devicemanager.h 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/ifaces/devicemanager.h 2017-02-05 12:20:35.000000000 +0100 @@ -47,7 +47,7 @@ /** * Constructs a DeviceManager */ - DeviceManager(QObject *parent = 0); + DeviceManager(QObject *parent = nullptr); /** * Destructs a DeviceManager object */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/managerbase.cpp new/solid-5.31.0/src/solid/devices/managerbase.cpp --- old/solid-5.30.0/src/solid/devices/managerbase.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/managerbase.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -58,7 +58,7 @@ QString solidFakeXml(QString::fromLocal8Bit(qgetenv("SOLID_FAKEHW"))); if (!solidFakeXml.isEmpty()) { - m_backends << new Solid::Backends::Fake::FakeManager(0, solidFakeXml); + m_backends << new Solid::Backends::Fake::FakeManager(nullptr, solidFakeXml); } else { # if defined(Q_OS_MAC) m_backends << new Solid::Backends::IOKit::IOKitManager(0); @@ -79,11 +79,11 @@ # elif defined(Q_OS_LINUX) # if UDEV_FOUND - m_backends << new Solid::Backends::UDev::UDevManager(0); - m_backends << new Solid::Backends::UDisks2::Manager(0); + m_backends << new Solid::Backends::UDev::UDevManager(nullptr); + m_backends << new Solid::Backends::UDisks2::Manager(nullptr); # endif - m_backends << new Solid::Backends::UPower::UPowerManager(0) - << new Solid::Backends::Fstab::FstabManager(0); + m_backends << new Solid::Backends::UPower::UPowerManager(nullptr) + << new Solid::Backends::Fstab::FstabManager(nullptr); # endif } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/devices/predicateparse.cpp new/solid-5.31.0/src/solid/devices/predicateparse.cpp --- old/solid-5.30.0/src/solid/devices/predicateparse.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/devices/predicateparse.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -40,7 +40,7 @@ struct ParsingData { ParsingData() - : result(0) + : result(nullptr) {} Solid::Predicate *result; @@ -63,7 +63,7 @@ result = Predicate(*data->result); delete data->result; } - s_parsingData->setLocalData(0); + s_parsingData->setLocalData(nullptr); return result; } @@ -76,7 +76,7 @@ void PredicateParse_errorDetected(const char *s) { qWarning("ERROR from solid predicate parser: %s", s); - s_parsingData->localData()->result = 0; + s_parsingData->localData()->result = nullptr; } void PredicateParse_destroy(void *pred) @@ -138,7 +138,7 @@ Solid::Predicate *p2 = (Solid::Predicate *)pred2; if (p1 == data->result || p2 == data->result) { - data->result = 0; + data->result = nullptr; } *result = *p1 & *p2; @@ -158,7 +158,7 @@ Solid::Predicate *p2 = (Solid::Predicate *)pred2; if (p1 == data->result || p2 == data->result) { - data->result = 0; + data->result = nullptr; } *result = *p1 | *p2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/power/acpluggedjob.cpp new/solid-5.31.0/src/solid/power/acpluggedjob.cpp --- old/solid-5.30.0/src/solid/power/acpluggedjob.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/power/acpluggedjob.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -29,7 +29,7 @@ AcPluggedJobPrivate::AcPluggedJobPrivate() { - backendJob = Q_NULLPTR; + backendJob = nullptr; plugged = false; backendJobFinished = false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/power/inhibitionjob.cpp new/solid-5.31.0/src/solid/power/inhibitionjob.cpp --- old/solid-5.30.0/src/solid/power/inhibitionjob.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/power/inhibitionjob.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -32,8 +32,8 @@ InhibitionJobPrivate::InhibitionJobPrivate() : inhibitions(Power::None) - , inhibition(Q_NULLPTR) - , backendJob(Q_NULLPTR) + , inhibition(nullptr) + , backendJob(nullptr) { } @@ -52,7 +52,7 @@ } qWarning() << "result() has not been emitted yet, job not finished"; - return Q_NULLPTR; + return nullptr; } void InhibitionJob::doStart() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/power/requeststatejob.cpp new/solid-5.31.0/src/solid/power/requeststatejob.cpp --- old/solid-5.30.0/src/solid/power/requeststatejob.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/power/requeststatejob.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -29,7 +29,7 @@ RequestStateJobPrivate::RequestStateJobPrivate() { - backendJob = Q_NULLPTR; + backendJob = nullptr; state = Power::None; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.30.0/src/solid/power/statesjob.cpp new/solid-5.31.0/src/solid/power/statesjob.cpp --- old/solid-5.30.0/src/solid/power/statesjob.cpp 2017-01-08 22:06:24.000000000 +0100 +++ new/solid-5.31.0/src/solid/power/statesjob.cpp 2017-02-05 12:20:35.000000000 +0100 @@ -29,7 +29,7 @@ StatesJobPrivate::StatesJobPrivate() { - backendJob = Q_NULLPTR; + backendJob = nullptr; } StatesJob::StatesJob(QObject* parent) : Job(*new StatesJobPrivate(), parent)
