anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core: Update include file #ifndef guards 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2014-06-21 09:37:47 -04:00
parent 194a09bed4
commit 9ea0fd4f29
17 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/audio.h
View File

@ -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 <core/tags.h>
#include <string>
@ -31,4 +31,4 @@ namespace audio
unsigned int pause_count();
};
#endif /* OCARINA_AUDIO_H */
#endif /* OCARINA_CORE_AUDIO_H */

6
include/core/callback.h
View File

@ -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 <core/library.h>
#include <core/queue.h>
@ -28,4 +28,4 @@ struct Callbacks {
struct Callbacks *get_callbacks();
#endif /* OCARINA_CALLBACK_H */
#endif /* OCARINA_CORE_CALLBACK_H */

6
include/core/database.h
View File

@ -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 <core/file.h>
@ -57,4 +57,4 @@ public:
#include "database.hpp"
#endif /* OCARINA_DATABASE_H */
#endif /* OCARINA_CORE_DATABASE_H */

6
include/core/deck.h
View File

@ -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 <core/queue.h>
#include <list>
@ -45,4 +45,4 @@ namespace deck
};
#endif /* OCARINA_DECK_H */
#endif /* OCARINA_CORE_DECK_H */

4
include/core/driver.h
View File

@ -1,6 +1,8 @@
/*
* Copyright 2014 (c) Anna Schumaker.
*/
#ifndef OCARINA_CORE_DRIVER_H
#define OCARINA_CORE_DRIVER_H
#include <string>
@ -89,3 +91,5 @@ namespace driver
Driver *get_driver();
}
#endif /* OCARINA_CORE_DRIVER_H */

6
include/core/file.h
View File

@ -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 <fstream>
#include <string>
@ -38,4 +38,4 @@ public:
std::string getline();
};
#endif /* OCARINA_FILE_H */
#endif /* OCARINA_CORE_FILE_H */

6
include/core/filter.h
View File

@ -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 <set>
#include <string>
@ -15,4 +15,4 @@ namespace filter {
};
#endif /* OCARINA_FILTER_H */
#endif /* OCARINA_CORE_FILTER_H */

6
include/core/idle.h
View File

@ -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 */

6
include/core/index.h
View File

@ -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 <core/database.h>
@ -35,4 +35,4 @@ public:
void remove(const std::string &, unsigned int);
};
#endif /* OCARINA_DATABASE_H */
#endif /* OCARINA_CORE_DATABASE_H */

6
include/core/library.h
View File

@ -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 <core/queue.h>
#include <core/tags.h>
@ -23,4 +23,4 @@ namespace library
};
#endif /* OCARINA_LIBRARY_H */
#endif /* OCARINA_CORE_LIBRARY_H */

6
include/core/playlist.h
View File

@ -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 <core/index.h>
#include <core/queue.h>
@ -22,4 +22,4 @@ namespace playlist
};
#endif /* OCARINA_PLAYLIST_H */
#endif /* OCARINA_CORE_PLAYLIST_H */

6
include/core/print.h
View File

@ -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 <cstdio>
#include <cstdarg>
@ -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 */

6
include/core/queue.h
View File

@ -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 <core/file.h>
#include <core/tags.h>
@ -62,4 +62,4 @@ public:
void track_selected(unsigned int);
};
#endif /* OCARINA_QUEUE_H */
#endif /* OCARINA_CORE_QUEUE_H */

7
include/core/random.h
View File

@ -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 */

6
include/core/tags.h
View File

@ -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 <core/database.h>
@ -128,4 +128,4 @@ namespace tagdb
}
#endif /* OCARINA_TAGS_H */
#endif /* OCARINA_CORE_TAGS_H */

6
include/core/version.h
View File

@ -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 */

4
include/tests/test.h
View File

@ -1,6 +1,8 @@
/*
* Copyright 2014 (c) Anna Schumaker.
*/
#ifndef OCARINA_TESTS_TEST_H
#define OCARINA_TESTS_TEST_H
#include <iostream>
#include <stdlib.h>
@ -164,3 +166,5 @@ namespace test
if (lhs == rhs) \
test :: failure(lhs, rhs, __LINE__); \
} while (0)
#endif /* OCARINA_TESTS_TEST_H */