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

List:       kde-commits
Subject:    [kdelibs/KDE/4.8] solid/solid/backends/wmi: added AcAdapter support
From:       Patrick von Reth <vonreth () kde ! org>
Date:       2012-06-30 12:34:35
Message-ID: 20120630123435.922FCA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 5473c824351eb06f35b9b5589943d31e20c1d834 by Patrick von Reth.
Committed on 30/06/2012 at 14:34.
Pushed by vonreth into branch 'KDE/4.8'.

added AcAdapter support

M  +3    -7    solid/solid/backends/wmi/wmiacadapter.cpp
M  +2    -1    solid/solid/backends/wmi/wmidevice.cpp
M  +1    -1    solid/solid/backends/wmi/wmimanager.cpp

http://commits.kde.org/kdelibs/5473c824351eb06f35b9b5589943d31e20c1d834

diff --git a/solid/solid/backends/wmi/wmiacadapter.cpp \
b/solid/solid/backends/wmi/wmiacadapter.cpp index e41567f..98ee622 100644
--- a/solid/solid/backends/wmi/wmiacadapter.cpp
+++ b/solid/solid/backends/wmi/wmiacadapter.cpp
@@ -25,8 +25,8 @@ using namespace Solid::Backends::Wmi;
 AcAdapter::AcAdapter(WmiDevice *device)
     : DeviceInterface(device)
 {
-    connect(device, SIGNAL(propertyChanged(QMap<QString,int>)),
-             this, SLOT(slotPropertyChanged(QMap<QString,int>)));
+//     connect(device, SIGNAL(propertyChanged(QMap<QString,int>)),
+//              this, SLOT(slotPropertyChanged(QMap<QString,int>)));
 }
 
 AcAdapter::~AcAdapter()
@@ -36,15 +36,11 @@ AcAdapter::~AcAdapter()
 
 bool AcAdapter::isPlugged() const
 {
-    return m_device->property("ac_adapter.present").toBool();
+    return m_device->property("BatteryStatus").toUInt() == 2;
 }
 
 void AcAdapter::slotPropertyChanged(const QMap<QString,int> &changes)
 {
-    if (changes.contains("ac_adapter.present"))
-    {
-        emit plugStateChanged(isPlugged(), m_device->udi());
-    }
 }
 
 #include "backends/wmi/wmiacadapter.moc"
diff --git a/solid/solid/backends/wmi/wmidevice.cpp \
b/solid/solid/backends/wmi/wmidevice.cpp index f1b395a..21683b0 100644
--- a/solid/solid/backends/wmi/wmidevice.cpp
+++ b/solid/solid/backends/wmi/wmidevice.cpp
@@ -223,7 +223,6 @@ public:
         case Solid::DeviceInterface::NetworkInterface:
             break;
         case Solid::DeviceInterface::AcAdapter:
-            break;
         case Solid::DeviceInterface::Battery:
             wmiTable = "Win32_Battery";
             break;
@@ -409,6 +408,8 @@ QString WmiDevice::product() const
         return item.getProperty("VolumeName").toString();
     }
         break;
+    case Solid::DeviceInterface::AcAdapter:
+        return description();
     default:
         propertyName = "Caption";
     }
diff --git a/solid/solid/backends/wmi/wmimanager.cpp \
b/solid/solid/backends/wmi/wmimanager.cpp index 143976f..34993ed 100644
--- a/solid/solid/backends/wmi/wmimanager.cpp
+++ b/solid/solid/backends/wmi/wmimanager.cpp
@@ -47,7 +47,7 @@ public:
                                //                           << \
                Solid::DeviceInterface::Camera
                                //                           << \
                Solid::DeviceInterface::PortableMediaPlayer
                                //                           << \
                Solid::DeviceInterface::NetworkInterface
-                               //                           << \
Solid::DeviceInterface::AcAdapter +                            << \
Solid::DeviceInterface::AcAdapter  << Solid::DeviceInterface::Battery
                                //                           << \
                Solid::DeviceInterface::Button
                                //                           << \
Solid::DeviceInterface::AudioInterface


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