Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2014-03-10 12:17:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2014-02-28 16:21:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2014-03-10 12:17:37.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:39:05 UTC 2014 - [email protected] + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- solid-4.96.0.tar.xz New: ---- solid-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.T9Fpwu/_old 2014-03-10 12:17:38.000000000 +0100 +++ /var/tmp/diff_new_pack.T9Fpwu/_new 2014-03-10 12:17:38.000000000 +0100 @@ -16,13 +16,13 @@ # -%define lname libKF5Solid4 +%define lname libKF5Solid5 Name: solid -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: flex BuildRequires: kf5-filesystem @@ -47,6 +47,7 @@ %package -n %lname Summary: KDE Desktop hardware abstraction Group: System/GUI/KDE +Obsoletes: libKF5Solid4 %description -n %lname Solid is a device integration framework. It provides a way of querying and ++++++ solid-4.96.0.tar.xz -> solid-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/CMakeLists.txt new/solid-4.97.0/CMakeLists.txt --- old/solid-4.96.0/CMakeLists.txt 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/CMakeLists.txt 2014-03-01 12:51:52.000000000 +0100 @@ -3,7 +3,7 @@ project(Solid) -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -20,7 +20,7 @@ include(FeatureSummary) include(GenerateExportHeader) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) @@ -67,11 +67,12 @@ ############### Give the user the option to build the deprecated WMI solid backend instead of the new win backend ############### option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows") -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX SOLID VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/solid_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5SolidConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5SolidConfigVersion.cmake" + SOVERSION 5) # TODO: Remove these remove_definitions(-DQT_NO_CAST_TO_ASCII) @@ -88,7 +89,7 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Solid") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5SolidConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5SolidConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5SolidConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/imports/devices.cpp new/solid-4.97.0/src/imports/devices.cpp --- old/solid-4.96.0/src/imports/devices.cpp 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/imports/devices.cpp 2014-03-01 12:51:52.000000000 +0100 @@ -1,20 +1,18 @@ /* * Copyright (C) 2013 Ivan Cukic <ivan.cukic(at)kde.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * or (at your option) any later version, as published by the Free - * Software Foundation + * 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) any later version. * - * This program is distributed in the hope that it will be useful, + * 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 General Public License for more details + * 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 General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "devices.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/imports/devices.h new/solid-4.97.0/src/imports/devices.h --- old/solid-4.96.0/src/imports/devices.h 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/imports/devices.h 2014-03-01 12:51:52.000000000 +0100 @@ -1,20 +1,18 @@ /* * Copyright (C) 2013 Ivan Cukic <ivan.cukic(at)kde.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * or (at your option) any later version, as published by the Free - * Software Foundation + * 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) any later version. * - * This program is distributed in the hope that it will be useful, + * 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 General Public License for more details + * 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 General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifndef SOLID_DECALARATIVE_DEVICES_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/imports/devices_p.h new/solid-4.97.0/src/imports/devices_p.h --- old/solid-4.96.0/src/imports/devices_p.h 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/imports/devices_p.h 2014-03-01 12:51:52.000000000 +0100 @@ -1,20 +1,18 @@ /* * Copyright (C) 2013 Ivan Cukic <ivan.cukic(at)kde.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * or (at your option) any later version, as published by the Free - * Software Foundation + * 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) any later version. * - * This program is distributed in the hope that it will be useful, + * 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 General Public License for more details + * 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 General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifndef SOLID_DECALARATIVE_DEVICE_NOTIFIER_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/imports/solidextensionplugin.cpp new/solid-4.97.0/src/imports/solidextensionplugin.cpp --- old/solid-4.96.0/src/imports/solidextensionplugin.cpp 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/imports/solidextensionplugin.cpp 2014-03-01 12:51:52.000000000 +0100 @@ -1,20 +1,18 @@ /* * Copyright (C) 2013 Ivan Cukic <ivan.cukic(at)kde.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * or (at your option) any later version, as published by the Free - * Software Foundation + * 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) any later version. * - * This program is distributed in the hope that it will be useful, + * 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 General Public License for more details + * 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 General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "solidextensionplugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/imports/solidextensionplugin.h new/solid-4.97.0/src/imports/solidextensionplugin.h --- old/solid-4.96.0/src/imports/solidextensionplugin.h 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/imports/solidextensionplugin.h 2014-03-01 12:51:52.000000000 +0100 @@ -1,20 +1,18 @@ /* * Copyright (C) 2013 Ivan Cukic <ivan.cukic(at)kde.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * or (at your option) any later version, as published by the Free - * Software Foundation + * 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) any later version. * - * This program is distributed in the hope that it will be useful, + * 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 General Public License for more details + * 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 General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifndef SOLID_DECLARATIVE_EXTENSION_PLUGIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/CMakeLists.txt new/solid-4.97.0/src/solid/CMakeLists.txt --- old/solid-4.96.0/src/solid/CMakeLists.txt 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/CMakeLists.txt 2014-03-01 12:51:52.000000000 +0100 @@ -455,7 +455,7 @@ add_library(KF5::Solid ALIAS KF5Solid) # Apps must include <Solid/File> or <solid/file.h> -target_include_directories(KF5Solid INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>/Solid") +target_include_directories(KF5Solid INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/Solid>") target_link_libraries(KF5Solid PUBLIC Qt5::Core PRIVATE Qt5::DBus @@ -469,7 +469,8 @@ EXPORT_NAME Solid ) -ecm_generate_headers( +ecm_generate_headers(Solid_CamelCase_HEADERS + HEADER_NAMES Device DeviceNotifier DeviceInterface @@ -500,11 +501,10 @@ Keyboard PointingDevice - MODULE_NAME Solid REQUIRED_HEADERS Solid_HEADERS PREFIX Solid ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Solid DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) +install(FILES ${Solid_CamelCase_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/Solid/Solid COMPONENT Devel) install(TARGETS KF5Solid EXPORT KF5SolidTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/dbus/manager.h new/solid-4.97.0/src/solid/backends/udisks2/dbus/manager.h --- old/solid-4.96.0/src/solid/backends/udisks2/dbus/manager.h 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/dbus/manager.h 2014-03-01 12:51:52.000000000 +0100 @@ -47,7 +47,7 @@ } Q_SIGNALS: // SIGNALS - void InterfacesAdded(const QDBusObjectPath &object_path, const QVariantMapMap &interfaces_and_properties); + void InterfacesAdded(const QDBusObjectPath &object_path, const VariantMapMap &interfaces_and_properties); void InterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/udisks2.h new/solid-4.97.0/src/solid/backends/udisks2/udisks2.h --- old/solid-4.96.0/src/solid/backends/udisks2/udisks2.h 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/udisks2.h 2014-03-01 12:51:52.000000000 +0100 @@ -27,13 +27,13 @@ #include <QMap> #include <QList> -typedef QList<QByteArray> QByteArrayList; -Q_DECLARE_METATYPE(QByteArrayList) +typedef QList<QByteArray> ByteArrayList; +Q_DECLARE_METATYPE(ByteArrayList) -typedef QMap<QString, QVariantMap> QVariantMapMap; -Q_DECLARE_METATYPE(QVariantMapMap) +typedef QMap<QString, QVariantMap> VariantMapMap; +Q_DECLARE_METATYPE(VariantMapMap) -typedef QMap<QDBusObjectPath, QVariantMapMap> DBUSManagerStruct; +typedef QMap<QDBusObjectPath, VariantMapMap> DBUSManagerStruct; Q_DECLARE_METATYPE(DBUSManagerStruct) /* UDisks2 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/udisksdevice.cpp new/solid-4.97.0/src/solid/backends/udisks2/udisksdevice.cpp --- old/solid-4.96.0/src/solid/backends/udisks2/udisksdevice.cpp 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/udisksdevice.cpp 2014-03-01 12:51:52.000000000 +0100 @@ -815,7 +815,7 @@ bool Device::isMounted() const { - return propertyExists("MountPoints") && !qdbus_cast<QByteArrayList>(prop("MountPoints")).isEmpty(); + return propertyExists("MountPoints") && !qdbus_cast<ByteArrayList>(prop("MountPoints")).isEmpty(); } bool Device::isEncryptedContainer() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/udisksdevicebackend.cpp new/solid-4.97.0/src/solid/backends/udisks2/udisksdevicebackend.cpp --- old/solid-4.96.0/src/solid/backends/udisks2/udisksdevicebackend.cpp 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/udisksdevicebackend.cpp 2014-03-01 12:51:52.000000000 +0100 @@ -72,7 +72,7 @@ QDBusConnection::systemBus().connect(UD2_DBUS_SERVICE, m_udi, DBUS_INTERFACE_PROPS, "PropertiesChanged", this, SLOT(slotPropertiesChanged(QString,QVariantMap,QStringList))); QDBusConnection::systemBus().connect(UD2_DBUS_SERVICE, UD2_DBUS_PATH, DBUS_INTERFACE_MANAGER, "InterfacesAdded", - this, SLOT(slotInterfacesAdded(QDBusObjectPath,QVariantMapMap))); + this, SLOT(slotInterfacesAdded(QDBusObjectPath,VariantMapMap))); QDBusConnection::systemBus().connect(UD2_DBUS_SERVICE, UD2_DBUS_PATH, DBUS_INTERFACE_MANAGER, "InterfacesRemoved", this, SLOT(slotInterfacesRemoved(QDBusObjectPath,QStringList))); @@ -221,7 +221,7 @@ emit changed(); } -void DeviceBackend::slotInterfacesAdded(const QDBusObjectPath &object_path, const QVariantMapMap &interfaces_and_properties) +void DeviceBackend::slotInterfacesAdded(const QDBusObjectPath &object_path, const VariantMapMap &interfaces_and_properties) { if (object_path.path() != m_udi) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/udisksdevicebackend.h new/solid-4.97.0/src/solid/backends/udisks2/udisksdevicebackend.h --- old/solid-4.96.0/src/solid/backends/udisks2/udisksdevicebackend.h 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/udisksdevicebackend.h 2014-03-01 12:51:52.000000000 +0100 @@ -63,7 +63,7 @@ void changed(); private Q_SLOTS: - void slotInterfacesAdded(const QDBusObjectPath &object_path, const QVariantMapMap &interfaces_and_properties); + void slotInterfacesAdded(const QDBusObjectPath &object_path, const VariantMapMap &interfaces_and_properties); void slotInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces); void slotPropertiesChanged(const QString &ifaceName, const QVariantMap &changedProps, const QStringList &invalidatedProps); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/udisksmanager.cpp new/solid-4.97.0/src/solid/backends/udisks2/udisksmanager.cpp --- old/solid-4.96.0/src/solid/backends/udisks2/udisksmanager.cpp 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/udisksmanager.cpp 2014-03-01 12:51:52.000000000 +0100 @@ -47,8 +47,8 @@ qDBusRegisterMetaType<QList<QDBusObjectPath> >(); qDBusRegisterMetaType<QVariantMap>(); - qDBusRegisterMetaType<QVariantMapMap>(); - qDBusRegisterMetaType<QByteArrayList>(); + qDBusRegisterMetaType<VariantMapMap>(); + qDBusRegisterMetaType<ByteArrayList>(); qDBusRegisterMetaType<DBUSManagerStruct>(); bool serviceFound = m_manager.isValid(); @@ -67,8 +67,8 @@ } if (serviceFound) { - connect(&m_manager, SIGNAL(InterfacesAdded(QDBusObjectPath,QVariantMapMap)), - this, SLOT(slotInterfacesAdded(QDBusObjectPath,QVariantMapMap))); + connect(&m_manager, SIGNAL(InterfacesAdded(QDBusObjectPath,VariantMapMap)), + this, SLOT(slotInterfacesAdded(QDBusObjectPath,VariantMapMap))); connect(&m_manager, SIGNAL(InterfacesRemoved(QDBusObjectPath,QStringList)), this, SLOT(slotInterfacesRemoved(QDBusObjectPath,QStringList))); } @@ -178,7 +178,7 @@ return UD2_UDI_DISKS_PREFIX; } -void Manager::slotInterfacesAdded(const QDBusObjectPath &object_path, const QVariantMapMap &interfaces_and_properties) +void Manager::slotInterfacesAdded(const QDBusObjectPath &object_path, const VariantMapMap &interfaces_and_properties) { const QString udi = object_path.path(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/udisksmanager.h new/solid-4.97.0/src/solid/backends/udisks2/udisksmanager.h --- old/solid-4.96.0/src/solid/backends/udisks2/udisksmanager.h 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/udisksmanager.h 2014-03-01 12:51:52.000000000 +0100 @@ -52,7 +52,7 @@ virtual ~Manager(); private Q_SLOTS: - void slotInterfacesAdded(const QDBusObjectPath &object_path, const QVariantMapMap &interfaces_and_properties); + void slotInterfacesAdded(const QDBusObjectPath &object_path, const VariantMapMap &interfaces_and_properties); void slotInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces); void slotMediaChanged(const QDBusMessage &msg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-4.96.0/src/solid/backends/udisks2/udisksstorageaccess.cpp new/solid-4.97.0/src/solid/backends/udisks2/udisksstorageaccess.cpp --- old/solid-4.96.0/src/solid/backends/udisks2/udisksstorageaccess.cpp 2014-02-05 21:53:03.000000000 +0100 +++ new/solid-4.97.0/src/solid/backends/udisks2/udisksstorageaccess.cpp 2014-03-01 12:51:52.000000000 +0100 @@ -77,7 +77,7 @@ QString StorageAccess::filePath() const { - QByteArrayList mntPoints; + ByteArrayList mntPoints; if (isLuksDevice()) { // encrypted (and unlocked) device const QString path = clearTextPath(); @@ -85,7 +85,7 @@ return QString(); } Device holderDevice(path); - mntPoints = qdbus_cast<QByteArrayList>(holderDevice.prop("MountPoints")); + mntPoints = qdbus_cast<ByteArrayList>(holderDevice.prop("MountPoints")); if (!mntPoints.isEmpty()) { return QFile::decodeName(mntPoints.first()); // FIXME Solid doesn't support multiple mount points } else { @@ -93,7 +93,7 @@ } } - mntPoints = qdbus_cast<QByteArrayList>(m_device->prop("MountPoints")); + mntPoints = qdbus_cast<ByteArrayList>(m_device->prop("MountPoints")); if (!mntPoints.isEmpty()) { return QFile::decodeName(mntPoints.first()); // FIXME Solid doesn't support multiple mount points -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
