Mercurial > malikania
changeset 84:bb859ba34ce4
Misc: update header guards, closes #616
line wrap: on
line diff
--- a/libclient/malikania/client/animation.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/animation.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_ANIMATION_HPP -#define MALIKANIA_ANIMATION_HPP +#ifndef MALIKANIA_CLIENT_ANIMATION_HPP +#define MALIKANIA_CLIENT_ANIMATION_HPP /** * \file animation.hpp @@ -154,4 +154,4 @@ } // !mlk -#endif // !MALIKANIA_ANIMATION_HPP +#endif // !MALIKANIA_CLIENT_ANIMATION_HPP
--- a/libclient/malikania/client/animator.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/animator.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_ANIMATOR_HPP -#define MALIKANIA_ANIMATOR_HPP +#ifndef MALIKANIA_CLIENT_ANIMATOR_HPP +#define MALIKANIA_CLIENT_ANIMATOR_HPP #include <boost/timer/timer.hpp> @@ -75,4 +75,4 @@ } // !mlk -#endif // !MALIKANIA_ANIMATOR_HPP +#endif // !MALIKANIA_CLIENT_ANIMATOR_HPP
--- a/libclient/malikania/client/backend/sdl/font_backend.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/backend/sdl/font_backend.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_FONT_BACKEND_HPP -#define MALIKANIA_FONT_BACKEND_HPP +#ifndef MALIKANIA_CLIENT_FONT_BACKEND_HPP +#define MALIKANIA_CLIENT_FONT_BACKEND_HPP #include <memory> @@ -52,4 +52,4 @@ } // !mlk -#endif // !MALIKANIA_FONT_BACKEND_HPP +#endif // !MALIKANIA_CLIENT_FONT_BACKEND_HPP
--- a/libclient/malikania/client/backend/sdl/image_backend.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/backend/sdl/image_backend.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_IMAGE_BACKEND_HPP -#define MALIKANIA_IMAGE_BACKEND_HPP +#ifndef MALIKANIA_CLIENT_IMAGE_BACKEND_HPP +#define MALIKANIA_CLIENT_IMAGE_BACKEND_HPP #include <memory> @@ -66,4 +66,4 @@ } // !mlk -#endif // !MALIKANIA_IMAGE_BACKEND_HPP +#endif // !MALIKANIA_CLIENT_IMAGE_BACKEND_HPP
--- a/libclient/malikania/client/backend/sdl/window_backend.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/backend/sdl/window_backend.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_WINDOW_BACKEND_HPP -#define MALIKANIA_WINDOW_BACKEND_HPP +#ifndef MALIKANIA_CLIENT_WINDOW_BACKEND_HPP +#define MALIKANIA_CLIENT_WINDOW_BACKEND_HPP #include <memory> #include <vector> @@ -84,4 +84,4 @@ } // !mlk -#endif // !MALIKANIA_WINDOW_BACKEND_HPP +#endif // !MALIKANIA_CLIENT_WINDOW_BACKEND_HPP
--- a/libclient/malikania/client/color.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/color.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_COLOR_HPP -#define MALIKANIA_COLOR_HPP +#ifndef MALIKANIA_CLIENT_COLOR_HPP +#define MALIKANIA_CLIENT_COLOR_HPP /** * \file color.hpp @@ -131,4 +131,4 @@ } // !mlk -#endif // !MALIKANIA_COLOR_HPP +#endif // !MALIKANIA_CLIENT_COLOR_HPP
--- a/libclient/malikania/client/font.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/font.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_FONT_HPP -#define MALIKANIA_FONT_HPP +#ifndef MALIKANIA_CLIENT_FONT_HPP +#define MALIKANIA_CLIENT_FONT_HPP /** * \file font.hpp @@ -115,4 +115,4 @@ } // !mlk -#endif // MALIKANIA_FONT_HPP +#endif // MALIKANIA_CLIENT_FONT_HPP
--- a/libclient/malikania/client/image.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/image.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_IMAGE_HPP -#define MALIKANIA_IMAGE_HPP +#ifndef MALIKANIA_CLIENT_IMAGE_HPP +#define MALIKANIA_CLIENT_IMAGE_HPP /** * \file image.hpp @@ -124,4 +124,4 @@ } // !mlk -#endif // !MALIKANIA_IMAGE_HPP +#endif // !MALIKANIA_CLIENT_IMAGE_HPP
--- a/libclient/malikania/client/label.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/label.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -20,7 +20,7 @@ #define MALIKANIA_CLIENT_LABEL_HPP /** - * \file label.hp + * \file label.hpp * \brief GUI label element. */
--- a/libclient/malikania/client/line.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/line.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_LINE_HPP -#define MALIKANIA_LINE_HPP +#ifndef MALIKANIA_CLIENT_LINE_HPP +#define MALIKANIA_CLIENT_LINE_HPP /** * \file line.hpp @@ -126,4 +126,4 @@ } // !mlk -#endif // !MALIKANIA_LINE_HPP +#endif // !MALIKANIA_CLIENT_LINE_HPP
--- a/libclient/malikania/client/loader.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/loader.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,11 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_CLIENT_RESOURCES_LOADER_HPP -#define MALIKANIA_CLIENT_RESOURCES_LOADER_HPP +#ifndef MALIKANIA_CLIENT_LOADER_HPP +#define MALIKANIA_CLIENT_LOADER_HPP /* - * \file client_resources_loader.hpp + * \file loader.hpp * \brief Load client assets. */ @@ -126,4 +126,4 @@ } // !mlk -#endif // !MALIKANIA_CLIENT_RESOURCES_LOADER_HPP +#endif // !MALIKANIA_CLIENT_LOADER_HPP
--- a/libclient/malikania/client/point.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/point.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_POINT_HPP -#define MALIKANIA_POINT_HPP +#ifndef MALIKANIA_CLIENT_POINT_HPP +#define MALIKANIA_CLIENT_POINT_HPP /** * \file point.hpp @@ -98,4 +98,4 @@ } // !mlk -#endif // !MALIKANIA_POINT_HPP +#endif // !MALIKANIA_CLIENT_POINT_HPP
--- a/libclient/malikania/client/rectangle.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/rectangle.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_RECTANGLE_HPP -#define MALIKANIA_RECTANGLE_HPP +#ifndef MALIKANIA_CLIENT_RECTANGLE_HPP +#define MALIKANIA_CLIENT_RECTANGLE_HPP /** * \file rectangle.hpp @@ -139,4 +139,4 @@ } // !mlk -#endif // !MALIKANIA_RECTANGLE_HPP +#endif // !MALIKANIA_CLIENT_RECTANGLE_HPP
--- a/libclient/malikania/client/size.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/size.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_SIZE_HPP -#define MALIKANIA_SIZE_HPP +#ifndef MALIKANIA_CLIENT_SIZE_HPP +#define MALIKANIA_CLIENT_SIZE_HPP namespace mlk { @@ -103,4 +103,4 @@ } // !mlk -#endif // !MALIKANIA_SIZE_HPP +#endif // !MALIKANIA_CLIENT_SIZE_HPP
--- a/libclient/malikania/client/sprite.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/sprite.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_SPRITE_HPP -#define MALIKANIA_SPRITE_HPP +#ifndef MALIKANIA_CLIENT_SPRITE_HPP +#define MALIKANIA_CLIENT_SPRITE_HPP /** * \file sprite.hpp @@ -146,4 +146,4 @@ } // !mlk -#endif // !MALIKANIA_SPRITE_HPP +#endif // !MALIKANIA_CLIENT_SPRITE_HPP
--- a/libclient/malikania/client/window.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libclient/malikania/client/window.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_WINDOW_HPP -#define MALIKANIA_WINDOW_HPP +#ifndef MALIKANIA_CLIENT_WINDOW_HPP +#define MALIKANIA_CLIENT_WINDOW_HPP /** * \file window.hpp @@ -351,4 +351,4 @@ } // !mlk -#endif // !MALIKANIA_WINDOW_HPP +#endif // !MALIKANIA_CLIENT_WINDOW_HPP
--- a/libserver/malikania/server/account.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libserver/malikania/server/account.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_ACCOUNT_HPP -#define MALIKANIA_ACCOUNT_HPP +#ifndef MALIKANIA_SERVER_ACCOUNT_HPP +#define MALIKANIA_SERVER_ACCOUNT_HPP /** * \file account.hpp @@ -58,4 +58,4 @@ } // !mlk -#endif // !MALIKANIA_ACCOUNT_HPP +#endif // !MALIKANIA_SERVER_ACCOUNT_HPP
--- a/libserver/malikania/server/client.cpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libserver/malikania/server/client.cpp Sun Jan 22 18:06:59 2017 +0100 @@ -1,3 +1,21 @@ +/* + * client.cpp -- client connected to the server + * + * Copyright (c) 2013-2017 David Demelier <markand@malikania.fr> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #include <cassert> #include <iostream>
--- a/libserver/malikania/server/client.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libserver/malikania/server/client.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -1,3 +1,21 @@ +/* + * client.hpp -- client connected to the server + * + * Copyright (c) 2013-2017 David Demelier <markand@malikania.fr> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #ifndef MALIKANIA_SERVER_CLIENT_HPP #define MALIKANIA_SERVER_CLIENT_HPP
--- a/libserver/malikania/server/database.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libserver/malikania/server/database.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_DATABASE_HPP -#define MALIKANIA_DATABASE_HPP +#ifndef MALIKANIA_SERVER_DATABASE_HPP +#define MALIKANIA_SERVER_DATABASE_HPP /** * \file database.hpp @@ -84,4 +84,4 @@ } // !mlk -#endif // !MALIKANIA_DATABASE_HPP +#endif // !MALIKANIA_SERVER_DATABASE_HPP
--- a/libserver/malikania/server/server.hpp Sun Jan 22 17:54:56 2017 +0100 +++ b/libserver/malikania/server/server.hpp Sun Jan 22 18:06:59 2017 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_SERVER_HPP -#define MALIKANIA_SERVER_HPP +#ifndef MALIKANIA_SERVER_SERVER_HPP +#define MALIKANIA_SERVER_SERVER_HPP #include <cstdint> #include <functional> @@ -80,4 +80,4 @@ } // !mlk -#endif // !MALIKANIA_SERVER_HPP +#endif // !MALIKANIA_SERVER_SERVER_HPP