diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-01-08 20:48:06 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-01-08 20:48:21 +0100 |
| commit | d51d6d349d94947b061bec765fa89a3af1aa1524 (patch) | |
| tree | 1c9d6b74f38ca9c1be6a8dd5e178b85812dfb267 | |
| parent | 53381ab391d68a1939d6854ce16bf982a138d944 (diff) | |
| download | tdelibs-d51d6d349d94947b061bec765fa89a3af1aa1524.tar.gz tdelibs-d51d6d349d94947b061bec765fa89a3af1aa1524.zip | |
tdehw: Fix wrong merge location in prior commit.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8856d5dde1a086f94b6875fd96fa6d3e479de170)
| -rw-r--r-- | tdecore/tdehw/tdehardwaredevices.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 386fcbc77..019b9ddda 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -2974,9 +2974,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); @@ -3032,6 +3029,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); |