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

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid
From:       Christopher Blauvelt <cblauvelt () gmail ! com>
Date:       2009-06-05 4:31:51
Message-ID: 1244176311.341416.9790.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 977702 by cblauvelt:

Fix a bug from converting a Solid::Device to a Solid::SmartCardReader.



 M  +1 -1      CMakeLists.txt  
 M  +3 -0      backends/hal/haldevice.cpp  
 M  +5 -0      device.cpp  


--- trunk/KDE/kdelibs/solid/solid/CMakeLists.txt #977701:977702
@@ -234,7 +234,7 @@
                storageaccess.h storagedrive.h opticaldrive.h storagevolume.h opticaldisc.h
                camera.h portablemediaplayer.h networkinterface.h acadapter.h battery.h
                button.h audiointerface.h dvbinterface.h predicate.h powermanagement.h
-               networking.h video.h serialinterface.h
+               networking.h video.h serialinterface.h smartcardreader.h
                DESTINATION ${INCLUDE_INSTALL_DIR}/solid COMPONENT Devel)
 
 ########### parser build ###############
--- trunk/KDE/kdelibs/solid/solid/backends/hal/haldevice.cpp #977701:977702
@@ -432,6 +432,9 @@
     case Solid::DeviceInterface::SerialInterface:
         iface = new SerialInterface(this);
         break;
+    case Solid::DeviceInterface::SmartCardReader:
+        iface = new SmartCardReader(this);
+        break;
     case Solid::DeviceInterface::Unknown:
     case Solid::DeviceInterface::Last:
         break;
--- trunk/KDE/kdelibs/solid/solid/device.cpp #977701:977702
@@ -63,6 +63,8 @@
 #include <solid/ifaces/video.h>
 #include <solid/serialinterface.h>
 #include <solid/ifaces/serialinterface.h>
+#include <solid/smartcardreader.h>
+#include <solid/ifaces/smartcardreader.h>
 
 
 Solid::Device::Device(const QString &udi)
@@ -217,6 +219,9 @@
             case DeviceInterface::SerialInterface:
                 iface = deviceinterface_cast(Ifaces::SerialInterface, SerialInterface, dev_iface);
                 break;
+            case DeviceInterface::SmartCardReader:
+                iface = deviceinterface_cast(Ifaces::SmartCardReader, SmartCardReader, dev_iface);
+                break;
             case DeviceInterface::Unknown:
             case DeviceInterface::Last:
                 break;
[prev in list] [next in list] [prev in thread] [next in thread]