TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

tdehw: Fix wrong merge location in prior commit.

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8856d5dde1)
r14.0.x
Slávek Banko 5 years ago
parent 53381ab391
commit d51d6d349d
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
tdecore/tdehw/tdehardwaredevices.cpp
Unescape View File

@ -2974,9 +2974,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
TQDir valuesdir(valuesnodename); TQDir valuesdir(valuesnodename);
valuesdir.setFilter(TQDir::All); valuesdir.setFilter(TQDir::All);
TQString nodename; TQString nodename;
double bdevice_capacity = 0;
bool bdevice_has_energy = false;
bool bdevice_has_time_to_empty = false;
const TQFileInfoList *dirlist = valuesdir.entryInfoList(); const TQFileInfoList *dirlist = valuesdir.entryInfoList();
if (dirlist) { if (dirlist) {
TQFileInfoListIterator valuesdirit(*dirlist); TQFileInfoListIterator valuesdirit(*dirlist);
@ -3032,6 +3029,9 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
TQDir valuesdir(valuesnodename); TQDir valuesdir(valuesnodename);
valuesdir.setFilter(TQDir::All); valuesdir.setFilter(TQDir::All);
TQString nodename; TQString nodename;
double bdevice_capacity = 0;
bool bdevice_has_energy = false;
bool bdevice_has_time_to_empty = false;
const TQFileInfoList *dirlist = valuesdir.entryInfoList(); const TQFileInfoList *dirlist = valuesdir.entryInfoList();
if (dirlist) { if (dirlist) {
TQFileInfoListIterator valuesdirit(*dirlist); TQFileInfoListIterator valuesdirit(*dirlist);

Write Preview
Loading…
Cancel
Save