From 9ea0fd4f29744943c4e5c58fae3ca63f92685559 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Sat, 21 Jun 2014 09:37:47 -0400 Subject: [PATCH] core: Update include file #ifndef guards Signed-off-by: Anna Schumaker --- include/core/audio.h | 6 +++--- include/core/callback.h | 6 +++--- include/core/database.h | 6 +++--- include/core/deck.h | 6 +++--- include/core/driver.h | 4 ++++ include/core/file.h | 6 +++--- include/core/filter.h | 6 +++--- include/core/idle.h | 6 +++--- include/core/index.h | 6 +++--- include/core/library.h | 6 +++--- include/core/playlist.h | 6 +++--- include/core/print.h | 6 +++--- include/core/queue.h | 6 +++--- include/core/random.h | 7 +++---- include/core/tags.h | 6 +++--- include/core/version.h | 6 +++--- include/tests/test.h | 4 ++++ 17 files changed, 53 insertions(+), 46 deletions(-) diff --git a/include/core/audio.h b/include/core/audio.h index 9ea204e3..ffb7f7e2 100644 --- a/include/core/audio.h +++ b/include/core/audio.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_AUDIO_H -#define OCARINA_AUDIO_H +#ifndef OCARINA_CORE_AUDIO_H +#define OCARINA_CORE_AUDIO_H #include #include @@ -31,4 +31,4 @@ namespace audio unsigned int pause_count(); }; -#endif /* OCARINA_AUDIO_H */ +#endif /* OCARINA_CORE_AUDIO_H */ diff --git a/include/core/callback.h b/include/core/callback.h index 55aa03fb..320924bc 100644 --- a/include/core/callback.h +++ b/include/core/callback.h @@ -1,8 +1,8 @@ /* * Copyright 2014 (c) Anna Schumaker. */ -#ifndef OCARINA_CALLBACK_H -#define OCARINA_CALLBACK_H +#ifndef OCARINA_CORE_CALLBACK_H +#define OCARINA_CORE_CALLBACK_H #include #include @@ -28,4 +28,4 @@ struct Callbacks { struct Callbacks *get_callbacks(); -#endif /* OCARINA_CALLBACK_H */ +#endif /* OCARINA_CORE_CALLBACK_H */ diff --git a/include/core/database.h b/include/core/database.h index c0953f49..9a5d703b 100644 --- a/include/core/database.h +++ b/include/core/database.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_DATABASE_H -#define OCARINA_DATABASE_H +#ifndef OCARINA_CORE_DATABASE_H +#define OCARINA_CORE_DATABASE_H #include @@ -57,4 +57,4 @@ public: #include "database.hpp" -#endif /* OCARINA_DATABASE_H */ +#endif /* OCARINA_CORE_DATABASE_H */ diff --git a/include/core/deck.h b/include/core/deck.h index a4775d7e..e04dc6cd 100644 --- a/include/core/deck.h +++ b/include/core/deck.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_DECK_H -#define OCARINA_DECK_H +#ifndef OCARINA_CORE_DECK_H +#define OCARINA_CORE_DECK_H #include #include @@ -45,4 +45,4 @@ namespace deck }; -#endif /* OCARINA_DECK_H */ +#endif /* OCARINA_CORE_DECK_H */ diff --git a/include/core/driver.h b/include/core/driver.h index 11a6994c..538da906 100644 --- a/include/core/driver.h +++ b/include/core/driver.h @@ -1,6 +1,8 @@ /* * Copyright 2014 (c) Anna Schumaker. */ +#ifndef OCARINA_CORE_DRIVER_H +#define OCARINA_CORE_DRIVER_H #include @@ -89,3 +91,5 @@ namespace driver Driver *get_driver(); } + +#endif /* OCARINA_CORE_DRIVER_H */ diff --git a/include/core/file.h b/include/core/file.h index 213ff75d..276514b9 100644 --- a/include/core/file.h +++ b/include/core/file.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_FILE_H -#define OCARINA_FILE_H +#ifndef OCARINA_CORE_FILE_H +#define OCARINA_CORE_FILE_H #include #include @@ -38,4 +38,4 @@ public: std::string getline(); }; -#endif /* OCARINA_FILE_H */ +#endif /* OCARINA_CORE_FILE_H */ diff --git a/include/core/filter.h b/include/core/filter.h index a955ac06..4c3aaaee 100644 --- a/include/core/filter.h +++ b/include/core/filter.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_FILTER_H -#define OCARINA_FILTER_H +#ifndef OCARINA_CORE_FILTER_H +#define OCARINA_CORE_FILTER_H #include #include @@ -15,4 +15,4 @@ namespace filter { }; -#endif /* OCARINA_FILTER_H */ +#endif /* OCARINA_CORE_FILTER_H */ diff --git a/include/core/idle.h b/include/core/idle.h index 81448406..0baa51f9 100644 --- a/include/core/idle.h +++ b/include/core/idle.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_IDLE_H -#define OCARINA_IDLE_H +#ifndef OCARINA_CORE_IDLE_H +#define OCARINA_CORE_IDLE_H namespace idle { @@ -44,4 +44,4 @@ namespace idle #include "idle.hpp" -#endif /* OCARINA_IDLE_H */ +#endif /* OCARINA_CORE_IDLE_H */ diff --git a/include/core/index.h b/include/core/index.h index 34cf83fc..a952938b 100644 --- a/include/core/index.h +++ b/include/core/index.h @@ -1,8 +1,8 @@ /* * Copyright 2014 (c) Anna Schumaker. */ -#ifndef OCARINA_INDEX_H -#define OCARINA_INDEX_H +#ifndef OCARINA_CORE_INDEX_H +#define OCARINA_CORE_INDEX_H #include @@ -35,4 +35,4 @@ public: void remove(const std::string &, unsigned int); }; -#endif /* OCARINA_DATABASE_H */ +#endif /* OCARINA_CORE_DATABASE_H */ diff --git a/include/core/library.h b/include/core/library.h index 78713525..2c0a0b2c 100644 --- a/include/core/library.h +++ b/include/core/library.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_LIBRARY_H -#define OCARINA_LIBRARY_H +#ifndef OCARINA_CORE_LIBRARY_H +#define OCARINA_CORE_LIBRARY_H #include #include @@ -23,4 +23,4 @@ namespace library }; -#endif /* OCARINA_LIBRARY_H */ +#endif /* OCARINA_CORE_LIBRARY_H */ diff --git a/include/core/playlist.h b/include/core/playlist.h index 34e36d28..4efac4d0 100644 --- a/include/core/playlist.h +++ b/include/core/playlist.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_PLAYLIST_H -#define OCARINA_PLAYLIST_H +#ifndef OCARINA_CORE_PLAYLIST_H +#define OCARINA_CORE_PLAYLIST_H #include #include @@ -22,4 +22,4 @@ namespace playlist }; -#endif /* OCARINA_PLAYLIST_H */ +#endif /* OCARINA_CORE_PLAYLIST_H */ diff --git a/include/core/print.h b/include/core/print.h index 43173288..a67d7310 100644 --- a/include/core/print.h +++ b/include/core/print.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2013 Anna Schumaker. */ -#ifndef OCARINA_PRINT_H -#define OCARINA_PRINT_H +#ifndef OCARINA_CORE_PRINT_H +#define OCARINA_CORE_PRINT_H #include #include @@ -29,4 +29,4 @@ inline void dprint(const char *fmt, ...) inline void dprint(const char *fmt, ...) {} #endif /* CONFIG_DEBUG */ -#endif /* OCARINA_PRINT_H */ +#endif /* OCARINA_CORE_PRINT_H */ diff --git a/include/core/queue.h b/include/core/queue.h index 4fda3f9f..11367a03 100644 --- a/include/core/queue.h +++ b/include/core/queue.h @@ -1,8 +1,8 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_QUEUE_H -#define OCARINA_QUEUE_H +#ifndef OCARINA_CORE_QUEUE_H +#define OCARINA_CORE_QUEUE_H #include #include @@ -62,4 +62,4 @@ public: void track_selected(unsigned int); }; -#endif /* OCARINA_QUEUE_H */ +#endif /* OCARINA_CORE_QUEUE_H */ diff --git a/include/core/random.h b/include/core/random.h index 5627ea2f..e332314a 100644 --- a/include/core/random.h +++ b/include/core/random.h @@ -1,9 +1,8 @@ /* * Copyright 2014 (c) Anna Schumaker */ - -#ifndef OCARINA_RANDOM_H -#define OCARINA_RANDOM_H +#ifndef OCARINA_CORE_RANDOM_H +#define OCARINA_CORE_RANDOM_H #ifndef CONFIG_TEST @@ -33,4 +32,4 @@ static inline unsigned int random(unsigned int min, unsigned int max) } -#endif /* OCARINA_RANDOM_H */ +#endif /* OCARINA_CORE_RANDOM_H */ diff --git a/include/core/tags.h b/include/core/tags.h index 4f7d5137..3238a2df 100644 --- a/include/core/tags.h +++ b/include/core/tags.h @@ -1,8 +1,8 @@ /* * Copyright 2014 (c) Anna Schumaker. */ -#ifndef OCARINA_TAGS_H -#define OCARINA_TAGS_H +#ifndef OCARINA_CORE_TAGS_H +#define OCARINA_CORE_TAGS_H #include @@ -128,4 +128,4 @@ namespace tagdb } -#endif /* OCARINA_TAGS_H */ +#endif /* OCARINA_CORE_TAGS_H */ diff --git a/include/core/version.h b/include/core/version.h index 68fbae55..2d58b89a 100644 --- a/include/core/version.h +++ b/include/core/version.h @@ -1,12 +1,12 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#ifndef OCARINA_VERSION_H -#define OCARINA_VERSION_H +#ifndef OCARINA_CORE_VERSION_H +#define OCARINA_CORE_VERSION_H static inline const char *get_version() { return CONFIG_VERSION; } -#endif /* OCARINA_VERSION_H */ +#endif /* OCARINA_CORE_VERSION_H */ diff --git a/include/tests/test.h b/include/tests/test.h index ea9dbd42..8d5a9ff9 100644 --- a/include/tests/test.h +++ b/include/tests/test.h @@ -1,6 +1,8 @@ /* * Copyright 2014 (c) Anna Schumaker. */ +#ifndef OCARINA_TESTS_TEST_H +#define OCARINA_TESTS_TEST_H #include #include @@ -164,3 +166,5 @@ namespace test if (lhs == rhs) \ test :: failure(lhs, rhs, __LINE__); \ } while (0) + +#endif /* OCARINA_TESTS_TEST_H */