Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2017-07-17 10:26:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Mon Jul 17 10:26:52 2017 rev:45 rq:509946 version:5.36.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2017-07-05 23:54:27.685845643 +0200 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2017-07-17 10:27:00.166826704 +0200 @@ -1,0 +2,12 @@ +Wed Jul 12 07:14:05 CEST 2017 - lbeltr...@kde.org + +- Update to 5.36.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.36.0.php +- Changes since 5.35.0: + * hal: use Q_DECL_OVERRIDE + * cmake: build udisks2 backend on FreeBSD only when enabled + * [FEATURE] Option to build & install QCH file with the public API dox + +------------------------------------------------------------------- Old: ---- solid-5.35.0.tar.xz New: ---- solid-5.36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.zHhvg9/_old 2017-07-17 10:27:01.034704354 +0200 +++ /var/tmp/diff_new_pack.zHhvg9/_new 2017-07-17 10:27:01.034704354 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Solid5 -%define _tar_path 5.35 +%define _tar_path 5.36 Name: solid -Version: 5.35.0 +Version: 5.36.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 3.0 ++++++ solid-5.35.0.tar.xz -> solid-5.36.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/CMakeLists.txt new/solid-5.36.0/CMakeLists.txt --- old/solid-5.35.0/CMakeLists.txt 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/CMakeLists.txt 2017-07-02 10:15:10.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.35.0") # handled by release scripts +set(KF5_VERSION "5.36.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.35.0 NO_MODULE) +find_package(ECM 5.36.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) @@ -29,6 +29,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) +include(ECMAddQch) find_package(FLEX REQUIRED) set_package_properties(FLEX PROPERTIES @@ -60,6 +61,9 @@ include(ECMPoQmTools) +option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) +add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + ecm_setup_version(PROJECT VARIABLE_PREFIX SOLID VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/solid_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5SolidConfigVersion.cmake" @@ -88,6 +92,16 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Solid") +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5Solid_QCH + FILE KF5SolidQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5SolidQchTargets.cmake\")") +endif() + configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5SolidConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5SolidConfig.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/KF5SolidConfig.cmake.in new/solid-5.36.0/KF5SolidConfig.cmake.in --- old/solid-5.35.0/KF5SolidConfig.cmake.in 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/KF5SolidConfig.cmake.in 2017-07-02 10:15:10.000000000 +0200 @@ -20,6 +20,7 @@ find_dependency(Qt5Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5SolidTargets.cmake") +@PACKAGE_INCLUDE_QCHTARGETS@ # "public" variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/CMakeLists.txt new/solid-5.36.0/src/solid/CMakeLists.txt --- old/solid-5.35.0/src/solid/CMakeLists.txt 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/CMakeLists.txt 2017-07-02 10:15:10.000000000 +0200 @@ -101,6 +101,29 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid/solid COMPONENT Devel ) +if(BUILD_QCH) + ecm_add_qch( + KF5Solid_QCH + NAME Solid + BASE_NAME KF5Solid + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${Solid_HEADERS} + "${CMAKE_SOURCE_DIR}/docs/song.md" + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + LINK_QCHS + Qt5Core_QCH + BLANK_MACROS + SOLID_EXPORT + SOLID_DEPRECATED + SOLID_DEPRECATED_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME Solid LIB_NAME KF5Solid DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/CMakeLists.txt new/solid-5.36.0/src/solid/devices/CMakeLists.txt --- old/solid-5.35.0/src/solid/devices/CMakeLists.txt 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/CMakeLists.txt 2017-07-02 10:15:10.000000000 +0200 @@ -96,6 +96,8 @@ if(NOT WIN32 AND NOT APPLE) if (CMAKE_SYSTEM_NAME MATCHES FreeBSD) option(EXPERIMENTAL_BSDISKS "Use UDisks2/bsdisks backend instead of HAL to manage disk devices" OFF) + else () + set(EXPERIMENTAL_BSDISKS FALSE) endif() if ( UDEV_FOUND ) @@ -107,7 +109,7 @@ include(devices/backends/upower/CMakeLists.txt) # FIXME: this should work on more Unix systems - if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND) OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) + if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND) OR EXPERIMENTAL_BSDISKS) message(STATUS "Building Solid UDisks2 backend." ) include(devices/backends/udisks2/CMakeLists.txt) endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halbattery.h new/solid-5.36.0/src/solid/devices/backends/hal/halbattery.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halbattery.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halbattery.h 2017-07-02 10:15:10.000000000 +0200 @@ -39,51 +39,51 @@ Battery(HalDevice *device); virtual ~Battery(); - virtual bool isPresent() const; - virtual Solid::Battery::BatteryType type() const; + bool isPresent() const Q_DECL_OVERRIDE; + Solid::Battery::BatteryType type() const Q_DECL_OVERRIDE; - virtual int chargePercent() const; - virtual int capacity() const; + int chargePercent() const Q_DECL_OVERRIDE; + int capacity() const Q_DECL_OVERRIDE; - virtual bool isRechargeable() const; - virtual bool isPowerSupply() const; + bool isRechargeable() const Q_DECL_OVERRIDE; + bool isPowerSupply() const Q_DECL_OVERRIDE; - virtual Solid::Battery::ChargeState chargeState() const; - virtual qlonglong timeToEmpty() const; - virtual qlonglong timeToFull() const; + Solid::Battery::ChargeState chargeState() const Q_DECL_OVERRIDE; + qlonglong timeToEmpty() const Q_DECL_OVERRIDE; + qlonglong timeToFull() const Q_DECL_OVERRIDE; - virtual Solid::Battery::Technology technology() const; + Solid::Battery::Technology technology() const Q_DECL_OVERRIDE; - virtual double energy() const; - virtual double energyFull() const; - virtual double energyFullDesign() const; - virtual double energyRate() const; + double energy() const Q_DECL_OVERRIDE; + double energyFull() const Q_DECL_OVERRIDE; + double energyFullDesign() const Q_DECL_OVERRIDE; + double energyRate() const Q_DECL_OVERRIDE; - virtual double voltage() const; - virtual double temperature() const; + double voltage() const Q_DECL_OVERRIDE; + double temperature() const Q_DECL_OVERRIDE; - virtual bool isRecalled() const; - virtual QString recallVendor() const; - virtual QString recallUrl() const; + bool isRecalled() const Q_DECL_OVERRIDE; + QString recallVendor() const Q_DECL_OVERRIDE; + QString recallUrl() const Q_DECL_OVERRIDE; - virtual QString serial() const; + QString serial() const Q_DECL_OVERRIDE; - virtual qlonglong remainingTime() const; + qlonglong remainingTime() const Q_DECL_OVERRIDE; Q_SIGNALS: - void presentStateChanged(bool newState, const QString &udi); - void chargePercentChanged(int value, const QString &udi); - void capacityChanged(int value, const QString &udi); - void powerSupplyStateChanged(bool newState, const QString &udi); // dummy - void chargeStateChanged(int newState, const QString &udi); - void timeToEmptyChanged(qlonglong time, const QString &udi); - void timeToFullChanged(qlonglong time, const QString &udi); - void energyChanged(double energy, const QString &udi); - void energyFullChanged(double energyFull, const QString &udi); - void energyFullDesignChanged(double energyFullDesign, const QString &udi); - void energyRateChanged(double energyRate, const QString &udi); - void voltageChanged(double voltage, const QString &udi); - void temperatureChanged(double temperature, const QString &udi); // dummy + void presentStateChanged(bool newState, const QString &udi) Q_DECL_OVERRIDE; + void chargePercentChanged(int value, const QString &udi) Q_DECL_OVERRIDE; + void capacityChanged(int value, const QString &udi) Q_DECL_OVERRIDE; + void powerSupplyStateChanged(bool newState, const QString &udi) Q_DECL_OVERRIDE; // dummy + void chargeStateChanged(int newState, const QString &udi) Q_DECL_OVERRIDE; + void timeToEmptyChanged(qlonglong time, const QString &udi) Q_DECL_OVERRIDE; + void timeToFullChanged(qlonglong time, const QString &udi) Q_DECL_OVERRIDE; + void energyChanged(double energy, const QString &udi) Q_DECL_OVERRIDE; + void energyFullChanged(double energyFull, const QString &udi) Q_DECL_OVERRIDE; + void energyFullDesignChanged(double energyFullDesign, const QString &udi) Q_DECL_OVERRIDE; + void energyRateChanged(double energyRate, const QString &udi) Q_DECL_OVERRIDE; + void voltageChanged(double voltage, const QString &udi) Q_DECL_OVERRIDE; + void temperatureChanged(double temperature, const QString &udi) Q_DECL_OVERRIDE; // dummy void remainingTimeChanged(qlonglong time, const QString &udi) Q_DECL_OVERRIDE; private Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halblock.h new/solid-5.36.0/src/solid/devices/backends/hal/halblock.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halblock.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halblock.h 2017-07-02 10:15:10.000000000 +0200 @@ -39,9 +39,9 @@ Block(HalDevice *device); virtual ~Block(); - virtual int deviceMajor() const; - virtual int deviceMinor() const; - virtual QString device() const; + int deviceMajor() const Q_DECL_OVERRIDE; + int deviceMinor() const Q_DECL_OVERRIDE; + QString device() const Q_DECL_OVERRIDE; }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halcamera.h new/solid-5.36.0/src/solid/devices/backends/hal/halcamera.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halcamera.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halcamera.h 2017-07-02 10:15:10.000000000 +0200 @@ -39,9 +39,9 @@ Camera(HalDevice *device); virtual ~Camera(); - virtual QStringList supportedProtocols() const; - virtual QStringList supportedDrivers(QString protocol = QString()) const; - virtual QVariant driverHandle(const QString &driver) const; + QStringList supportedProtocols() const Q_DECL_OVERRIDE; + QStringList supportedDrivers(QString protocol = QString()) const Q_DECL_OVERRIDE; + QVariant driverHandle(const QString &driver) const Q_DECL_OVERRIDE; }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halcdrom.h new/solid-5.36.0/src/solid/devices/backends/hal/halcdrom.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halcdrom.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halcdrom.h 2017-07-02 10:15:10.000000000 +0200 @@ -44,15 +44,15 @@ Cdrom(HalDevice *device); virtual ~Cdrom(); - virtual Solid::OpticalDrive::MediumTypes supportedMedia() const; - virtual int readSpeed() const; - virtual int writeSpeed() const; - virtual QList<int> writeSpeeds() const; - virtual bool eject(); + Solid::OpticalDrive::MediumTypes supportedMedia() const Q_DECL_OVERRIDE; + int readSpeed() const Q_DECL_OVERRIDE; + int writeSpeed() const Q_DECL_OVERRIDE; + QList<int> writeSpeeds() const Q_DECL_OVERRIDE; + bool eject() Q_DECL_OVERRIDE; Q_SIGNALS: - void ejectPressed(const QString &udi); - void ejectDone(Solid::ErrorType error, QVariant errorData, const QString &udi); + void ejectPressed(const QString &udi) Q_DECL_OVERRIDE; + void ejectDone(Solid::ErrorType error, QVariant errorData, const QString &udi) Q_DECL_OVERRIDE; void ejectRequested(const QString &udi); private Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/haldevice.h new/solid-5.36.0/src/solid/devices/backends/hal/haldevice.h --- old/solid-5.35.0/src/solid/devices/backends/hal/haldevice.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/haldevice.h 2017-07-02 10:15:10.000000000 +0200 @@ -48,17 +48,17 @@ HalDevice(const QString &udi); virtual ~HalDevice(); - virtual QString udi() const; - virtual QString parentUdi() const; + QString udi() const Q_DECL_OVERRIDE; + QString parentUdi() const Q_DECL_OVERRIDE; - virtual QString vendor() const; - virtual QString product() const; - virtual QString icon() const; - virtual QStringList emblems() const; - virtual QString description() const; + QString vendor() const Q_DECL_OVERRIDE; + QString product() const Q_DECL_OVERRIDE; + QString icon() const Q_DECL_OVERRIDE; + QStringList emblems() const Q_DECL_OVERRIDE; + QString description() const Q_DECL_OVERRIDE; - virtual bool queryDeviceInterface(const Solid::DeviceInterface::Type &type) const; - virtual QObject *createDeviceInterface(const Solid::DeviceInterface::Type &type); + bool queryDeviceInterface(const Solid::DeviceInterface::Type &type) const Q_DECL_OVERRIDE; + QObject *createDeviceInterface(const Solid::DeviceInterface::Type &type) Q_DECL_OVERRIDE; public: QVariant prop(const QString &key) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halgenericinterface.h new/solid-5.36.0/src/solid/devices/backends/hal/halgenericinterface.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halgenericinterface.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halgenericinterface.h 2017-07-02 10:15:10.000000000 +0200 @@ -42,13 +42,13 @@ GenericInterface(HalDevice *device); virtual ~GenericInterface(); - virtual QVariant property(const QString &key) const; - virtual QMap<QString, QVariant> allProperties() const; - virtual bool propertyExists(const QString &key) const; + QVariant property(const QString &key) const Q_DECL_OVERRIDE; + QMap<QString, QVariant> allProperties() const Q_DECL_OVERRIDE; + bool propertyExists(const QString &key) const Q_DECL_OVERRIDE; Q_SIGNALS: - void propertyChanged(const QMap<QString, int> &changes); - void conditionRaised(const QString &condition, const QString &reason); + void propertyChanged(const QMap<QString, int> &changes) Q_DECL_OVERRIDE; + void conditionRaised(const QString &condition, const QString &reason) Q_DECL_OVERRIDE; }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halopticaldisc.h new/solid-5.36.0/src/solid/devices/backends/hal/halopticaldisc.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halopticaldisc.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halopticaldisc.h 2017-07-02 10:15:10.000000000 +0200 @@ -39,12 +39,12 @@ OpticalDisc(HalDevice *device); virtual ~OpticalDisc(); - virtual Solid::OpticalDisc::ContentTypes availableContent() const; - virtual Solid::OpticalDisc::DiscType discType() const; - virtual bool isAppendable() const; - virtual bool isBlank() const; - virtual bool isRewritable() const; - virtual qulonglong capacity() const; + Solid::OpticalDisc::ContentTypes availableContent() const Q_DECL_OVERRIDE; + Solid::OpticalDisc::DiscType discType() const Q_DECL_OVERRIDE; + bool isAppendable() const Q_DECL_OVERRIDE; + bool isBlank() const Q_DECL_OVERRIDE; + bool isRewritable() const Q_DECL_OVERRIDE; + qulonglong capacity() const Q_DECL_OVERRIDE; }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halportablemediaplayer.h new/solid-5.36.0/src/solid/devices/backends/hal/halportablemediaplayer.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halportablemediaplayer.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halportablemediaplayer.h 2017-07-02 10:15:10.000000000 +0200 @@ -44,9 +44,9 @@ PortableMediaPlayer(HalDevice *device); virtual ~PortableMediaPlayer(); - virtual QStringList supportedProtocols() const; - virtual QStringList supportedDrivers(QString protocol = QString()) const; - virtual QVariant driverHandle(const QString &driver) const; + QStringList supportedProtocols() const Q_DECL_OVERRIDE; + QStringList supportedDrivers(QString protocol = QString()) const Q_DECL_OVERRIDE; + QVariant driverHandle(const QString &driver) const Q_DECL_OVERRIDE; }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halprocessor.h new/solid-5.36.0/src/solid/devices/backends/hal/halprocessor.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halprocessor.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halprocessor.h 2017-07-02 10:15:10.000000000 +0200 @@ -41,10 +41,10 @@ Processor(HalDevice *device); virtual ~Processor(); - virtual int number() const; - virtual int maxSpeed() const; - virtual bool canChangeFrequency() const; - virtual Solid::Processor::InstructionSets instructionSets() const; + int number() const Q_DECL_OVERRIDE; + int maxSpeed() const Q_DECL_OVERRIDE; + bool canChangeFrequency() const Q_DECL_OVERRIDE; + Solid::Processor::InstructionSets instructionSets() const Q_DECL_OVERRIDE; }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halstorage.h new/solid-5.36.0/src/solid/devices/backends/hal/halstorage.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halstorage.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halstorage.h 2017-07-02 10:15:10.000000000 +0200 @@ -39,12 +39,12 @@ Storage(HalDevice *device); virtual ~Storage(); - virtual Solid::StorageDrive::Bus bus() const; - virtual Solid::StorageDrive::DriveType driveType() const; + Solid::StorageDrive::Bus bus() const Q_DECL_OVERRIDE; + Solid::StorageDrive::DriveType driveType() const Q_DECL_OVERRIDE; - virtual bool isRemovable() const; - virtual bool isHotpluggable() const; - virtual qulonglong size() const; + bool isRemovable() const Q_DECL_OVERRIDE; + bool isHotpluggable() const Q_DECL_OVERRIDE; + qulonglong size() const Q_DECL_OVERRIDE; }; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halstorageaccess.h new/solid-5.36.0/src/solid/devices/backends/hal/halstorageaccess.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halstorageaccess.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halstorageaccess.h 2017-07-02 10:15:10.000000000 +0200 @@ -44,19 +44,19 @@ StorageAccess(HalDevice *device); virtual ~StorageAccess(); - virtual bool isAccessible() const; - virtual QString filePath() const; - virtual bool isIgnored() const; - virtual bool setup(); - virtual bool teardown(); + bool isAccessible() const Q_DECL_OVERRIDE; + QString filePath() const Q_DECL_OVERRIDE; + bool isIgnored() const Q_DECL_OVERRIDE; + bool setup() Q_DECL_OVERRIDE; + bool teardown() Q_DECL_OVERRIDE; Q_SIGNALS: - void accessibilityChanged(bool accessible, const QString &udi); - void setupDone(Solid::ErrorType error, QVariant errorData, const QString &udi); - void teardownDone(Solid::ErrorType error, QVariant errorData, const QString &udi); + void accessibilityChanged(bool accessible, const QString &udi) Q_DECL_OVERRIDE; + void setupDone(Solid::ErrorType error, QVariant errorData, const QString &udi) Q_DECL_OVERRIDE; + void teardownDone(Solid::ErrorType error, QVariant errorData, const QString &udi) Q_DECL_OVERRIDE; void ejectDone(Solid::ErrorType error, QVariant errorData, const QString &udi); - void setupRequested(const QString &udi); - void teardownRequested(const QString &udi); + void setupRequested(const QString &udi) Q_DECL_OVERRIDE; + void teardownRequested(const QString &udi) Q_DECL_OVERRIDE; private Q_SLOTS: void connectDBusSignals(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.35.0/src/solid/devices/backends/hal/halvolume.h new/solid-5.36.0/src/solid/devices/backends/hal/halvolume.h --- old/solid-5.35.0/src/solid/devices/backends/hal/halvolume.h 2017-06-03 12:25:06.000000000 +0200 +++ new/solid-5.36.0/src/solid/devices/backends/hal/halvolume.h 2017-07-02 10:15:10.000000000 +0200 @@ -39,13 +39,13 @@ Volume(HalDevice *device); virtual ~Volume(); - virtual bool isIgnored() const; - virtual Solid::StorageVolume::UsageType usage() const; - virtual QString fsType() const; - virtual QString label() const; - virtual QString uuid() const; - virtual qulonglong size() const; - virtual QString encryptedContainerUdi() const; + bool isIgnored() const Q_DECL_OVERRIDE; + Solid::StorageVolume::UsageType usage() const Q_DECL_OVERRIDE; + QString fsType() const Q_DECL_OVERRIDE; + QString label() const Q_DECL_OVERRIDE; + QString uuid() const Q_DECL_OVERRIDE; + qulonglong size() const Q_DECL_OVERRIDE; + QString encryptedContainerUdi() const Q_DECL_OVERRIDE; }; } }
