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

tdehw: TRUE/FALSE --> true/false renaming.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/36/head
Michele Calgaro 5 years ago
parent 32566accda
commit c76553c4fb
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
20 changed files with 159 additions and 161 deletions
Show Stats Download Patch File Download Diff File

6
tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device.xml
Unescape View File

@ -103,15 +103,15 @@
</property> </property>
<property name="Autoconnect" type="b" access="readwrite"> <property name="Autoconnect" type="b" access="readwrite">
<tp:docstring> <tp:docstring>
If TRUE, indicates the device is allowed to autoconnect. If FALSE, If true, indicates the device is allowed to autoconnect. If false,
manual intervention is required before the device will automatically manual intervention is required before the device will automatically
connect to a known network, such as activating a connection using the connect to a known network, such as activating a connection using the
device, or setting this property to TRUE. device, or setting this property to true.
</tp:docstring> </tp:docstring>
</property> </property>
<property name="FirmwareMissing" type="b" access="read"> <property name="FirmwareMissing" type="b" access="read">
<tp:docstring> <tp:docstring>
If TRUE, indicates the device is likely missing firmware necessary for If true, indicates the device is likely missing firmware necessary for
its operation. its operation.
</tp:docstring> </tp:docstring>
</property> </property>

2
tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-manager.xml
Unescape View File

@ -168,7 +168,7 @@
</tp:docstring> </tp:docstring>
<arg name="enable" type="b" direction="in"> <arg name="enable" type="b" direction="in">
<tp:docstring> <tp:docstring>
If FALSE, indicates that all networking should be disabled. If TRUE, If false, indicates that all networking should be disabled. If true,
indicates that NetworkManager should begin managing network devices. indicates that NetworkManager should begin managing network devices.
</tp:docstring> </tp:docstring>
</arg> </arg>

112
tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
Unescape View File

@ -1623,7 +1623,7 @@ TDENetworkConnectionType::TDENetworkConnectionType TDENetworkConnectionManager_B
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
tqApp->processEvents(); tqApp->processEvents();
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
@ -1966,7 +1966,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() {
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
tqApp->processEvents(); tqApp->processEvents();
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
@ -2465,7 +2465,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() {
TQT_DBusDataValueList::const_iterator it4; TQT_DBusDataValueList::const_iterator it4;
for (it4 = valueList.begin(); it4 != valueList.end(); ++it4) { for (it4 = valueList.begin(); it4 != valueList.end(); ++it4) {
TQT_DBusData innerDataValue = *it4; TQT_DBusData innerDataValue = *it4;
TQStringList pieces = TQStringList::split(":", innerDataValue.toString(), TRUE); TQStringList pieces = TQStringList::split(":", innerDataValue.toString(), true);
vlanConnection->ingressPriorityMap[pieces[0].toUInt()] = pieces[1].toUInt();; vlanConnection->ingressPriorityMap[pieces[0].toUInt()] = pieces[1].toUInt();;
} }
} }
@ -2474,7 +2474,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() {
TQT_DBusDataValueList::const_iterator it4; TQT_DBusDataValueList::const_iterator it4;
for (it4 = valueList.begin(); it4 != valueList.end(); ++it4) { for (it4 = valueList.begin(); it4 != valueList.end(); ++it4) {
TQT_DBusData innerDataValue = *it4; TQT_DBusData innerDataValue = *it4;
TQStringList pieces = TQStringList::split(":", innerDataValue.toString(), TRUE); TQStringList pieces = TQStringList::split(":", innerDataValue.toString(), true);
vlanConnection->egressPriorityMap[pieces[0].toUInt()] = pieces[1].toUInt();; vlanConnection->egressPriorityMap[pieces[0].toUInt()] = pieces[1].toUInt();;
} }
} }
@ -3030,7 +3030,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecrets(TQString uuid)
TDENetworkConnection* connection = findConnectionByUUID(uuid); TDENetworkConnection* connection = findConnectionByUUID(uuid);
if (!connection) { if (!connection) {
PRINT_ERROR(TQString("Unable to locate connection with uuid '%1' in local database. Did you run loadConnectionInformation() first?")); PRINT_ERROR(TQString("Unable to locate connection with uuid '%1' in local database. Did you run loadConnectionInformation() first?"));
return FALSE; return false;
} }
//TDEWiredEthernetConnection* ethernetConnection = dynamic_cast<TDEWiredEthernetConnection*>(connection); //TDEWiredEthernetConnection* ethernetConnection = dynamic_cast<TDEWiredEthernetConnection*>(connection);
//TDEWiredInfinibandConnection* infinibandConnection = dynamic_cast<TDEWiredInfinibandConnection*>(connection); //TDEWiredInfinibandConnection* infinibandConnection = dynamic_cast<TDEWiredInfinibandConnection*>(connection);
@ -3042,7 +3042,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecrets(TQString uuid)
//TDEBluetoothConnection* bluetoothConnection = dynamic_cast<TDEBluetoothConnection*>(connection); //TDEBluetoothConnection* bluetoothConnection = dynamic_cast<TDEBluetoothConnection*>(connection);
TDEModemConnection* modemConnection = dynamic_cast<TDEModemConnection*>(connection); TDEModemConnection* modemConnection = dynamic_cast<TDEModemConnection*>(connection);
bool ret = TRUE; bool ret = true;
ret = ret && loadConnectionSecretsForGroup(uuid, "802-1x"); ret = ret && loadConnectionSecretsForGroup(uuid, "802-1x");
if (wiFiConnection) { if (wiFiConnection) {
ret = ret && loadConnectionSecretsForGroup(uuid, "802-11-wireless-security"); ret = ret && loadConnectionSecretsForGroup(uuid, "802-11-wireless-security");
@ -3062,7 +3062,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri
TDENetworkConnection* connection = findConnectionByUUID(uuid); TDENetworkConnection* connection = findConnectionByUUID(uuid);
if (!connection) { if (!connection) {
PRINT_ERROR(TQString("Unable to locate connection with uuid '%1' in local database. Did you run loadConnectionInformation() first?")); PRINT_ERROR(TQString("Unable to locate connection with uuid '%1' in local database. Did you run loadConnectionInformation() first?"));
return FALSE; return false;
} }
//TDEWiredEthernetConnection* ethernetConnection = dynamic_cast<TDEWiredEthernetConnection*>(connection); //TDEWiredEthernetConnection* ethernetConnection = dynamic_cast<TDEWiredEthernetConnection*>(connection);
//TDEWiredInfinibandConnection* infinibandConnection = dynamic_cast<TDEWiredInfinibandConnection*>(connection); //TDEWiredInfinibandConnection* infinibandConnection = dynamic_cast<TDEWiredInfinibandConnection*>(connection);
@ -3104,7 +3104,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_SECRETS_INTERACTION_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_SECRETS_INTERACTION_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
tqApp->processEvents(); tqApp->processEvents();
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
@ -3242,26 +3242,26 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri
} }
} }
} }
return TRUE; return true;
} }
else { else {
PRINT_ERROR(TQString("Unable to load secrets for connection with uuid '%1'").arg(uuid)) PRINT_ERROR(TQString("Unable to load secrets for connection with uuid '%1'").arg(uuid))
return FALSE; return false;
} }
} }
else { else {
PRINT_WARNING(TQString("connection for provided uuid '%1' was not found").arg(uuid)); PRINT_WARNING(TQString("connection for provided uuid '%1' was not found").arg(uuid));
return FALSE; return false;
} }
} }
bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* connection) { bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* connection) {
bool timed_out = FALSE; bool timed_out = false;
bool command_failed = FALSE; bool command_failed = false;
if (!connection) { if (!connection) {
PRINT_ERROR(TQString("connection cannot be NULL!")); PRINT_ERROR(TQString("connection cannot be NULL!"));
return FALSE; return false;
} }
// If the UUID is blank, generate a new UUID for this connection and also guarantee that it it truly unique // If the UUID is blank, generate a new UUID for this connection and also guarantee that it it truly unique
@ -3321,7 +3321,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
tqApp->processEvents(); tqApp->processEvents();
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
@ -3402,7 +3402,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("connection", dbusData, TRUE); else outerMap.remove("connection"); if (groupValid) outerMap.insert("connection", dbusData, true); else outerMap.remove("connection");
groupValid = false; groupValid = false;
dbusData = outerMap["802-1x"]; dbusData = outerMap["802-1x"];
@ -3633,7 +3633,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("802-1x", dbusData, TRUE); else outerMap.remove("802-1x"); if (groupValid) outerMap.insert("802-1x", dbusData, true); else outerMap.remove("802-1x");
groupValid = false; groupValid = false;
dbusData = outerMap["802-3-ethernet"]; dbusData = outerMap["802-3-ethernet"];
@ -3679,7 +3679,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("802-3-ethernet", dbusData, TRUE); else outerMap.remove("802-3-ethernet"); if (groupValid) outerMap.insert("802-3-ethernet", dbusData, true); else outerMap.remove("802-3-ethernet");
groupValid = false; groupValid = false;
dbusData = outerMap["infiniband"]; dbusData = outerMap["infiniband"];
@ -3711,7 +3711,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("infiniband", dbusData, TRUE); else outerMap.remove("infiniband"); if (groupValid) outerMap.insert("infiniband", dbusData, true); else outerMap.remove("infiniband");
groupValid = false; groupValid = false;
dbusData = outerMap["802-11-wireless"]; dbusData = outerMap["802-11-wireless"];
@ -3831,7 +3831,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("802-11-wireless", dbusData, TRUE); else outerMap.remove("802-11-wireless"); if (groupValid) outerMap.insert("802-11-wireless", dbusData, true); else outerMap.remove("802-11-wireless");
groupValid = false; groupValid = false;
dbusData = outerMap["802-11-wireless-security"]; dbusData = outerMap["802-11-wireless-security"];
@ -3937,7 +3937,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("802-11-wireless-security", dbusData, TRUE); else outerMap.remove("802-11-wireless-security"); if (groupValid) outerMap.insert("802-11-wireless-security", dbusData, true); else outerMap.remove("802-11-wireless-security");
groupValid = false; groupValid = false;
dbusData = outerMap["vpn"]; dbusData = outerMap["vpn"];
@ -3974,7 +3974,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("vpn", dbusData, TRUE); else outerMap.remove("vpn"); if (groupValid) outerMap.insert("vpn", dbusData, true); else outerMap.remove("vpn");
groupValid = false; groupValid = false;
dbusData = outerMap["wimax"]; dbusData = outerMap["wimax"];
@ -4000,7 +4000,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("wimax", dbusData, TRUE); else outerMap.remove("wimax"); if (groupValid) outerMap.insert("wimax", dbusData, true); else outerMap.remove("wimax");
groupValid = false; groupValid = false;
dbusData = outerMap["vlan"]; dbusData = outerMap["vlan"];
@ -4031,7 +4031,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("vlan", dbusData, TRUE); else outerMap.remove("vlan"); if (groupValid) outerMap.insert("vlan", dbusData, true); else outerMap.remove("vlan");
groupValid = false; groupValid = false;
dbusData = outerMap["serial"]; dbusData = outerMap["serial"];
@ -4047,7 +4047,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("serial", dbusData, TRUE); else outerMap.remove("serial"); if (groupValid) outerMap.insert("serial", dbusData, true); else outerMap.remove("serial");
groupValid = false; groupValid = false;
dbusData = outerMap["ppp"]; dbusData = outerMap["ppp"];
@ -4096,7 +4096,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("ppp", dbusData, TRUE); else outerMap.remove("ppp"); if (groupValid) outerMap.insert("ppp", dbusData, true); else outerMap.remove("ppp");
groupValid = false; groupValid = false;
dbusData = outerMap["pppoe"]; dbusData = outerMap["pppoe"];
@ -4113,7 +4113,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("pppoe", dbusData, TRUE); else outerMap.remove("pppoe"); if (groupValid) outerMap.insert("pppoe", dbusData, true); else outerMap.remove("pppoe");
groupValid = false; groupValid = false;
dbusData = outerMap["802-11-olpc-mesh"]; dbusData = outerMap["802-11-olpc-mesh"];
@ -4143,7 +4143,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("802-11-olpc-mesh", dbusData, TRUE); else outerMap.remove("802-11-olpc-mesh"); if (groupValid) outerMap.insert("802-11-olpc-mesh", dbusData, true); else outerMap.remove("802-11-olpc-mesh");
groupValid = false; groupValid = false;
dbusData = outerMap["bluetooth"]; dbusData = outerMap["bluetooth"];
@ -4169,7 +4169,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("bluetooth", dbusData, TRUE); else outerMap.remove("bluetooth"); if (groupValid) outerMap.insert("bluetooth", dbusData, true); else outerMap.remove("bluetooth");
groupValid = false; groupValid = false;
dbusData = outerMap["cdma"]; dbusData = outerMap["cdma"];
@ -4186,7 +4186,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("cdma", dbusData, TRUE); else outerMap.remove("cdma"); if (groupValid) outerMap.insert("cdma", dbusData, true); else outerMap.remove("cdma");
groupValid = false; groupValid = false;
dbusData = outerMap["gsm"]; dbusData = outerMap["gsm"];
@ -4212,7 +4212,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("gsm", dbusData, TRUE); else outerMap.remove("gsm"); if (groupValid) outerMap.insert("gsm", dbusData, true); else outerMap.remove("gsm");
groupValid = false; groupValid = false;
dbusData = outerMap["ipv4"]; dbusData = outerMap["ipv4"];
@ -4340,7 +4340,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("ipv4", dbusData, TRUE); else outerMap.remove("ipv4"); if (groupValid) outerMap.insert("ipv4", dbusData, true); else outerMap.remove("ipv4");
groupValid = false; groupValid = false;
dbusData = outerMap["ipv6"]; dbusData = outerMap["ipv6"];
@ -4522,7 +4522,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap)); dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
groupValid = (settingsMap.count() > 0); groupValid = (settingsMap.count() > 0);
} }
if (groupValid) outerMap.insert("ipv6", dbusData, TRUE); else outerMap.remove("ipv6"); if (groupValid) outerMap.insert("ipv6", dbusData, true); else outerMap.remove("ipv6");
} }
connectionSettingsMap = TQT_DBusDataMap<TQString>(outerMap); connectionSettingsMap = TQT_DBusDataMap<TQString>(outerMap);
@ -4554,7 +4554,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
tqApp->processEvents(); tqApp->processEvents();
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
@ -4569,7 +4569,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
else { else {
// Error! // Error!
PRINT_ERROR((error.name() + ": " + error.message())) PRINT_ERROR((error.name() + ": " + error.message()))
return FALSE; return false;
} }
} }
else { else {
@ -4589,7 +4589,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
PRINT_ERROR(TQString("DBUS asynchronous call timed out!")) PRINT_ERROR(TQString("DBUS asynchronous call timed out!"))
@ -4615,7 +4615,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
else { else {
// Error! // Error!
PRINT_ERROR((error.name() + ": " + error.message())) PRINT_ERROR((error.name() + ": " + error.message()))
return FALSE; return false;
} }
} }
} }
@ -4642,7 +4642,7 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) {
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
tqApp->processEvents(); tqApp->processEvents();
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
@ -4656,17 +4656,17 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) {
} }
else { else {
PRINT_ERROR(TQString("Unable to remove connection with uuid '%1'").arg(uuid)) PRINT_ERROR(TQString("Unable to remove connection with uuid '%1'").arg(uuid))
return FALSE; return false;
} }
} }
else { else {
PRINT_WARNING(TQString("connection for provided uuid '%1' was not found").arg(uuid)); PRINT_WARNING(TQString("connection for provided uuid '%1' was not found").arg(uuid));
return FALSE; return false;
} }
} }
else { else {
PRINT_ERROR(TQString("invalid internal network-manager settings proxy object")); PRINT_ERROR(TQString("invalid internal network-manager settings proxy object"));
return FALSE; return false;
} }
} }
@ -4825,7 +4825,7 @@ bool TDENetworkConnectionManager_BackendNM::verifyConnectionSettings(TDENetworkC
} }
} }
return TRUE; return true;
} }
TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManager_BackendNM::initiateConnection(TQString uuid) { TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManager_BackendNM::initiateConnection(TQString uuid) {
@ -4865,7 +4865,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
PRINT_ERROR(TQString("DBUS asynchronous call timed out!")) PRINT_ERROR(TQString("DBUS asynchronous call timed out!"))
@ -5056,7 +5056,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
// Wait for the asynchronous call to return... // Wait for the asynchronous call to return...
d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true; d->nmConnectionSettingsAsyncCallWaiting[asyncCallID] = true;
TQTimer nmCallTimeoutTimer; TQTimer nmCallTimeoutTimer;
nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, TRUE); nmCallTimeoutTimer.start(NM_ASYNC_TIMEOUT_MS, true);
while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) {
if (!nmCallTimeoutTimer.isActive()) { if (!nmCallTimeoutTimer.isActive()) {
PRINT_ERROR(TQString("DBUS asynchronous call timed out!")) PRINT_ERROR(TQString("DBUS asynchronous call timed out!"))
@ -5350,14 +5350,14 @@ bool TDENetworkConnectionManager_BackendNM::networkingEnabled() {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
PRINT_ERROR((error.name() + ": " + error.message())) PRINT_ERROR((error.name() + ": " + error.message()))
return FALSE; return false;
} }
else { else {
return ret; return ret;
} }
} }
else { else {
return FALSE; return false;
} }
} }
@ -5369,14 +5369,14 @@ bool TDENetworkConnectionManager_BackendNM::wiFiHardwareEnabled() {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
PRINT_ERROR((error.name() + ": " + error.message())) PRINT_ERROR((error.name() + ": " + error.message()))
return FALSE; return false;
} }
else { else {
return ret; return ret;
} }
} }
else { else {
return FALSE; return false;
} }
} }
@ -5391,16 +5391,16 @@ bool TDENetworkConnectionManager_BackendNM::enableNetworking(bool enable) {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
PRINT_ERROR((error.name() + ": " + error.message())) PRINT_ERROR((error.name() + ": " + error.message()))
return FALSE; return false;
} }
else { else {
// FIXME // FIXME
// Wait for async reply before returning... // Wait for async reply before returning...
return TRUE; return true;
} }
} }
else { else {
return FALSE; return false;
} }
} }
@ -5411,14 +5411,14 @@ bool TDENetworkConnectionManager_BackendNM::enableWiFi(bool enable) {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
PRINT_ERROR((error.name() + ": " + error.message())) PRINT_ERROR((error.name() + ": " + error.message()))
return FALSE; return false;
} }
else { else {
return TRUE; return true;
} }
} }
else { else {
return FALSE; return false;
} }
} }
@ -5430,14 +5430,14 @@ bool TDENetworkConnectionManager_BackendNM::wiFiEnabled() {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
PRINT_ERROR((error.name() + ": " + error.message())) PRINT_ERROR((error.name() + ": " + error.message()))
return FALSE; return false;
} }
else { else {
return ret; return ret;
} }
} }
else { else {
return FALSE; return false;
} }
} }

10
tdecore/tdehw/tdebacklightdevice.cpp
Unescape View File

@ -68,7 +68,7 @@ bool TDEBacklightDevice::canSetBrightness() {
TQString brightnessnode = systemPath() + "/brightness"; TQString brightnessnode = systemPath() + "/brightness";
int rval = access (brightnessnode.ascii(), W_OK); int rval = access (brightnessnode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
return TRUE; return true;
} }
#ifdef WITH_TDEHWLIB_DAEMONS #ifdef WITH_TDEHWLIB_DAEMONS
@ -89,7 +89,7 @@ bool TDEBacklightDevice::canSetBrightness() {
} }
#endif // WITH_TDEHWLIB_DAEMONS #endif // WITH_TDEHWLIB_DAEMONS
return FALSE; return false;
} }
int TDEBacklightDevice::rawBrightness() { int TDEBacklightDevice::rawBrightness() {
@ -97,7 +97,7 @@ int TDEBacklightDevice::rawBrightness() {
} }
void TDEBacklightDevice::setRawBrightness(int br) { void TDEBacklightDevice::setRawBrightness(int br) {
bool setRawBrightnessDone = FALSE; bool setRawBrightnessDone = false;
TQString brightnessnode = systemPath() + "/brightness"; TQString brightnessnode = systemPath() + "/brightness";
TQString brightnessCommand = TQString("%1").arg(br); TQString brightnessCommand = TQString("%1").arg(br);
@ -106,7 +106,7 @@ void TDEBacklightDevice::setRawBrightness(int br) {
TQTextStream stream( &file ); TQTextStream stream( &file );
stream << brightnessCommand; stream << brightnessCommand;
file.close(); file.close();
setRawBrightnessDone = TRUE; setRawBrightnessDone = true;
} }
#ifdef WITH_TDEHWLIB_DAEMONS #ifdef WITH_TDEHWLIB_DAEMONS
@ -120,7 +120,7 @@ void TDEBacklightDevice::setRawBrightness(int br) {
params << TQT_DBusData::fromString(brightnessnode) << TQT_DBusData::fromString(brightnessCommand); params << TQT_DBusData::fromString(brightnessnode) << TQT_DBusData::fromString(brightnessCommand);
TQT_DBusMessage reply = hardwareControl.sendWithReply("SetBrightness", params); TQT_DBusMessage reply = hardwareControl.sendWithReply("SetBrightness", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage) { if (reply.type() == TQT_DBusMessage::ReplyMessage) {
setRawBrightnessDone = TRUE; setRawBrightnessDone = true;
} }
} }
} }

2
tdecore/tdehw/tdebacklightdevice.h
Unescape View File

@ -53,7 +53,7 @@ class TDECORE_EXPORT TDEBacklightDevice : public TDEGenericDevice
double brightnessPercent(); double brightnessPercent();
/** /**
* @return TRUE if permissions allow brightness can be set, FALSE if not * @return true if permissions allow brightness can be set, false if not
*/ */
bool canSetBrightness(); bool canSetBrightness();

4
tdecore/tdehw/tdebatterydevice.h
Unescape View File

@ -106,7 +106,7 @@ class TDECORE_EXPORT TDEBatteryDevice : public TDEGenericDevice
TDEBatteryStatus::TDEBatteryStatus status(); TDEBatteryStatus::TDEBatteryStatus status();
/** /**
* @return TRUE if the battery is installed * @return true if the battery is installed
*/ */
bool installed(); bool installed();
@ -189,7 +189,7 @@ class TDECORE_EXPORT TDEBatteryDevice : public TDEGenericDevice
void internalSetStatus(TQString tc); void internalSetStatus(TQString tc);
/** /**
* @param TRUE if the battery is installed * @param true if the battery is installed
* @internal * @internal
*/ */
void internalSetInstalled(bool tc); void internalSetInstalled(bool tc);

16
tdecore/tdehw/tdecpudevice.cpp
Unescape View File

@ -130,7 +130,7 @@ bool TDECPUDevice::canSetGovernor() {
TQString governornode = systemPath() + "/cpufreq/scaling_governor"; TQString governornode = systemPath() + "/cpufreq/scaling_governor";
int rval = access (governornode.ascii(), W_OK); int rval = access (governornode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
return TRUE; return true;
} }
#ifdef WITH_TDEHWLIB_DAEMONS #ifdef WITH_TDEHWLIB_DAEMONS
@ -168,11 +168,11 @@ bool TDECPUDevice::canSetGovernor() {
} }
#endif // WITH_HAL #endif // WITH_HAL
return FALSE; return false;
} }
void TDECPUDevice::setGovernor(TQString gv) { void TDECPUDevice::setGovernor(TQString gv) {
bool setGovernorDone = FALSE; bool setGovernorDone = false;
TQString governornode = systemPath() + "/cpufreq/scaling_governor"; TQString governornode = systemPath() + "/cpufreq/scaling_governor";
TQFile file( governornode ); TQFile file( governornode );
@ -180,7 +180,7 @@ void TDECPUDevice::setGovernor(TQString gv) {
TQTextStream stream( &file ); TQTextStream stream( &file );
stream << gv.lower(); stream << gv.lower();
file.close(); file.close();
setGovernorDone = TRUE; setGovernorDone = true;
} }
#ifdef WITH_TDEHWLIB_DAEMONS #ifdef WITH_TDEHWLIB_DAEMONS
@ -194,7 +194,7 @@ void TDECPUDevice::setGovernor(TQString gv) {
params << TQT_DBusData::fromInt32(coreNumber()) << TQT_DBusData::fromString(gv.lower()); params << TQT_DBusData::fromInt32(coreNumber()) << TQT_DBusData::fromString(gv.lower());
TQT_DBusMessage reply = hardwareControl.sendWithReply("SetCPUGovernor", params); TQT_DBusMessage reply = hardwareControl.sendWithReply("SetCPUGovernor", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage) { if (reply.type() == TQT_DBusMessage::ReplyMessage) {
setGovernorDone = TRUE; setGovernorDone = true;
} }
} }
} }
@ -212,7 +212,7 @@ void TDECPUDevice::setGovernor(TQString gv) {
params << TQT_DBusData::fromString(gv.lower()); params << TQT_DBusData::fromString(gv.lower());
TQT_DBusMessage reply = cpuFreqControl.sendWithReply("SetCPUFreqGovernor", params); TQT_DBusMessage reply = cpuFreqControl.sendWithReply("SetCPUFreqGovernor", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
setGovernorDone = TRUE; setGovernorDone = true;
} }
} }
} }
@ -229,10 +229,10 @@ bool TDECPUDevice::canSetMaximumScalingFrequency() {
TQString freqnode = systemPath() + "/cpufreq/scaling_max_freq"; TQString freqnode = systemPath() + "/cpufreq/scaling_max_freq";
int rval = access (freqnode.ascii(), W_OK); int rval = access (freqnode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
return TRUE; return true;
} }
else { else {
return FALSE; return false;
} }
} }

4
tdecore/tdehw/tdecpudevice.h
Unescape View File

@ -82,7 +82,7 @@ class TDECORE_EXPORT TDECPUDevice : public TDEGenericDevice
TQStringList availableGovernors(); TQStringList availableGovernors();
/** /**
* @return TRUE if permissions allow the CPU governor to be set, FALSE if not * @return true if permissions allow the CPU governor to be set, false if not
*/ */
bool canSetGovernor(); bool canSetGovernor();
@ -92,7 +92,7 @@ class TDECORE_EXPORT TDECPUDevice : public TDEGenericDevice
void setGovernor(TQString gv); void setGovernor(TQString gv);
/** /**
* @return TRUE if permissions allow the CPU maximum frequency to be set, FALSE if not * @return true if permissions allow the CPU maximum frequency to be set, false if not
*/ */
bool canSetMaximumScalingFrequency(); bool canSetMaximumScalingFrequency();

2
tdecore/tdehw/tdecryptographiccarddevice.cpp
Unescape View File

@ -369,7 +369,7 @@ int CryptoCardDeviceWatcher::initializePkcs() {
} }
printf("Adding provider '%s'\n", OPENSC_PKCS11_PROVIDER_LIBRARY); printf("Adding provider '%s'\n", OPENSC_PKCS11_PROVIDER_LIBRARY);
if ((rv = pkcs11h_addProvider(OPENSC_PKCS11_PROVIDER_LIBRARY, OPENSC_PKCS11_PROVIDER_LIBRARY, FALSE, PKCS11H_PRIVATEMODE_MASK_AUTO, PKCS11H_SLOTEVENT_METHOD_AUTO, 0, FALSE)) != CKR_OK) { if ((rv = pkcs11h_addProvider(OPENSC_PKCS11_PROVIDER_LIBRARY, OPENSC_PKCS11_PROVIDER_LIBRARY, false, PKCS11H_PRIVATEMODE_MASK_AUTO, PKCS11H_SLOTEVENT_METHOD_AUTO, 0, false)) != CKR_OK) {
printf("pkcs11h_addProvider failed: %s\n", pkcs11h_getMessage(rv)); printf("pkcs11h_addProvider failed: %s\n", pkcs11h_getMessage(rv));
return -1; return -1;
} }

2
tdecore/tdehw/tdeeventdevice.cpp
Unescape View File

@ -385,7 +385,7 @@ void TDEEventDevice::connectNotify( const char* signal ) {
if( !m_monitorActive && qstrcmp( signal, TQT_SIGNAL(switchChanged())) == 0 ) { if( !m_monitorActive && qstrcmp( signal, TQT_SIGNAL(switchChanged())) == 0 ) {
m_watchTimer = new TQTimer(this); m_watchTimer = new TQTimer(this);
connect( m_watchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processActiveSwitches()) ); connect( m_watchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processActiveSwitches()) );
m_watchTimer->start( 2500, FALSE ); m_watchTimer->start( 2500, false );
m_monitorActive = true; m_monitorActive = true;
// get initial state of switches // get initial state of switches

10
tdecore/tdehw/tdehardwaredevices.cpp
Unescape View File

@ -127,7 +127,7 @@ TDEHardwareDevices::TDEHardwareDevices() {
dpy_id_map = 0; dpy_id_map = 0;
// Set up device list // Set up device list
m_deviceList.setAutoDelete( TRUE ); // the list owns the objects m_deviceList.setAutoDelete( true ); // the list owns the objects
// Initialize udev interface // Initialize udev interface
m_udevStruct = udev_new(); m_udevStruct = udev_new();
@ -249,10 +249,10 @@ void TDEHardwareDevices::setTriggerlessHardwareUpdatesEnabled(bool enable) {
if (enable) { if (enable) {
TQDir nodezerocpufreq("/sys/devices/system/cpu/cpu0/cpufreq"); TQDir nodezerocpufreq("/sys/devices/system/cpu/cpu0/cpufreq");
if (nodezerocpufreq.exists()) { if (nodezerocpufreq.exists()) {
m_cpuWatchTimer->start( 500, FALSE ); // 0.5 second repeating timer m_cpuWatchTimer->start( 500, false ); // 0.5 second repeating timer
} }
m_batteryWatchTimer->stop(); // Battery devices are included in stateless devices m_batteryWatchTimer->stop(); // Battery devices are included in stateless devices
m_deviceWatchTimer->start( 1000, FALSE ); // 1 second repeating timer m_deviceWatchTimer->start( 1000, false ); // 1 second repeating timer
} }
else { else {
m_cpuWatchTimer->stop(); m_cpuWatchTimer->stop();
@ -264,9 +264,9 @@ void TDEHardwareDevices::setBatteryUpdatesEnabled(bool enable) {
if (enable) { if (enable) {
TQDir nodezerocpufreq("/sys/devices/system/cpu/cpu0/cpufreq"); TQDir nodezerocpufreq("/sys/devices/system/cpu/cpu0/cpufreq");
if (nodezerocpufreq.exists()) { if (nodezerocpufreq.exists()) {
m_cpuWatchTimer->start( 500, FALSE ); // 0.5 second repeating timer m_cpuWatchTimer->start( 500, false ); // 0.5 second repeating timer
} }
m_batteryWatchTimer->start( 5000, FALSE ); // 5 second repeating timer m_batteryWatchTimer->start( 5000, false ); // 5 second repeating timer
} }
else { else {
m_cpuWatchTimer->stop(); m_cpuWatchTimer->stop();

6
tdecore/tdehw/tdehardwaredevices.h
Unescape View File

@ -102,7 +102,7 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject
* A call to this method immediately invalidates any TDEGenericHardwareList * A call to this method immediately invalidates any TDEGenericHardwareList
* structures returned by listAllPhysicalDevices() * structures returned by listAllPhysicalDevices()
* *
* @return TRUE if successful * @return true if successful
*/ */
bool queryHardwareInformation(); bool queryHardwareInformation();
@ -215,9 +215,9 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject
* Rescan a hardware device to look for changes * Rescan a hardware device to look for changes
* WARNING: This method can be very expensive. Use with caution! * WARNING: This method can be very expensive. Use with caution!
* The computational expense can be reduced somewhat if the device tree structure * The computational expense can be reduced somewhat if the device tree structure
* has not changed by calling this method with regenerateDeviceTree = FALSE. * has not changed by calling this method with regenerateDeviceTree = false.
* @param hwdevice TDEGenericDevice* with the device to rescan * @param hwdevice TDEGenericDevice* with the device to rescan
* @param regenerateDeviceTree TRUE to update parent/child links in device tree * @param regenerateDeviceTree true to update parent/child links in device tree
*/ */
void rescanDeviceInformation(TDEGenericDevice* hwdevice, bool regenerateDeviceTree); void rescanDeviceInformation(TDEGenericDevice* hwdevice, bool regenerateDeviceTree);

4
tdecore/tdehw/tdemainspowerdevice.h
Unescape View File

@ -37,13 +37,13 @@ class TDECORE_EXPORT TDEMainsPowerDevice : public TDEGenericDevice
~TDEMainsPowerDevice(); ~TDEMainsPowerDevice();
/** /**
* @return TRUE if power supply is online via mains power, FALSE if not * @return true if power supply is online via mains power, false if not
*/ */
bool online(); bool online();
protected: protected:
/** /**
* @param TRUE if power supply is online via mains power, FALSE if not * @param true if power supply is online via mains power, false if not
* @internal * @internal
*/ */
void internalSetOnline(bool vt); void internalSetOnline(bool vt);

8
tdecore/tdehw/tdemonitordevice.h
Unescape View File

@ -41,12 +41,12 @@ class TDECORE_EXPORT TDEMonitorDevice : public TDEGenericDevice
~TDEMonitorDevice(); ~TDEMonitorDevice();
/** /**
* @return TRUE if a monitor is connected, FALSE if not * @return true if a monitor is connected, false if not
*/ */
bool connected(); bool connected();
/** /**
* @return TRUE if this port is enabled, FALSE if not * @return true if this port is enabled, false if not
*/ */
bool enabled(); bool enabled();
@ -72,13 +72,13 @@ class TDECORE_EXPORT TDEMonitorDevice : public TDEGenericDevice
protected: protected:
/** /**
* @param TRUE if a monitor is connected, FALSE if not * @param true if a monitor is connected, false if not
* @internal * @internal
*/ */
void internalSetConnected(bool cn); void internalSetConnected(bool cn);
/** /**
* @param TRUE if this port is enabled, FALSE if not * @param true if this port is enabled, false if not
* @internal * @internal
*/ */
void internalSetEnabled(bool en); void internalSetEnabled(bool en);

16
tdecore/tdehw/tdenetworkconnections.cpp
Unescape View File

@ -701,7 +701,7 @@ TDEWiFiConnection::~TDEWiFiConnection() {
TDENetworkConnectionManager::TDENetworkConnectionManager(TDENetworkDevice *networkDevice) : TQObject(), m_connectionList(NULL), m_hwNeighborList(NULL), m_networkDevice(networkDevice), m_prevConnectionStatus(TDENetworkGlobalManagerFlags::Unknown) { TDENetworkConnectionManager::TDENetworkConnectionManager(TDENetworkDevice *networkDevice) : TQObject(), m_connectionList(NULL), m_hwNeighborList(NULL), m_networkDevice(networkDevice), m_prevConnectionStatus(TDENetworkGlobalManagerFlags::Unknown) {
m_emissionTimer = new TQTimer(); m_emissionTimer = new TQTimer();
connect(m_emissionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitQueuedSignals())); connect(m_emissionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitQueuedSignals()));
if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, TRUE); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
} }
TDENetworkConnectionManager::~TDENetworkConnectionManager() { TDENetworkConnectionManager::~TDENetworkConnectionManager() {
@ -830,7 +830,7 @@ bool TDENetworkConnectionManager::validateIPAddress(TQHostAddress address) {
bool TDENetworkConnectionManager::validateIPNeworkMask(TQHostAddress netmask) { bool TDENetworkConnectionManager::validateIPNeworkMask(TQHostAddress netmask) {
Q_UNUSED(netmask); Q_UNUSED(netmask);
return TRUE; return true;
} }
void TDENetworkConnectionManager::clearTDENetworkConnectionList() { void TDENetworkConnectionManager::clearTDENetworkConnectionList() {
@ -855,7 +855,7 @@ void TDENetworkConnectionManager::internalNetworkConnectionStateChanged(TDENetwo
queuedEvent.newState = newState; queuedEvent.newState = newState;
queuedEvent.previousState = m_prevConnectionStatus; queuedEvent.previousState = m_prevConnectionStatus;
m_globalEventQueueEventList.append(queuedEvent); m_globalEventQueueEventList.append(queuedEvent);
if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, TRUE); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
m_prevConnectionStatus = newState; m_prevConnectionStatus = newState;
} }
@ -871,7 +871,7 @@ void TDENetworkConnectionManager::internalNetworkDeviceStateChanged(TDENetworkCo
queuedEvent.previousConnStatus = m_prevDeviceStatus[deviceNodeName]; queuedEvent.previousConnStatus = m_prevDeviceStatus[deviceNodeName];
queuedEvent.deviceNode = deviceNodeName; queuedEvent.deviceNode = deviceNodeName;
m_globalEventQueueEventList.append(queuedEvent); m_globalEventQueueEventList.append(queuedEvent);
if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, TRUE); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
m_prevDeviceStatus[deviceNodeName] = newState; m_prevDeviceStatus[deviceNodeName] = newState;
} }
@ -882,7 +882,7 @@ void TDENetworkConnectionManager::internalAccessPointStatusChanged(TDEMACAddress
queuedEvent.BSSID = BSSID; queuedEvent.BSSID = BSSID;
queuedEvent.apevent = event; queuedEvent.apevent = event;
m_globalEventQueueEventList.append(queuedEvent); m_globalEventQueueEventList.append(queuedEvent);
if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, TRUE); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
} }
void TDENetworkConnectionManager::internalNetworkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) { void TDENetworkConnectionManager::internalNetworkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) {
@ -891,7 +891,7 @@ void TDENetworkConnectionManager::internalNetworkDeviceEvent(TDENetworkDeviceEve
queuedEvent.ndevent = event; queuedEvent.ndevent = event;
queuedEvent.message = message; queuedEvent.message = message;
m_globalEventQueueEventList.append(queuedEvent); m_globalEventQueueEventList.append(queuedEvent);
if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, TRUE); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
} }
void TDENetworkConnectionManager::internalVpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message) { void TDENetworkConnectionManager::internalVpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message) {
@ -900,7 +900,7 @@ void TDENetworkConnectionManager::internalVpnEvent(TDENetworkVPNEventType::TDENe
queuedEvent.vpnevent = event; queuedEvent.vpnevent = event;
queuedEvent.message = message; queuedEvent.message = message;
m_globalEventQueueEventList.append(queuedEvent); m_globalEventQueueEventList.append(queuedEvent);
if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, TRUE); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
} }
void TDENetworkConnectionManager::internalNetworkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType event) { void TDENetworkConnectionManager::internalNetworkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType event) {
@ -908,7 +908,7 @@ void TDENetworkConnectionManager::internalNetworkManagementEvent(TDENetworkGloba
queuedEvent.eventType = 5; queuedEvent.eventType = 5;
queuedEvent.globalevent = event; queuedEvent.globalevent = event;
m_globalEventQueueEventList.append(queuedEvent); m_globalEventQueueEventList.append(queuedEvent);
if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, TRUE); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
} }
void TDENetworkConnectionManager::emitQueuedSignals() { void TDENetworkConnectionManager::emitQueuedSignals() {

8
tdecore/tdehw/tdenetworkdevice.h
Unescape View File

@ -49,12 +49,12 @@ class TDECORE_EXPORT TDENetworkDevice : public TDEGenericDevice
TQString state(); TQString state();
/** /**
* @return TRUE if carrier is present, FALSE if not * @return true if carrier is present, false if not
*/ */
bool carrierPresent(); bool carrierPresent();
/** /**
* @return TRUE if device is dormant, FALSE if not * @return true if device is dormant, false if not
*/ */
bool dormant(); bool dormant();
@ -137,13 +137,13 @@ class TDECORE_EXPORT TDENetworkDevice : public TDEGenericDevice
void internalSetState(TQString st); void internalSetState(TQString st);
/** /**
* @param TRUE if carrier is present, FALSE if not * @param true if carrier is present, false if not
* @internal * @internal
*/ */
void internalSetCarrierPresent(bool cp); void internalSetCarrierPresent(bool cp);
/** /**
* @param TRUE if device is dormant, FALSE if not * @param true if device is dormant, false if not
* @internal * @internal
*/ */
void internalSetDormant(bool dm); void internalSetDormant(bool dm);

46
tdecore/tdehw/tderootsystemdevice.cpp
Unescape View File

@ -91,7 +91,7 @@ bool TDERootSystemDevice::canSetHibernationMethod() {
TQString hibernationnode = "/sys/power/disk"; TQString hibernationnode = "/sys/power/disk";
int rval = access (hibernationnode.ascii(), W_OK); int rval = access (hibernationnode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
return TRUE; return true;
} }
#ifdef WITH_TDEHWLIB_DAEMONS #ifdef WITH_TDEHWLIB_DAEMONS
@ -112,7 +112,7 @@ bool TDERootSystemDevice::canSetHibernationMethod() {
} }
#endif // WITH_TDEHWLIB_DAEMONS #endif // WITH_TDEHWLIB_DAEMONS
return FALSE; return false;
} }
bool TDERootSystemDevice::canStandby() { bool TDERootSystemDevice::canStandby() {
@ -120,10 +120,10 @@ bool TDERootSystemDevice::canStandby() {
int rval = access (statenode.ascii(), W_OK); int rval = access (statenode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
if (powerStates().contains(TDESystemPowerState::Standby)) { if (powerStates().contains(TDESystemPowerState::Standby)) {
return TRUE; return true;
} }
else { else {
return FALSE; return false;
} }
} }
@ -145,7 +145,7 @@ bool TDERootSystemDevice::canStandby() {
} }
#endif // WITH_TDEHWLIB_DAEMONS #endif // WITH_TDEHWLIB_DAEMONS
return FALSE; return false;
} }
bool TDERootSystemDevice::canFreeze() { bool TDERootSystemDevice::canFreeze() {
@ -153,10 +153,10 @@ bool TDERootSystemDevice::canFreeze() {
int rval = access (statenode.ascii(), W_OK); int rval = access (statenode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
if (powerStates().contains(TDESystemPowerState::Freeze)) { if (powerStates().contains(TDESystemPowerState::Freeze)) {
return TRUE; return true;
} }
else { else {
return FALSE; return false;
} }
} }
@ -178,7 +178,7 @@ bool TDERootSystemDevice::canFreeze() {
} }
#endif // WITH_TDEHWLIB_DAEMONS #endif // WITH_TDEHWLIB_DAEMONS
return FALSE; return false;
} }
bool TDERootSystemDevice::canSuspend() { bool TDERootSystemDevice::canSuspend() {
@ -186,10 +186,10 @@ bool TDERootSystemDevice::canSuspend() {
int rval = access (statenode.ascii(), W_OK); int rval = access (statenode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
if (powerStates().contains(TDESystemPowerState::Suspend)) { if (powerStates().contains(TDESystemPowerState::Suspend)) {
return TRUE; return true;
} }
else { else {
return FALSE; return false;
} }
} }
@ -291,7 +291,7 @@ bool TDERootSystemDevice::canSuspend() {
} }
#endif // WITH_TDEHWLIB_DAEMONS #endif // WITH_TDEHWLIB_DAEMONS
return FALSE; return false;
} }
bool TDERootSystemDevice::canHibernate() { bool TDERootSystemDevice::canHibernate() {
@ -301,10 +301,10 @@ bool TDERootSystemDevice::canHibernate() {
int disk_rval = access (disknode.ascii(), W_OK); int disk_rval = access (disknode.ascii(), W_OK);
if (state_rval == 0 && disk_rval == 0) { if (state_rval == 0 && disk_rval == 0) {
if (powerStates().contains(TDESystemPowerState::Hibernate)) { if (powerStates().contains(TDESystemPowerState::Hibernate)) {
return TRUE; return true;
} }
else { else {
return FALSE; return false;
} }
} }
@ -406,7 +406,7 @@ bool TDERootSystemDevice::canHibernate() {
} }
#endif // WITH_TDEHWLIB_DAEMONS #endif // WITH_TDEHWLIB_DAEMONS
return FALSE; return false;
} }
bool TDERootSystemDevice::canHybridSuspend() { bool TDERootSystemDevice::canHybridSuspend() {
@ -416,10 +416,10 @@ bool TDERootSystemDevice::canHybridSuspend() {
int disk_rval = access (disknode.ascii(), W_OK); int disk_rval = access (disknode.ascii(), W_OK);
if (state_rval == 0 && disk_rval == 0) { if (state_rval == 0 && disk_rval == 0) {
if (powerStates().contains(TDESystemPowerState::HybridSuspend)) { if (powerStates().contains(TDESystemPowerState::HybridSuspend)) {
return TRUE; return true;
} }
else { else {
return FALSE; return false;
} }
} }
@ -482,14 +482,14 @@ bool TDERootSystemDevice::canHybridSuspend() {
} }
#endif // WITH_TDEHWLIB_DAEMONS #endif // WITH_TDEHWLIB_DAEMONS
return FALSE; return false;
} }
bool TDERootSystemDevice::canPowerOff() { bool TDERootSystemDevice::canPowerOff() {
TDEConfig config("ksmserverrc", true); TDEConfig config("ksmserverrc", true);
config.setGroup("General" ); config.setGroup("General" );
if (!config.readBoolEntry( "offerShutdown", true )) { if (!config.readBoolEntry( "offerShutdown", true )) {
return FALSE; return false;
} }
#ifdef WITH_LOGINDPOWER #ifdef WITH_LOGINDPOWER
@ -532,16 +532,16 @@ bool TDERootSystemDevice::canPowerOff() {
// Can we power down this system? // Can we power down this system?
// This should probably be checked via DCOP and therefore interface with TDM // This should probably be checked via DCOP and therefore interface with TDM
// if ( DM().canShutdown() ) { // if ( DM().canShutdown() ) {
// return TRUE; // return true;
// } // }
return TRUE; return true;
} }
bool TDERootSystemDevice::canReboot() { bool TDERootSystemDevice::canReboot() {
TDEConfig config("ksmserverrc", true); TDEConfig config("ksmserverrc", true);
config.setGroup("General" ); config.setGroup("General" );
if (!config.readBoolEntry( "offerShutdown", true )) { if (!config.readBoolEntry( "offerShutdown", true )) {
return FALSE; return false;
} }
#ifdef WITH_LOGINDPOWER #ifdef WITH_LOGINDPOWER
@ -584,9 +584,9 @@ bool TDERootSystemDevice::canReboot() {
// Can we power down this system? // Can we power down this system?
// This should probably be checked via DCOP and therefore interface with TDM // This should probably be checked via DCOP and therefore interface with TDM
// if ( DM().canShutdown() ) { // if ( DM().canShutdown() ) {
// return TRUE; // return true;
// } // }
return TRUE; return true;
} }
void TDERootSystemDevice::setHibernationMethod(TDESystemHibernationMethod::TDESystemHibernationMethod hm) { void TDERootSystemDevice::setHibernationMethod(TDESystemHibernationMethod::TDESystemHibernationMethod hm) {

18
tdecore/tdehw/tderootsystemdevice.h
Unescape View File

@ -102,42 +102,42 @@ class TDECORE_EXPORT TDERootSystemDevice : public TDEGenericDevice
unsigned long diskSpaceNeededForHibernation(); unsigned long diskSpaceNeededForHibernation();
/** /**
* @return TRUE if permissions allow the hibernation method to be set, FALSE if not * @return true if permissions allow the hibernation method to be set, false if not
*/ */
bool canSetHibernationMethod(); bool canSetHibernationMethod();
/** /**
* @return TRUE if hardware and permissions allow the system to enter standby, FALSE if not * @return true if hardware and permissions allow the system to enter standby, false if not
*/ */
bool canStandby(); bool canStandby();
/** /**
* @return TRUE if hardware and permissions allow the system to enter freeze state, FALSE if not * @return true if hardware and permissions allow the system to enter freeze state, false if not
*/ */
bool canFreeze(); bool canFreeze();
/** /**
* @return TRUE if hardware and permissions allow the system to be suspended, FALSE if not * @return true if hardware and permissions allow the system to be suspended, false if not
*/ */
bool canSuspend(); bool canSuspend();
/** /**
* @return TRUE if hardware and permissions allow the system to be hibernated, FALSE if not * @return true if hardware and permissions allow the system to be hibernated, false if not
*/ */
bool canHibernate(); bool canHibernate();
/** /**
* @return TRUE if hardware and permissions allow the system to be hybrid suspended, FALSE if not * @return true if hardware and permissions allow the system to be hybrid suspended, false if not
*/ */
bool canHybridSuspend(); bool canHybridSuspend();
/** /**
* @return TRUE if permissions allow the system to be powered down, FALSE if not * @return true if permissions allow the system to be powered down, false if not
*/ */
bool canPowerOff(); bool canPowerOff();
/** /**
* @return TRUE if permissions allow the system to be rebooted, FALSE if not * @return true if permissions allow the system to be rebooted, false if not
*/ */
bool canReboot(); bool canReboot();
@ -148,7 +148,7 @@ class TDECORE_EXPORT TDERootSystemDevice : public TDEGenericDevice
/** /**
* @param ps a TDESystemPowerState::TDESystemPowerState with the desired power state * @param ps a TDESystemPowerState::TDESystemPowerState with the desired power state
* @return TRUE if power state was set * @return true if power state was set
*/ */
bool setPowerState(TDESystemPowerState::TDESystemPowerState ps); bool setPowerState(TDESystemPowerState::TDESystemPowerState ps);

34
tdecore/tdehw/tdestoragedevice.cpp
Unescape View File

@ -342,15 +342,15 @@ bool ejectDriveUDisks(TDEStorageDevice* sdevice) {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
printf("[ERROR][tdehwlib] ejectDriveUDisks: %s\n", error.name().ascii()); fflush(stdout); printf("[ERROR][tdehwlib] ejectDriveUDisks: %s\n", error.name().ascii()); fflush(stdout);
return FALSE; return false;
} }
else { else {
return TRUE; return true;
} }
} }
} }
#endif // WITH_UDISKS #endif // WITH_UDISKS
return FALSE; return false;
} }
bool ejectDriveUDisks2(TDEStorageDevice* sdevice) { bool ejectDriveUDisks2(TDEStorageDevice* sdevice) {
@ -371,13 +371,13 @@ bool ejectDriveUDisks2(TDEStorageDevice* sdevice) {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
printf("[ERROR][tdehwlib] ejectDriveUDisks2: %s\n", error.name().ascii()); fflush(stdout); printf("[ERROR][tdehwlib] ejectDriveUDisks2: %s\n", error.name().ascii()); fflush(stdout);
return FALSE; return false;
} }
else { else {
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
TQT_DBusObjectPath driveObjectPath = reply[0].toVariant().value.toObjectPath(); TQT_DBusObjectPath driveObjectPath = reply[0].toVariant().value.toObjectPath();
if (!driveObjectPath.isValid()) { if (!driveObjectPath.isValid()) {
return FALSE; return false;
} }
error = TQT_DBusError(); error = TQT_DBusError();
@ -389,12 +389,12 @@ bool ejectDriveUDisks2(TDEStorageDevice* sdevice) {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
printf("[ERROR][tdehwlib] ejectDriveUDisks2: %s\n", error.name().ascii()); fflush(stdout); printf("[ERROR][tdehwlib] ejectDriveUDisks2: %s\n", error.name().ascii()); fflush(stdout);
return FALSE; return false;
} }
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
bool ejectable = reply[0].toVariant().value.toBool(); bool ejectable = reply[0].toVariant().value.toBool();
if (!ejectable) { if (!ejectable) {
return FALSE; return false;
} }
// Eject the drive! // Eject the drive!
@ -406,10 +406,10 @@ bool ejectDriveUDisks2(TDEStorageDevice* sdevice) {
if (error.isValid()) { if (error.isValid()) {
// Error! // Error!
printf("[ERROR][tdehwlib] ejectDriveUDisks2: %s\n", error.name().ascii()); fflush(stdout); printf("[ERROR][tdehwlib] ejectDriveUDisks2: %s\n", error.name().ascii()); fflush(stdout);
return FALSE; return false;
} }
else { else {
return TRUE; return true;
} }
} }
} }
@ -417,7 +417,7 @@ bool ejectDriveUDisks2(TDEStorageDevice* sdevice) {
} }
} }
#endif // WITH_UDISKS2 #endif // WITH_UDISKS2
return FALSE; return false;
} }
int mountDriveUDisks(TQString deviceNode, TQString fileSystemType, TQStringList mountOptions, TQString* errStr = NULL) { int mountDriveUDisks(TQString deviceNode, TQString fileSystemType, TQStringList mountOptions, TQString* errStr = NULL) {
@ -600,7 +600,7 @@ bool TDEStorageDevice::ejectDrive() {
#ifdef WITH_UDISKS2 #ifdef WITH_UDISKS2
if (!(TDEGlobal::dirs()->findExe("udisksctl").isEmpty())) { if (!(TDEGlobal::dirs()->findExe("udisksctl").isEmpty())) {
if (ejectDriveUDisks2(this)) { if (ejectDriveUDisks2(this)) {
return TRUE; return true;
} }
else { else {
printf("[tdehwlib] Failed to eject drive '%s' via udisks2, falling back to alternate mechanism\n", deviceNode().ascii()); printf("[tdehwlib] Failed to eject drive '%s' via udisks2, falling back to alternate mechanism\n", deviceNode().ascii());
@ -612,7 +612,7 @@ bool TDEStorageDevice::ejectDrive() {
#ifdef WITH_UDISKS #ifdef WITH_UDISKS
if (!(TDEGlobal::dirs()->findExe("udisks").isEmpty())) { if (!(TDEGlobal::dirs()->findExe("udisks").isEmpty())) {
if (ejectDriveUDisks(this)) { if (ejectDriveUDisks(this)) {
return TRUE; return true;
} }
else { else {
printf("[tdehwlib] Failed to eject drive '%s' via udisks, falling back to alternate mechanism\n", deviceNode().ascii()); printf("[tdehwlib] Failed to eject drive '%s' via udisks, falling back to alternate mechanism\n", deviceNode().ascii());
@ -631,14 +631,14 @@ bool TDEStorageDevice::ejectDrive() {
eject_output = ts.read(); eject_output = ts.read();
int retcode = pclose(exepipe); int retcode = pclose(exepipe);
if (retcode == 0) { if (retcode == 0) {
return TRUE; return true;
} }
} }
printf("[tdehwlib] Failed to eject drive '%s' via 'eject' command\n", deviceNode().ascii()); printf("[tdehwlib] Failed to eject drive '%s' via 'eject' command\n", deviceNode().ascii());
fflush(stdout); fflush(stdout);
} }
return FALSE; return false;
} }
bool TDEStorageDevice::ejectDriveMedia() { bool TDEStorageDevice::ejectDriveMedia() {
@ -1411,7 +1411,7 @@ bool TDEStorageDevice::unmountDevice(TQString* errRet, int* retcode) {
if (errRet) { if (errRet) {
*errRet = i18n("No supported unmounting methods were detected on your system"); *errRet = i18n("No supported unmounting methods were detected on your system");
} }
return true; return false;
} }
FILE *exepipe = popen(command.local8Bit(), "r"); FILE *exepipe = popen(command.local8Bit(), "r");
@ -1424,7 +1424,6 @@ bool TDEStorageDevice::unmountDevice(TQString* errRet, int* retcode) {
if (*retcode == 0) { if (*retcode == 0) {
// Update internal mount data // Update internal mount data
TDEGlobal::hardwareDevices()->processModifiedMounts(); TDEGlobal::hardwareDevices()->processModifiedMounts();
return true; return true;
} }
else { else {
@ -1436,7 +1435,6 @@ bool TDEStorageDevice::unmountDevice(TQString* errRet, int* retcode) {
// Update internal mount data // Update internal mount data
TDEGlobal::hardwareDevices()->processModifiedMounts(); TDEGlobal::hardwareDevices()->processModifiedMounts();
return false; return false;
} }
@ -1452,7 +1450,7 @@ TQString TDEStorageDevice::determineFileSystemType(TQString path) {
// Walk the directory tree up to the root, checking for any change in st_dev // Walk the directory tree up to the root, checking for any change in st_dev
// If a change is found, the previous value of path is the mount point itself // If a change is found, the previous value of path is the mount point itself
while (path != "/") { while (path != "/") {
pos = path.findRev("/", -1, TRUE); pos = path.findRev("/", -1, true);
if (pos < 0) { if (pos < 0) {
break; break;
} }

10
tdecore/tdehw/tdestoragedevice.h
Unescape View File

@ -258,7 +258,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
* @param a pointer to a TQString which will be populated with any error messages from pmount, if desired * @param a pointer to a TQString which will be populated with any error messages from pmount, if desired
* @param a pointer to an integer which will be populated with the return code from pmount, if desired * @param a pointer to an integer which will be populated with the return code from pmount, if desired
* *
* @return TRUE if unmount was successful * @return true if unmount was successful
*/ */
bool unmountDevice(TQString* errRet, int* retcode=0); bool unmountDevice(TQString* errRet, int* retcode=0);
@ -318,22 +318,22 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
bool checkDiskStatus(TDEDiskDeviceStatus::TDEDiskDeviceStatus sf); bool checkDiskStatus(TDEDiskDeviceStatus::TDEDiskDeviceStatus sf);
/** /**
* @param TRUE to engage media lock, FALSE to disable it * @param true to engage media lock, false to disable it
* @return TRUE on success, FALSE on failure * @return true on success, false on failure
* *
* This method currently works on CD-ROM drives and similar devices * This method currently works on CD-ROM drives and similar devices
*/ */
bool lockDriveMedia(bool lock); bool lockDriveMedia(bool lock);
/** /**
* @return TRUE on success, FALSE on failure * @return true on success, false on failure
* *
* This method currently works on CD-ROM drives and similar devices * This method currently works on CD-ROM drives and similar devices
*/ */
bool ejectDriveMedia(); bool ejectDriveMedia();
/** /**
* @return TRUE on success, FALSE on failure * @return true on success, false on failure
* *
* This method currently works on all removable storage devices * This method currently works on all removable storage devices
*/ */

Write Preview
Loading…
Cancel
Save