[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid/backends/udisks2: Fix build when udisks2 is enabled
From:       Andrea Scarpino <scarpino () kde ! org>
Date:       2013-06-05 19:00:51
Message-ID: 20130605190051.746C2A605A () git ! kde ! org
[Download RAW message or body]

Git commit 71ef88c8c327dbffd3c1eeae3b6de7dfba9efbc5 by Andrea Scarpino.
Committed on 05/06/2013 at 20:59.
Pushed by scarpino into branch 'frameworks'.

Fix build when udisks2 is enabled

REVIEW: 110841

M  +6    -6    tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
M  +7    -2    tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.cpp
M  +2    -1    tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.h

http://commits.kde.org/kdelibs/71ef88c8c327dbffd3c1eeae3b6de7dfba9efbc5

diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp \
b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp index 5bbf2ac..b30a37e \
                100644
--- a/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
+++ b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
@@ -61,31 +61,31 @@ static QString formatByteSize(double size)
     {
         size /= 1073741824.0;
         if ( size > 1024 ) // Tebi-byte
-            s = tr("%1 TiB").arg(QLocale().toString(size / 1024.0, 'f', 1));
+            s = QObject::tr("%1 TiB").arg(QLocale().toString(size / 1024.0, 'f', \
1));  else
-            s = tr("%1 GiB").arg(QLocale().toString(size, 'f', 1));
+            s = QObject::tr("%1 GiB").arg(QLocale().toString(size, 'f', 1));
     }
     // Mebi-byte
     else if ( size >= 1048576.0 )
     {
         size /= 1048576.0;
-        s = tr("%1 MiB").arg(QLocale().toString(size, 'f', 1));
+        s = QObject::tr("%1 MiB").arg(QLocale().toString(size, 'f', 1));
     }
     // Kibi-byte
     else if ( size >= 1024.0 )
     {
         size /= 1024.0;
-        s = tr("%1 KiB").arg(QLocale().toString(size, 'f', 1));
+        s = QObject::tr("%1 KiB").arg(QLocale().toString(size, 'f', 1));
     }
     // Just byte
     else if ( size > 0 )
     {
-        s = tr("%1 B").arg(QLocale().toString(size, 'f', 1));
+        s = QObject::tr("%1 B").arg(QLocale().toString(size, 'f', 1));
     }
     // Nothing
     else
     {
-        s = tr("0 B");
+        s = QObject::tr("0 B");
     }
     return s;
 }
diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.cpp \
b/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.cpp index \
                2a01b86..31ccbcf 100644
--- a/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.cpp
+++ b/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.cpp
@@ -34,7 +34,7 @@ using namespace Solid::Backends::UDisks2;
 /* Static cache for DeviceBackends for all UDIs */
 QMap<QString /* UDI */, DeviceBackend*> DeviceBackend::s_backends;
 
-DeviceBackend* DeviceBackend::backendForUDI(const QString& udi)
+DeviceBackend* DeviceBackend::backendForUDI(const QString& udi, bool create)
 {
     DeviceBackend *backend = 0;
     if (udi.isEmpty()) {
@@ -43,7 +43,7 @@ DeviceBackend* DeviceBackend::backendForUDI(const QString& udi)
 
     if (s_backends.contains(udi)) {
         backend = s_backends.value(udi);
-    } else {
+    } else if (create) {
         backend = new DeviceBackend(udi);
         s_backends.insert(udi, backend);
     }
@@ -154,6 +154,11 @@ QVariantMap DeviceBackend::allProperties() const
     return m_propertyCache;
 }
 
+void DeviceBackend::invalidateProperties()
+{
+    m_propertyCache.clear();
+}
+
 QString DeviceBackend::introspect() const
 {
     QDBusMessage call = QDBusMessage::createMethodCall(UD2_DBUS_SERVICE, m_udi,
diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.h \
b/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.h index 829fa41..e7f3cc8 \
                100644
--- a/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.h
+++ b/tier1/solid/src/solid/backends/udisks2/udisksdevicebackend.h
@@ -40,7 +40,7 @@ class DeviceBackend: public QObject {
     Q_OBJECT
 
   public:
-    static DeviceBackend* backendForUDI(const QString &udi);
+    static DeviceBackend* backendForUDI(const QString &udi, bool create = true);
     static void destroyBackend(const QString &udi);
 
     DeviceBackend(const QString &udi);
@@ -53,6 +53,7 @@ class DeviceBackend: public QObject {
     QStringList interfaces() const;
     const QString & udi() const;
 
+    void invalidateProperties();
   Q_SIGNALS:
     void propertyChanged(const QMap<QString, int> &changeMap);
     void changed();


[prev in list] [next in list] [prev in thread] [next in thread]