diff options
Diffstat (limited to 'src/dbusHAL.cpp')
| -rw-r--r-- | src/dbusHAL.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/dbusHAL.cpp b/src/dbusHAL.cpp index 3c9a293..926d189 100644 --- a/src/dbusHAL.cpp +++ b/src/dbusHAL.cpp @@ -431,12 +431,12 @@ bool dbusHAL::halGetPropertyInt(QString udi, QString property, int *returnval){ DBusError error; dbus_error_init(&error); - if (!libhal_device_property_exists(hal_ctx, udi, property, &error)) { + if (!libhal_device_property_exists(hal_ctx, udi.ascii(), property.ascii(), &error)) { kdWarning() << "Property: " << property << " for: " << udi << " doesn't exist." << endl; goto out; } - *returnval = libhal_device_get_property_int(hal_ctx, udi, property, &error); + *returnval = libhal_device_get_property_int(hal_ctx, udi.ascii(), property.ascii(), &error); if (dbus_error_is_set(&error)) { kdError() << "Fetching property: " << property << " for: " << udi @@ -470,12 +470,12 @@ bool dbusHAL::halGetPropertyBool(QString udi, QString property, bool *returnval) DBusError error; dbus_error_init(&error); - if (!libhal_device_property_exists(hal_ctx, udi, property, &error)) { + if (!libhal_device_property_exists(hal_ctx, udi.ascii(), property.ascii(), &error)) { kdWarning() << "Property: " << property << " for: " << udi << " doesn't exist." << endl; goto out; } - *returnval = libhal_device_get_property_bool(hal_ctx, udi, property, &error); + *returnval = libhal_device_get_property_bool(hal_ctx, udi.ascii(), property.ascii(), &error); if (dbus_error_is_set(&error)) { kdError() << "Fetching property: " << property << " for: " << udi @@ -510,12 +510,12 @@ bool dbusHAL::halGetPropertyString(QString udi, QString property, QString *retur DBusError error; dbus_error_init(&error); - if (!libhal_device_property_exists(hal_ctx, udi, property, &error)) { + if (!libhal_device_property_exists(hal_ctx, udi.ascii(), property.ascii(), &error)) { kdWarning() << "Property: " << property << " for: " << udi << " doesn't exist." << endl; goto out; } - *returnval = libhal_device_get_property_string(hal_ctx, udi, property, &error); + *returnval = libhal_device_get_property_string(hal_ctx, udi.ascii(), property.ascii(), &error); if (dbus_error_is_set(&error)) { kdError() << "Fetching property: " << property << " for: " << udi @@ -551,12 +551,12 @@ bool dbusHAL::halGetPropertyStringList (QString udi, QString property, QStringLi dbus_error_init(&error); - if (!libhal_device_property_exists(hal_ctx, udi, property, &error)) { + if (!libhal_device_property_exists(hal_ctx, udi.ascii(), property.ascii(), &error)) { kdWarning() << "Property: " << property << " for: " << udi << " doesn't exist." << endl; goto out; } - found = libhal_device_get_property_strlist (hal_ctx, udi, property, &error); + found = libhal_device_get_property_strlist (hal_ctx, udi.ascii(), property.ascii(), &error); if (dbus_error_is_set(&error)) { kdWarning() << "Error while query existing strlist Property: " << property @@ -597,7 +597,7 @@ bool dbusHAL::halQueryCapability(QString udi, QString capability, bool *returnva DBusError error; dbus_error_init(&error); - *returnval = libhal_device_query_capability(hal_ctx, udi, capability, &error); + *returnval = libhal_device_query_capability(hal_ctx, udi.ascii(), capability.ascii(), &error); if (dbus_error_is_set(&error)) { kdError() << "Fetching capability: " << capability << " for: " << udi @@ -630,7 +630,7 @@ bool dbusHAL::halDevicePropertyExist(QString udi, QString property ) { DBusError error; dbus_error_init(&error); - if (! libhal_device_property_exists (hal_ctx, udi, property, &error)) { + if (! libhal_device_property_exists (hal_ctx, udi.ascii(), property.ascii(), &error)) { if (dbus_error_is_set(&error)) { kdError() << "Fetching existing property: " << property << " for: " << udi << " failed with: " << error.message << endl; @@ -665,7 +665,7 @@ bool dbusHAL::halFindDeviceByCapability (QString capability, QStringList *device dbus_error_init(&error); - found = libhal_find_device_by_capability (hal_ctx, capability, &num, &error); + found = libhal_find_device_by_capability (hal_ctx, capability.ascii(), &num, &error); if (dbus_error_is_set(&error)) { kdError() << "Could not get list of devices with capability: " << capability @@ -707,7 +707,7 @@ bool dbusHAL::halFindDeviceByString (QString property, QString keyval, QStringLi dbus_error_init(&error); - found = libhal_manager_find_device_string_match (hal_ctx, property, keyval, &num, &error); + found = libhal_manager_find_device_string_match (hal_ctx, property.ascii(), keyval.ascii(), &num, &error); if (dbus_error_is_set(&error)) { kdError() << "Could not get list of devices with key: " << property @@ -819,7 +819,7 @@ bool dbusHAL::dbusMethodCall( QString interface, QString path, QString object, Q goto out; } - message = dbus_message_new_method_call( interface, path, object, method ); + message = dbus_message_new_method_call( interface.ascii(), path.ascii(), object.ascii(), method.ascii() ); dbus_message_append_args_valist(message, first_arg_type, var_args); if (retvalue == NULL) { |