tdehw: Fix wrong merge location in prior commit.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/61/head
Slávek Banko 5 years ago
parent 86c1d896c7
commit 8856d5dde1
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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);

Loading…
Cancel
Save