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

List:       kde-commits
Subject:    [kdelibs/KDE/4.10] solid/solid/backends/upower: fixup last commit, restore emitting signals, oops
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2012-11-30 1:28:34
Message-ID: 20121130012834.CCD6AA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 9187862f9caa2b2d41fcfef0637f3e57f27efdd5 by Lukáš Tinkl.
Committed on 30/11/2012 at 02:28.
Pushed by lukas into branch 'KDE/4.10'.

fixup last commit, restore emitting signals, oops

M  +1    -3    solid/solid/backends/upower/upoweracadapter.cpp
M  +1    -3    solid/solid/backends/upower/upowerbattery.cpp

http://commits.kde.org/kdelibs/9187862f9caa2b2d41fcfef0637f3e57f27efdd5

diff --git a/solid/solid/backends/upower/upoweracadapter.cpp \
b/solid/solid/backends/upower/upoweracadapter.cpp index aa9296b..61ceb37 100644
--- a/solid/solid/backends/upower/upoweracadapter.cpp
+++ b/solid/solid/backends/upower/upoweracadapter.cpp
@@ -42,9 +42,7 @@ bool AcAdapter::isPlugged() const
 
 void AcAdapter::slotChanged()
 {
-    QSharedPointer<UPowerDevice> strong = m_device.toStrongRef();
-
-    if (strong) {
+    if (m_device) {
         const bool old_isPlugged = m_isPlugged;
         updateCache();
 
diff --git a/solid/solid/backends/upower/upowerbattery.cpp \
b/solid/solid/backends/upower/upowerbattery.cpp index 55948e0..1a40a2a 100644
--- a/solid/solid/backends/upower/upowerbattery.cpp
+++ b/solid/solid/backends/upower/upowerbattery.cpp
@@ -112,9 +112,7 @@ Solid::Battery::ChargeState Battery::chargeState() const
 
 void Battery::slotChanged()
 {
-    QSharedPointer<UPowerDevice> strong = m_device.toStrongRef();
-
-    if (strong) {
+    if (m_device) {
         const bool old_isPlugged = m_isPlugged;
         const int old_chargePercent = m_chargePercent;
         const Solid::Battery::ChargeState old_chargeState = m_chargeState;


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