normalise type names

4 files changed, 11 insertions, 11 deletions

diff --git a/src/calendar.h b/src/calendar.h
index ed54c4f..060ad99 100644
--- a/src/calendar.h
+++ b/src/calendar.h
@@ -1,17 +1,17 @@
 #ifndef EVERY_CALENDAR_H
 #define EVERY_CALENDAR_H
 
-enum every_calendar_entry_type {
-	EVERY_CALENDAR_ENTRY_TYPE_ON,
-	EVERY_CALENDAR_ENTRY_TYPE_EVERY,
+enum calendar_entry_type_e {
+	CALENDAR_ENTRY_TYPE_ON,
+	CALENDAR_ENTRY_TYPE_EVERY,
 };
 
-struct every_calendar_entry {
-	enum every_calendar_entry_type type;
+struct calendar_entry_s {
+	enum calendar_entry_type_e type;
 };
 
-struct every_calendar {
-	struct every_calendar_entry *entries;
+struct calendar_s {
+	struct calendar_entry_s *entries;
 };
 
 #endif
diff --git a/src/main.c b/src/main.c
index 86369d2..86def80 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,7 @@
 
 int main(int argc, char **argv)
 {
-	enum every_opt_command cmd;
+	enum opt_command_e cmd;
 
 	char *calpath;
 	FILE *cal;
diff --git a/src/opt.c b/src/opt.c
index c051388..b7538db 100644
--- a/src/opt.c
+++ b/src/opt.c
@@ -86,7 +86,7 @@ char* opt_editor(void)
 	return getenv("EDITOR");
 }
 
-enum every_opt_command opt_command(void)
+enum opt_command_e opt_command(void)
 {
 	if (result.argc > 0) {
 		switch (result.argv[0][0]) {
diff --git a/src/opt.h b/src/opt.h
index 4e8921a..6c10d3c 100644
--- a/src/opt.h
+++ b/src/opt.h
@@ -1,7 +1,7 @@
 #ifndef EVERY_OPT_H
 #define EVERY_OPT_H
 
-enum every_opt_command {
+enum opt_command_e {
 	OPT_COMMAND_CONSOLE = 0,
 	OPT_COMMAND_SCRIPT = 1,
 	OPT_COMMAND_EDIT = 1,
@@ -12,6 +12,6 @@ void opt_parse(int argc, char **argv);
 char* opt_calpath(void);
 char* opt_editor(void);
 
-enum every_opt_command opt_command(void);
+enum opt_command_e opt_command(void);
 
 #endif