remove the battery- and line-power- prefix from the device properties

1 files changed, 14 insertions, 14 deletions

diff --git a/libdevkit-power/dkp-object.h b/libdevkit-power/dkp-object.h
index 3a55635..f479ac6 100644
--- a/libdevkit-power/dkp-object.h
+++ b/libdevkit-power/dkp-object.h
@@ -33,21 +33,21 @@ typedef struct {
 	gchar			*serial;
 	gchar			*native_path;
 	gboolean		 power_supply;
-	gboolean		 line_power_online;
-	gboolean		 battery_is_present;
-	gboolean		 battery_is_rechargeable;
+	gboolean		 online;
+	gboolean		 is_present;
+	gboolean		 is_rechargeable;
 	DkpDeviceType		 type;
-	DkpDeviceState		 battery_state;
-	DkpDeviceTechnology	 battery_technology;
-	gdouble			 battery_capacity;		/* percent */
-	gdouble			 battery_energy;		/* Watt Hours */
-	gdouble			 battery_energy_empty;		/* Watt Hours */
-	gdouble			 battery_energy_full;		/* Watt Hours */
-	gdouble			 battery_energy_full_design;	/* Watt Hours */
-	gdouble			 battery_energy_rate;		/* Watts */
-	gint64			 battery_time_to_empty;		/* seconds */
-	gint64			 battery_time_to_full;		/* seconds */
-	gdouble			 battery_percentage;		/* percent */
+	DkpDeviceState		 state;
+	DkpDeviceTechnology	 technology;
+	gdouble			 capacity;		/* percent */
+	gdouble			 energy;		/* Watt Hours */
+	gdouble			 energy_empty;		/* Watt Hours */
+	gdouble			 energy_full;		/* Watt Hours */
+	gdouble			 energy_full_design;	/* Watt Hours */
+	gdouble			 energy_rate;		/* Watts */
+	gint64			 time_to_empty;		/* seconds */
+	gint64			 time_to_full;		/* seconds */
+	gdouble			 percentage;		/* percent */
 } DkpObject;
 
 DkpObject	*dkp_object_new			(void);