the enums of of DkpDevice origin, not DkpSource

1 files changed, 68 insertions, 68 deletions

diff --git a/libdevkit-power/dkp-enum.c b/libdevkit-power/dkp-enum.c
index 26fd788..04b673a 100644
--- a/libdevkit-power/dkp-enum.c
+++ b/libdevkit-power/dkp-enum.c
@@ -25,35 +25,35 @@
 #include "dkp-enum.h"
 
 /**
- * dkp_source_type_to_text:
+ * dkp_device_type_to_text:
  **/
 const gchar *
-dkp_source_type_to_text (DkpSourceType type_enum)
+dkp_device_type_to_text (DkpDeviceType type_enum)
 {
 	const gchar *type = NULL;
 	switch (type_enum) {
-	case DKP_SOURCE_TYPE_LINE_POWER:
+	case DKP_DEVICE_TYPE_LINE_POWER:
 		type = "line-power";
 		break;
-	case DKP_SOURCE_TYPE_BATTERY:
+	case DKP_DEVICE_TYPE_BATTERY:
 		type = "battery";
 		break;
-	case DKP_SOURCE_TYPE_UPS:
+	case DKP_DEVICE_TYPE_UPS:
 		type = "ups";
 		break;
-	case DKP_SOURCE_TYPE_MOUSE:
+	case DKP_DEVICE_TYPE_MOUSE:
 		type = "mouse";
 		break;
-	case DKP_SOURCE_TYPE_KEYBOARD:
+	case DKP_DEVICE_TYPE_KEYBOARD:
 		type = "keyboard";
 		break;
-	case DKP_SOURCE_TYPE_PDA:
+	case DKP_DEVICE_TYPE_PDA:
 		type = "pda";
 		break;
-	case DKP_SOURCE_TYPE_PHONE:
+	case DKP_DEVICE_TYPE_PHONE:
 		type = "phone";
 		break;
-	case DKP_SOURCE_TYPE_UNKNOWN:
+	case DKP_DEVICE_TYPE_UNKNOWN:
 		type = "unknown";
 		break;
 	default:
@@ -64,51 +64,51 @@ dkp_source_type_to_text (DkpSourceType type_enum)
 }
 
 /**
- * dkp_source_type_from_text:
+ * dkp_device_type_from_text:
  **/
-DkpSourceType
-dkp_source_type_from_text (const gchar *type)
+DkpDeviceType
+dkp_device_type_from_text (const gchar *type)
 {
 	if (type == NULL)
-		return DKP_SOURCE_TYPE_UNKNOWN;
+		return DKP_DEVICE_TYPE_UNKNOWN;
 	if (strcmp (type, "line-power") == 0)
-		return DKP_SOURCE_TYPE_LINE_POWER;
+		return DKP_DEVICE_TYPE_LINE_POWER;
 	if (strcmp (type, "battery") == 0)
-		return DKP_SOURCE_TYPE_BATTERY;
+		return DKP_DEVICE_TYPE_BATTERY;
 	if (strcmp (type, "ups") == 0)
-		return DKP_SOURCE_TYPE_UPS;
+		return DKP_DEVICE_TYPE_UPS;
 	if (strcmp (type, "mouse") == 0)
-		return DKP_SOURCE_TYPE_MOUSE;
+		return DKP_DEVICE_TYPE_MOUSE;
 	if (strcmp (type, "keyboard") == 0)
-		return DKP_SOURCE_TYPE_KEYBOARD;
+		return DKP_DEVICE_TYPE_KEYBOARD;
 	if (strcmp (type, "pda") == 0)
-		return DKP_SOURCE_TYPE_PDA;
+		return DKP_DEVICE_TYPE_PDA;
 	if (strcmp (type, "phone") == 0)
-		return DKP_SOURCE_TYPE_PHONE;
-	return DKP_SOURCE_TYPE_UNKNOWN;
+		return DKP_DEVICE_TYPE_PHONE;
+	return DKP_DEVICE_TYPE_UNKNOWN;
 }
 
 /**
- * dkp_source_state_to_text:
+ * dkp_device_state_to_text:
  **/
 const gchar *
-dkp_source_state_to_text (DkpSourceState state_enum)
+dkp_device_state_to_text (DkpDeviceState state_enum)
 {
 	const gchar *state = NULL;
 	switch (state_enum) {
-	case DKP_SOURCE_STATE_CHARGING:
+	case DKP_DEVICE_STATE_CHARGING:
 		state = "charging";
 		break;
-	case DKP_SOURCE_STATE_DISCHARGING:
+	case DKP_DEVICE_STATE_DISCHARGING:
 		state = "discharging";
 		break;
-	case DKP_SOURCE_STATE_EMPTY:
+	case DKP_DEVICE_STATE_EMPTY:
 		state = "empty";
 		break;
-	case DKP_SOURCE_STATE_FULLY_CHARGED:
+	case DKP_DEVICE_STATE_FULLY_CHARGED:
 		state = "fully-charged";
 		break;
-	case DKP_SOURCE_STATE_UNKNOWN:
+	case DKP_DEVICE_STATE_UNKNOWN:
 		state = "unknown";
 		break;
 	default:
@@ -119,51 +119,51 @@ dkp_source_state_to_text (DkpSourceState state_enum)
 }
 
 /**
- * dkp_source_state_from_text:
+ * dkp_device_state_from_text:
  **/
-DkpSourceState
-dkp_source_state_from_text (const gchar *state)
+DkpDeviceState
+dkp_device_state_from_text (const gchar *state)
 {
 	if (state == NULL)
-		return DKP_SOURCE_STATE_UNKNOWN;
+		return DKP_DEVICE_STATE_UNKNOWN;
 	if (strcmp (state, "charging") == 0)
-		return DKP_SOURCE_STATE_CHARGING;
+		return DKP_DEVICE_STATE_CHARGING;
 	if (strcmp (state, "discharging") == 0)
-		return DKP_SOURCE_STATE_DISCHARGING;
+		return DKP_DEVICE_STATE_DISCHARGING;
 	if (strcmp (state, "empty") == 0)
-		return DKP_SOURCE_STATE_EMPTY;
+		return DKP_DEVICE_STATE_EMPTY;
 	if (strcmp (state, "fully-charged") == 0)
-		return DKP_SOURCE_STATE_FULLY_CHARGED;
-	return DKP_SOURCE_STATE_UNKNOWN;
+		return DKP_DEVICE_STATE_FULLY_CHARGED;
+	return DKP_DEVICE_STATE_UNKNOWN;
 }
 
 /**
- * dkp_source_technology_to_text:
+ * dkp_device_technology_to_text:
  **/
 const gchar *
-dkp_source_technology_to_text (DkpSourceTechnology technology_enum)
+dkp_device_technology_to_text (DkpDeviceTechnology technology_enum)
 {
 	const gchar *technology = NULL;
 	switch (technology_enum) {
-	case DKP_SOURCE_TECHNOLGY_LITHIUM_ION:
+	case DKP_DEVICE_TECHNOLGY_LITHIUM_ION:
 		technology = "lithium-ion";
 		break;
-	case DKP_SOURCE_TECHNOLGY_LITHIUM_POLYMER:
+	case DKP_DEVICE_TECHNOLGY_LITHIUM_POLYMER:
 		technology = "lithium-polymer";
 		break;
-	case DKP_SOURCE_TECHNOLGY_LITHIUM_IRON_PHOSPHATE:
+	case DKP_DEVICE_TECHNOLGY_LITHIUM_IRON_PHOSPHATE:
 		technology = "lithium-iron-phosphate";
 		break;
-	case DKP_SOURCE_TECHNOLGY_LEAD_ACID:
+	case DKP_DEVICE_TECHNOLGY_LEAD_ACID:
 		technology = "lead-acid";
 		break;
-	case DKP_SOURCE_TECHNOLGY_NICKEL_CADMIUM:
+	case DKP_DEVICE_TECHNOLGY_NICKEL_CADMIUM:
 		technology = "nickel-cadmium";
 		break;
-	case DKP_SOURCE_TECHNOLGY_NICKEL_METAL_HYDRIDE:
+	case DKP_DEVICE_TECHNOLGY_NICKEL_METAL_HYDRIDE:
 		technology = "nickel-metal-hydride";
 		break;
-	case DKP_SOURCE_TECHNOLGY_UNKNOWN:
+	case DKP_DEVICE_TECHNOLGY_UNKNOWN:
 		technology = "unknown";
 		break;
 	default:
@@ -174,56 +174,56 @@ dkp_source_technology_to_text (DkpSourceTechnology technology_enum)
 }
 
 /**
- * dkp_source_technology_from_text:
+ * dkp_device_technology_from_text:
  **/
-DkpSourceTechnology
-dkp_source_technology_from_text (const gchar *technology)
+DkpDeviceTechnology
+dkp_device_technology_from_text (const gchar *technology)
 {
 	if (technology == NULL)
-		return DKP_SOURCE_TECHNOLGY_UNKNOWN;
+		return DKP_DEVICE_TECHNOLGY_UNKNOWN;
 	if (strcmp (technology, "lithium-ion") == 0)
-		return DKP_SOURCE_TECHNOLGY_LITHIUM_ION;
+		return DKP_DEVICE_TECHNOLGY_LITHIUM_ION;
 	if (strcmp (technology, "lithium-polymer") == 0)
-		return DKP_SOURCE_TECHNOLGY_LITHIUM_POLYMER;
+		return DKP_DEVICE_TECHNOLGY_LITHIUM_POLYMER;
 	if (strcmp (technology, "lithium-iron-phosphate") == 0)
-		return DKP_SOURCE_TECHNOLGY_LITHIUM_IRON_PHOSPHATE;
+		return DKP_DEVICE_TECHNOLGY_LITHIUM_IRON_PHOSPHATE;
 	if (strcmp (technology, "lead-acid") == 0)
-		return DKP_SOURCE_TECHNOLGY_LEAD_ACID;
+		return DKP_DEVICE_TECHNOLGY_LEAD_ACID;
 	if (strcmp (technology, "nickel-cadmium") == 0)
-		return DKP_SOURCE_TECHNOLGY_NICKEL_CADMIUM;
+		return DKP_DEVICE_TECHNOLGY_NICKEL_CADMIUM;
 	if (strcmp (technology, "nickel-metal-hydride") == 0)
-		return DKP_SOURCE_TECHNOLGY_NICKEL_METAL_HYDRIDE;
-	return DKP_SOURCE_TECHNOLGY_UNKNOWN;
+		return DKP_DEVICE_TECHNOLGY_NICKEL_METAL_HYDRIDE;
+	return DKP_DEVICE_TECHNOLGY_UNKNOWN;
 }
 
 /**
- * dkp_acpi_to_source_technology:
+ * dkp_acpi_to_device_technology:
  **/
-DkpSourceTechnology
-dkp_acpi_to_source_technology (const gchar *type)
+DkpDeviceTechnology
+dkp_acpi_to_device_technology (const gchar *type)
 {
 	if (type == NULL) {
-		return DKP_SOURCE_TECHNOLGY_UNKNOWN;
+		return DKP_DEVICE_TECHNOLGY_UNKNOWN;
 	}
 	/* every case combination of Li-Ion is commonly used.. */
 	if (strcasecmp (type, "li-ion") == 0 ||
 	    strcasecmp (type, "lion") == 0) {
-		return DKP_SOURCE_TECHNOLGY_LITHIUM_ION;
+		return DKP_DEVICE_TECHNOLGY_LITHIUM_ION;
 	}
 	if (strcasecmp (type, "pb") == 0 ||
 	    strcasecmp (type, "pbac") == 0) {
-		return DKP_SOURCE_TECHNOLGY_LEAD_ACID;
+		return DKP_DEVICE_TECHNOLGY_LEAD_ACID;
 	}
 	if (strcasecmp (type, "lip") == 0 ||
 	    strcasecmp (type, "lipo") == 0) {
-		return DKP_SOURCE_TECHNOLGY_LITHIUM_POLYMER;
+		return DKP_DEVICE_TECHNOLGY_LITHIUM_POLYMER;
 	}
 	if (strcasecmp (type, "nimh") == 0) {
-		return DKP_SOURCE_TECHNOLGY_NICKEL_METAL_HYDRIDE;
+		return DKP_DEVICE_TECHNOLGY_NICKEL_METAL_HYDRIDE;
 	}
 	if (strcasecmp (type, "lifo") == 0) {
-		return DKP_SOURCE_TECHNOLGY_LITHIUM_IRON_PHOSPHATE;
+		return DKP_DEVICE_TECHNOLGY_LITHIUM_IRON_PHOSPHATE;
 	}
-	return DKP_SOURCE_TECHNOLGY_UNKNOWN;
+	return DKP_DEVICE_TECHNOLGY_UNKNOWN;
 }