summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-01-08 20:48:06 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-01-08 20:48:06 +0100
commit8856d5dde1a086f94b6875fd96fa6d3e479de170 (patch)
tree8864167ff53f460aab63495ee8ba2fa980221d20
parent86c1d896c748bf5117ccfe28b20e48a7e2a70c8d (diff)
downloadtdelibs-8856d5dd.zip
tdelibs-8856d5dd.tar.gz
tdehw: Fix wrong merge location in prior commit.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 04ace0f..2fbe293 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -3023,9 +3023,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
TQDir valuesdir(valuesnodename);
valuesdir.setFilter(TQDir::All);
TQString nodename;
- double bdevice_capacity = 0;
- bool bdevice_has_energy = false;
- bool bdevice_has_time_to_empty = false;
const TQFileInfoList *dirlist = valuesdir.entryInfoList();
if (dirlist) {
TQFileInfoListIterator valuesdirit(*dirlist);
@@ -3081,6 +3078,9 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
TQDir valuesdir(valuesnodename);
valuesdir.setFilter(TQDir::All);
TQString nodename;
+ double bdevice_capacity = 0;
+ bool bdevice_has_energy = false;
+ bool bdevice_has_time_to_empty = false;
const TQFileInfoList *dirlist = valuesdir.entryInfoList();
if (dirlist) {
TQFileInfoListIterator valuesdirit(*dirlist);