[DEV] replace 'include guard' with 'pragma once'

This commit is contained in:
Edouard DUPIN 2016-02-02 21:18:54 +01:00
parent 7a7c690a70
commit 6697410f05
30 changed files with 66 additions and 193 deletions

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_CONTEXT_APPLICATION_H__
#define __GALE_CONTEXT_APPLICATION_H__
#include <memory> #include <memory>
#include <etk/types.h> #include <etk/types.h>
@ -210,5 +208,3 @@ namespace gale {
virtual void onPeriod(int64_t _time) {}; virtual void onPeriod(int64_t _time) {};
}; };
} }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_DIMENSION_H__
#define __GALE_DIMENSION_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/types.h> #include <etk/types.h>
@ -206,7 +204,5 @@ namespace gale {
}; };
std::ostream& operator <<(std::ostream& _os, enum gale::Dimension::distance _obj); std::ostream& operator <<(std::ostream& _os, enum gale::Dimension::distance _obj);
std::ostream& operator <<(std::ostream& _os, const gale::Dimension& _obj); std::ostream& operator <<(std::ostream& _os, const gale::Dimension& _obj);
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_THREAD_H__
#define __GALE_THREAD_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/thread/tools.h> #include <etk/thread/tools.h>
@ -58,7 +56,5 @@ namespace gale {
protected: protected:
virtual bool onThreadCall() { return true; }; virtual bool onThreadCall() { return true; };
}; };
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_CONTEXT_H__
#define __GALE_CONTEXT_H__
#include <etk/os/Fifo.h> #include <etk/os/Fifo.h>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.h>
@ -316,7 +314,5 @@ namespace gale {
* @param[in] _thread generic C++11 thread handle * @param[in] _thread generic C++11 thread handle
*/ */
void contextUnRegisterThread(std11::thread* _thread); void contextUnRegisterThread(std11::thread* _thread);
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_FPS_H__
#define __GALE_FPS_H__
namespace gale { namespace gale {
namespace context { namespace context {
@ -135,7 +133,6 @@ namespace gale {
} }
} }
}; };
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __MAC_OS_CONTEXT_H__
#define __MAC_OS_CONTEXT_H__
#include <gale/key/key.h> #include <gale/key/key.h>
@ -34,7 +32,5 @@ namespace IOs {
void background(); void background();
void resume(); void resume();
void suspend(); void suspend();
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_MM_INTERFACE_H__
#define __GALE_MM_INTERFACE_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -21,4 +19,3 @@ void mm_openURL(const char *_url);
} }
#endif #endif
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_SYSTEM_INPUT_H__
#define __GALE_SYSTEM_INPUT_H__
#include <gale/Application.h> #include <gale/Application.h>
@ -99,8 +97,6 @@ namespace gale {
m_specialKey = _specialKey; m_specialKey = _specialKey;
} }
}; };
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __MAC_OS_CONTEXT_H__
#define __MAC_OS_CONTEXT_H__
#include <gale/key/key.h> #include <gale/key/key.h>
@ -27,6 +25,5 @@ namespace MacOs {
/* /*
void setRedrawCallback(const std::function<void()>& _func); void setRedrawCallback(const std::function<void()>& _func);
*/ */
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_MM_INTERFACE_H__
#define __GALE_MM_INTERFACE_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -20,5 +18,3 @@ void mm_stopApplication();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_CLIPBOARD_H__
#define __GALE_CLIPBOARD_H__
#include <gale/debug.h> #include <gale/debug.h>
@ -77,8 +75,4 @@ namespace gale {
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
std::ostream& operator <<(std::ostream& _os, const enum gale::context::clipBoard::clipboardListe _obj); std::ostream& operator <<(std::ostream& _os, const enum gale::context::clipBoard::clipboardListe _obj);
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_COMMAND_LINE_H__
#define __GALE_COMMAND_LINE_H__
#include <gale/debug.h> #include <gale/debug.h>
@ -42,7 +40,6 @@ namespace gale {
*/ */
void remove(int32_t _id); void remove(int32_t _id);
}; };
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_CURSOR_H__
#define __GALE_CURSOR_H__
#include <gale/debug.h> #include <gale/debug.h>
@ -41,8 +39,5 @@ namespace gale {
* @brief Debug operator To display the curent element in a Human readable information * @brief Debug operator To display the curent element in a Human readable information
*/ */
std::ostream& operator <<(std::ostream& _os, const enum gale::context::cursor _obj); std::ostream& operator <<(std::ostream& _os, const enum gale::context::cursor _obj);
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_DEBUG_H__
#define __GALE_DEBUG_H__
#include <etk/log.h> #include <etk/log.h>
@ -40,5 +38,3 @@ namespace gale {
} \ } \
} while (0) } while (0)
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_H__
#define __GALE_H__
#include <etk/types.h> #include <etk/types.h>
#include <gale/Application.h> #include <gale/Application.h>
@ -47,6 +45,5 @@ namespace gale {
* @return the string of the mode of commpilation * @return the string of the mode of commpilation
*/ */
std::string getBoardType(); std::string getBoardType();
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_KEY_SPECIAL_H__
#define __GALE_KEY_SPECIAL_H__
#include <gale/debug.h> #include <gale/debug.h>
#include <gale/key/keyboard.h> #include <gale/key/keyboard.h>
@ -113,9 +111,6 @@ namespace gale {
void update(enum gale::key::keyboard _move, bool _isDown); void update(enum gale::key::keyboard _move, bool _isDown);
}; };
std::ostream& operator <<(std::ostream& _os, const gale::key::Special& _obj); std::ostream& operator <<(std::ostream& _os, const gale::key::Special& _obj);
}; }
}; }
#endif

View File

@ -5,15 +5,9 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_KEY_H__
#define __GALE_KEY_H__
#include <gale/key/keyboard.h> #include <gale/key/keyboard.h>
#include <gale/key/Special.h> #include <gale/key/Special.h>
#include <gale/key/status.h> #include <gale/key/status.h>
#include <gale/key/type.h> #include <gale/key/type.h>
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_KEY_KEYBOARD_H__
#define __GALE_KEY_KEYBOARD_H__
#include <gale/debug.h> #include <gale/debug.h>
@ -68,11 +66,6 @@ namespace gale {
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
std::ostream& operator <<(std::ostream& _os, const enum gale::key::keyboard _obj); std::ostream& operator <<(std::ostream& _os, const enum gale::key::keyboard _obj);
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_KEY_STATUS_H__
#define __GALE_KEY_STATUS_H__
#include <gale/debug.h> #include <gale/debug.h>
@ -38,11 +36,6 @@ namespace gale {
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
std::ostream& operator <<(std::ostream& _os, const enum gale::key::status _obj); std::ostream& operator <<(std::ostream& _os, const enum gale::key::status _obj);
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_KEY_TYPE_H__
#define __GALE_KEY_TYPE_H__
#include <gale/debug.h> #include <gale/debug.h>
@ -22,15 +20,10 @@ namespace gale {
type_finger, //!< Finger type type_finger, //!< Finger type
type_stylet, //!< Stylet type type_stylet, //!< Stylet type
}; };
}; }
/** /**
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
std::ostream& operator <<(std::ostream& _os, const enum gale::key::type _obj); std::ostream& operator <<(std::ostream& _os, const enum gale::key::type _obj);
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_ORIENTATION_H__
#define __GALE_ORIENTATION_H__
namespace gale { namespace gale {
enum orientation { enum orientation {
@ -17,6 +15,3 @@ namespace gale {
}; };
std::ostream& operator <<(std::ostream& _os, enum gale::orientation _obj); std::ostream& operator <<(std::ostream& _os, enum gale::orientation _obj);
} }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __OPEN_GL_INCLUDE_H__
#define __OPEN_GL_INCLUDE_H__
extern "C" { extern "C" {
#if defined(__TARGET_OS__Linux) #if defined(__TARGET_OS__Linux)
@ -43,4 +41,3 @@ extern "C" {
#endif #endif
} }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __OPEN_GL_H__
#define __OPEN_GL_H__
#include <etk/types.h> #include <etk/types.h>
#include <vector> #include <vector>
@ -239,7 +237,5 @@ namespace gale {
}; };
std::ostream& operator <<(std::ostream& _os, const enum openGL::flag& _obj); std::ostream& operator <<(std::ostream& _os, const enum openGL::flag& _obj);
std::ostream& operator <<(std::ostream& _os, const enum openGL::renderMode& _obj); std::ostream& operator <<(std::ostream& _os, const enum openGL::renderMode& _obj);
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __RESOURCES_MANAGER_H__
#define __RESOURCES_MANAGER_H__
#include <list> #include <list>
#include <vector> #include <vector>
@ -65,9 +63,6 @@ namespace gale {
void localAdd(const std::shared_ptr<gale::Resource>& _object); void localAdd(const std::shared_ptr<gale::Resource>& _object);
virtual void cleanInternalRemoved(); virtual void cleanInternalRemoved();
}; };
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __OPEN_GL__PROGRAM_H__
#define __OPEN_GL__PROGRAM_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/math/Vector4D.h> #include <etk/math/Vector4D.h>
@ -305,8 +303,6 @@ namespace gale {
private: private:
void checkGlError(const char* _op, int32_t _localLine, int32_t _idElem=-2); void checkGlError(const char* _op, int32_t _localLine, int32_t _idElem=-2);
}; };
}; }
}; }
#endif

View File

@ -5,10 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __RESOURCES_H__
#define __RESOURCES_H__
#include <mutex> #include <mutex>
#include <memory> #include <memory>
@ -212,9 +209,7 @@ namespace gale {
*/ */
static gale::resource::Manager& getManager(); static gale::resource::Manager& getManager();
}; };
}; }
#include <gale/resource/Manager.h> #include <gale/resource/Manager.h>
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __OPEN_GL__SHADER_H__
#define __OPEN_GL__SHADER_H__
#include <etk/types.h> #include <etk/types.h>
#include <gale/debug.h> #include <gale/debug.h>
@ -71,8 +69,6 @@ namespace gale {
*/ */
void reload(); void reload();
}; };
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __GALE_TEXTURE_H__
#define __GALE_TEXTURE_H__
#include <etk/types.h> #include <etk/types.h>
#include <gale/debug.h> #include <gale/debug.h>
@ -71,8 +69,6 @@ namespace gale {
enum gale::resource::Texture::dataType _dataType, enum gale::resource::Texture::dataType _dataType,
enum gale::resource::Texture::color _dataColorSpace); enum gale::resource::Texture::color _dataColorSpace);
}; };
}; }
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __OPEN_GL__VIRTUAL_BUFFER_OBJECT_H__
#define __OPEN_GL__VIRTUAL_BUFFER_OBJECT_H__
#include <etk/types.h> #include <etk/types.h>
#include <etk/math/Vector2D.h> #include <etk/math/Vector2D.h>
@ -122,7 +120,6 @@ namespace gale {
*/ */
void reload(); void reload();
}; };
}; }
}; }
#endif

View File

@ -143,17 +143,17 @@ def create(target, module_name):
if target.name=="Linux": if target.name=="Linux":
# todo : my_module.add_module_depend(['egami']) # todo : my_module.add_module_depend(['egami'])
my_module.add_export_flag('link', '-lGL') my_module.add_export_flag('link-lib', 'GL')
#`pkg-config --cflags directfb` `pkg-config --libs directfb` #`pkg-config --cflags directfb` `pkg-config --libs directfb`
#ifeq ("$(CONFIG___GALE_LINUX_GUI_MODE_X11__)","y") #ifeq ("$(CONFIG___GALE_LINUX_GUI_MODE_X11__)","y")
my_module.add_export_flag('link', '-lX11') my_module.add_export_flag('link-lib', 'X11')
#endif #endif
#ifeq ("$(CONFIG___GALE_LINUX_GUI_MODE_DIRECT_FB__)","y") #ifeq ("$(CONFIG___GALE_LINUX_GUI_MODE_DIRECT_FB__)","y")
#my_module.add_export_flag('link', ['-L/usr/local/lib', '-ldirectfb', '-lfusion', '-ldirect']) #my_module.add_export_flag('link', ['-L/usr/local/lib', '-ldirectfb', '-lfusion', '-ldirect'])
#endif #endif
elif target.name=="Android": elif target.name=="Android":
my_module.add_module_depend(["SDK", "jvm-basics"]) my_module.add_module_depend(["SDK", "jvm-basics"])
my_module.add_export_flag('link', "-lGLESv2") my_module.add_export_flag('link-lib', "GLESv2")
# add tre creator of the basic java class ... # add tre creator of the basic java class ...
target.add_action("BINARY", 50, "gale-auto-wrapper", tool_generate_main_java_class) target.add_action("BINARY", 50, "gale-auto-wrapper", tool_generate_main_java_class)
# TODO : Add the same for BINARY to create a console interface ? # TODO : Add the same for BINARY to create a console interface ?