Cleanup and style update (avoid typedef)

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 14 insertions, 14 deletions

diff --git a/src/options.h b/src/options.h
index 3470599..2978672 100644
--- a/src/options.h
+++ b/src/options.h
@@ -22,12 +22,12 @@
 
 #include "common.h"
 
-typedef struct {
+struct options {
 	/* Path to config file */
 	char *config_filepath;
 
-	transition_scheme_t scheme;
-	program_mode_t mode;
+	struct transition_scheme scheme;
+	enum program_mode mode;
 	int verbose;
 
 	/* Temperature to set in manual mode. */
@@ -38,26 +38,26 @@ typedef struct {
 	int preserve_gamma;
 
 	/* Selected gamma method. */
-	const gamma_method_t *method;
+	const struct gamma_method *method;
 	/* Arguments for gamma method. */
 	char *method_args;
 
 	/* Selected location provider. */
-	const location_provider_t *provider;
+	const struct location_provider *provider;
 	/* Arguments for location provider. */
 	char *provider_args;
-} options_t;
+};
 
 
-void options_init(options_t *options);
+void options_init(struct options *options);
 void options_parse_args(
-	options_t *options, int argc, char *argv[],
-	const gamma_method_t *gamma_methods,
-	const location_provider_t *location_providers);
+	struct options *options, int argc, char *argv[],
+	const struct gamma_method *gamma_methods,
+	const struct location_provider *location_providers);
 void options_parse_config_file(
-	options_t *options, config_ini_state_t *config_state,
-	const gamma_method_t *gamma_methods,
-	const location_provider_t *location_providers);
-void options_set_defaults(options_t *options);
+	struct options *options, struct config_ini_state *config_state,
+	const struct gamma_method *gamma_methods,
+	const struct location_provider *location_providers);
+void options_set_defaults(struct options *options);
 
 #endif /* ! REDSHIFT_OPTIONS_H */