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

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid/backends/udisks2: Replace QObject::tr() by QCoreApplicati
From:       Andrea Scarpino <scarpino () kde ! org>
Date:       2013-06-05 22:56:57
Message-ID: 20130605225657.A7ADFA605A () git ! kde ! org
[Download RAW message or body]

Git commit 33578e91e16286c729d60b7dcbc07f9900dd6390 by Andrea Scarpino.
Committed on 06/06/2013 at 00:56.
Pushed by scarpino into branch 'frameworks'.

Replace QObject::tr() by QCoreApplication::translate()

M  +8    -8    tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp

http://commits.kde.org/kdelibs/33578e91e16286c729d60b7dcbc07f9900dd6390

diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp \
b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp index b30a37e..ace0103 \
                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 = QObject::tr("%1 TiB").arg(QLocale().toString(size / 1024.0, 'f', \
1)); +            s = QCoreApplication::translate("udisksdevice", "%1 \
TiB").arg(QLocale().toString(size / 1024.0, 'f', 1));  else
-            s = QObject::tr("%1 GiB").arg(QLocale().toString(size, 'f', 1));
+            s = QCoreApplication::translate("udisksdevice", "%1 \
GiB").arg(QLocale().toString(size, 'f', 1));  }
     // Mebi-byte
     else if ( size >= 1048576.0 )
     {
         size /= 1048576.0;
-        s = QObject::tr("%1 MiB").arg(QLocale().toString(size, 'f', 1));
+        s = QCoreApplication::translate("udisksdevice", "%1 \
MiB").arg(QLocale().toString(size, 'f', 1));  }
     // Kibi-byte
     else if ( size >= 1024.0 )
     {
         size /= 1024.0;
-        s = QObject::tr("%1 KiB").arg(QLocale().toString(size, 'f', 1));
+        s = QCoreApplication::translate("udisksdevice", "%1 \
KiB").arg(QLocale().toString(size, 'f', 1));  }
     // Just byte
     else if ( size > 0 )
     {
-        s = QObject::tr("%1 B").arg(QLocale().toString(size, 'f', 1));
+        s = QCoreApplication::translate("udisksdevice", "%1 \
B").arg(QLocale().toString(size, 'f', 1));  }
     // Nothing
     else
     {
-        s = QObject::tr("0 B");
+        s = QCoreApplication::translate("udisksdevice", "0 B");
     }
     return s;
 }
@@ -251,9 +251,9 @@ QString Device::description() const
         return hintName;
 
     if (isLoop())
-        return QObject::tr("Loop Device");
+        return QCoreApplication::translate("udisksdevice", "Loop Device");
     else if (isSwap())
-        return QObject::tr("Swap Space");
+        return QCoreApplication::translate("udisksdevice", "Swap Space");
     else if (queryDeviceInterface(Solid::DeviceInterface::StorageDrive))
         return storageDescription();
     else if (queryDeviceInterface(Solid::DeviceInterface::StorageVolume))


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