[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 warnings in Solid UDisks2 backend
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2013-11-04 19:57:43
Message-ID: E1VdQHP-0004LA-V9 () scm ! kde ! org
[Download RAW message or body]

Git commit 586362f10e1a34f30df4d519b9ae62041222b7b6 by Alex Merry.
Committed on 31/10/2013 at 23:31.
Pushed by alexmerry into branch 'frameworks'.

Fix warnings in Solid UDisks2 backend

Make it explicit that UDisks2 does not support Keyboard or
PointingDevice.  Also make the switch statement easier to read.

REVIEW: 113586

M  +5    -27   tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface=
.h

http://commits.kde.org/kdelibs/586362f10e1a34f30df4d519b9ae62041222b7b6

diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.h=
 b/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.h
index 43a1b6f..f1a80ba 100644
--- a/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.h
+++ b/tier1/solid/src/solid/backends/udisks2/udisksdeviceinterface.h
@@ -55,9 +55,6 @@ public:
         case Solid::DeviceInterface::GenericInterface:
             list << "generic";
             break;
-        case Solid::DeviceInterface::Processor:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::Block:
             list << "block";
             break;
@@ -76,42 +73,23 @@ public:
         case Solid::DeviceInterface::OpticalDisc:
             list << "volume.disc";
             break;
+        case Solid::DeviceInterface::Processor:
         case Solid::DeviceInterface::Camera:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::PortableMediaPlayer:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::NetworkInterface:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::AcAdapter:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::Battery:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::Button:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::AudioInterface:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::DvbInterface:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::Video:
-            // Doesn't exist with UDisks
-            break;
         case Solid::DeviceInterface::SerialInterface:
-            // Doesn't exist with UDisks
-            break;
-        case Solid::DeviceInterface::InternetGateway:
-            break;
         case Solid::DeviceInterface::SmartCardReader:
-            // Doesn't exist with UDisks
+        case Solid::DeviceInterface::InternetGateway:
         case Solid::DeviceInterface::NetworkShare:
-            // Doesn't exist with UDisks
+        case Solid::DeviceInterface::Keyboard:
+        case Solid::DeviceInterface::PointingDevice:
+            // These do not exist with UDisks
             break;
         case Solid::DeviceInterface::Unknown:
             break;

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