atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] change log system

Browse Source 
Conflicts:
	external/ewolsa
This commit is contained in:
Edouard DUPIN 2014-04-30 22:18:00 +02:00
parent b3602ceb14
commit 281f3dfc84
53 changed files with 121 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/agg vendored

@ -1 +1 @@
Subproject commit db2626136bd35e974a24c64b1b50c4187de30bdf Subproject commit 8bf2d17b61989d8fbe01cbd1228147ab52e19d23

2
external/airtaudio vendored

@ -1 +1 @@
Subproject commit 9b55657ef1ce265f95321fc9468cd28b12a7bdfb Subproject commit 55e1d5db4b2c0ac979c4334bd1882f1a1f7c909a

2
external/eaudiofx vendored

@ -1 +1 @@
Subproject commit 5f94203fff63da9a37122f550e749d3d41e88ea4 Subproject commit 28982a1bbddc3d7362b6caac9df01ccb2c9f8c71

2
external/egami vendored

@ -1 +1 @@
Subproject commit 4c336334a8643fdfda6ab5b2627369cacf1fb487 Subproject commit 889807e0b9b88890a9c6734e054da5edf23e59d9

2
external/ege vendored

@ -1 +1 @@
Subproject commit 2b31c01fabad98b6cdfc842e9ff646f37534b9f0 Subproject commit 000bde321dedc1ab709589a5f4cf057fe7825a63

2
external/ejson vendored

@ -1 +1 @@
Subproject commit 989ced9c90865dda4b0d6d65a4cf7eef99d9a8c1 Subproject commit 86116be4dbcd8809b82a3bf607845c9bb4d5424b

2
external/esvg vendored

@ -1 +1 @@
Subproject commit 9229886513957a175637e84eadc0a4ffda7d8a14 Subproject commit 95215e438d27f4ee715a1bf33fa491d89cb98f15

2
external/etk vendored

@ -1 +1 @@
Subproject commit e730ba434e856046ca4c8c1c5c98b960ba482350 Subproject commit 7f2fe7980f48cab07077bce7e192f08fc7e7cf34

2
external/ewolsa vendored

@ -1 +1 @@
Subproject commit 34ac6fe9d201e995401b0fc8bdbb70fe3bd40970 Subproject commit 7bad0ec956e8bfd8eb06d8a55572bfe6012c2e44

2
external/exml vendored

@ -1 +1 @@
Subproject commit a231aa2305055f739ce2f81f3e4b9b631b5a0551 Subproject commit 92ea8abb9e66eee0be8fa1b70dc23ed4374615d6

2
monk

@ -1 +1 @@
Subproject commit 7654eea321b123e9af6b76f0d9e708e92d9448e4 Subproject commit aff1fdf89a04b8a4594c2742f875614e56cf8a31

4
sources/ewol/Dimension.cpp
View File

@ -264,7 +264,7 @@ vec2 ewol::Dimension::getFoot(void) const {
return ewol::Dimension::getMillimeter()*millimeterToFoot; return ewol::Dimension::getMillimeter()*millimeterToFoot;
} }
etk::CCout& ewol::operator <<(etk::CCout& _os, enum ewol::Dimension::distance _obj) { std::ostream& ewol::operator <<(std::ostream& _os, enum ewol::Dimension::distance _obj) {
switch(_obj) { switch(_obj) {
case ewol::Dimension::Pourcent: case ewol::Dimension::Pourcent:
_os << "%"; _os << "%";
@ -294,7 +294,7 @@ etk::CCout& ewol::operator <<(etk::CCout& _os, enum ewol::Dimension::distance _o
return _os; return _os;
} }
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::Dimension& _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const ewol::Dimension& _obj) {
_os << _obj.get(_obj.getType()) << _obj.getType(); _os << _obj.get(_obj.getType()) << _obj.getType();
return _os; return _os;
} }

4
sources/ewol/Dimension.h
View File

@ -204,8 +204,8 @@ namespace ewol {
static float getWindowsDiag(enum ewol::Dimension::distance _type); static float getWindowsDiag(enum ewol::Dimension::distance _type);
}; };
etk::CCout& operator <<(etk::CCout& _os, enum ewol::Dimension::distance _obj); std::ostream& operator <<(std::ostream& _os, enum ewol::Dimension::distance _obj);
etk::CCout& operator <<(etk::CCout& _os, const ewol::Dimension& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::Dimension& _obj);
}; };
#endif #endif

2
sources/ewol/Padding.cpp
View File

@ -8,7 +8,7 @@
#include <ewol/Padding.h> #include <ewol/Padding.h>
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::Padding& _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const ewol::Padding& _obj) {
_os << "{"; _os << "{";
_os << _obj.xLeft(); _os << _obj.xLeft();
_os << ","; _os << ",";

2
sources/ewol/Padding.h
View File

@ -80,7 +80,7 @@ namespace ewol {
} }
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::Padding& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::Padding& _obj);
}; };
#endif #endif

3
sources/ewol/context/ConfigFont.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_CONFIG_FONT_H__ #ifndef __EWOL_CONFIG_FONT_H__
#define __EWOL_CONFIG_FONT_H__ #define __EWOL_CONFIG_FONT_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/types.h>
namespace ewol { namespace ewol {
namespace context { namespace context {

17
sources/ewol/context/Context.cpp
View File

@ -312,26 +312,27 @@ ewol::Context::Context(int32_t _argc, const char* _argv[]) :
// parse the debug level: // parse the debug level:
for(int32_t iii = 0; iii < m_commandLine.size() ; ++iii) { for(int32_t iii = 0; iii < m_commandLine.size() ; ++iii) {
if (m_commandLine.get(iii) == "-l0") { if (m_commandLine.get(iii) == "-l0") {
debug::setGeneralLevel(etk::logLevelNone); etk::log::setLevel(etk::log::logLevelNone);
} else if (m_commandLine.get(iii) == "-l1") { } else if (m_commandLine.get(iii) == "-l1") {
debug::setGeneralLevel(etk::logLevelCritical); etk::log::setLevel(etk::log::logLevelCritical);
} else if (m_commandLine.get(iii) == "-l2") { } else if (m_commandLine.get(iii) == "-l2") {
debug::setGeneralLevel(etk::logLevelError); etk::log::setLevel(etk::log::logLevelError);
} else if (m_commandLine.get(iii) == "-l3") { } else if (m_commandLine.get(iii) == "-l3") {
debug::setGeneralLevel(etk::logLevelWarning); etk::log::setLevel(etk::log::logLevelWarning);
} else if (m_commandLine.get(iii) == "-l4") { } else if (m_commandLine.get(iii) == "-l4") {
debug::setGeneralLevel(etk::logLevelInfo); etk::log::setLevel(etk::log::logLevelInfo);
} else if (m_commandLine.get(iii) == "-l5") { } else if (m_commandLine.get(iii) == "-l5") {
debug::setGeneralLevel(etk::logLevelDebug); etk::log::setLevel(etk::log::logLevelDebug);
} else if( m_commandLine.get(iii) == "-l6" } else if( m_commandLine.get(iii) == "-l6"
|| m_commandLine.get(iii) == "-l7" || m_commandLine.get(iii) == "-l7"
|| m_commandLine.get(iii) == "-l8" || m_commandLine.get(iii) == "-l8"
|| m_commandLine.get(iii) == "-l9") { || m_commandLine.get(iii) == "-l9") {
debug::setGeneralLevel(etk::logLevelVerbose); etk::log::setLevel(etk::log::logLevelVerbose);
} else if (m_commandLine.get(iii) == "-fps") { } else if (m_commandLine.get(iii) == "-fps") {
m_displayFps=true; m_displayFps=true;
} else if (m_commandLine.get(iii) == "--dbg-file") { } else if (m_commandLine.get(iii) == "--dbg-file") {
etk::cout.setOutputFile(true); // TODO : Set it back ...
//etk::cout.setOutputFile(true);
} else { } else {
continue; continue;
} }

2
sources/ewol/context/Context.h
View File

@ -9,8 +9,8 @@
#ifndef __EWOL_CONTEXT_H__ #ifndef __EWOL_CONTEXT_H__
#define __EWOL_CONTEXT_H__ #define __EWOL_CONTEXT_H__
#include <etk/types.h>
#include <etk/os/Fifo.h> #include <etk/os/Fifo.h>
#include <ewol/debug.h>
#include <ewol/ewol.h> #include <ewol/ewol.h>
#include <ewol/key/key.h> #include <ewol/key/key.h>
#include <ewol/object/Manager.h> #include <ewol/object/Manager.h>

4
sources/ewol/context/X11/Context.cpp
View File

@ -451,7 +451,7 @@ class X11Interface : public ewol::Context {
//EWOL_DEBUG("X11 event : " << event.type << " = \"EnterNotify\" (" << (float)event.xcrossing.x << "," << (float)event.xcrossing.y << ")"); //EWOL_DEBUG("X11 event : " << event.type << " = \"EnterNotify\" (" << (float)event.xcrossing.x << "," << (float)event.xcrossing.y << ")");
//gui_uniqueWindows->GenEventInput(0, ewol::EVENT_INPUT_TYPE_ENTER, (float)event.xcrossing.x, (float)event.xcrossing.y); //gui_uniqueWindows->GenEventInput(0, ewol::EVENT_INPUT_TYPE_ENTER, (float)event.xcrossing.x, (float)event.xcrossing.y);
m_curentGrabDelta -= vec2(m_originX, -m_originY); m_curentGrabDelta -= vec2(m_originX, -m_originY);
EWOL_DEBUG("change grab delta of : " << vec2(m_originX, m_originY) ); EWOL_VERBOSE("change grab delta of : " << vec2(m_originX, m_originY) );
break; break;
case LeaveNotify: case LeaveNotify:
X11_INFO("X11 event LeaveNotify"); X11_INFO("X11 event LeaveNotify");
@ -459,7 +459,7 @@ class X11Interface : public ewol::Context {
m_cursorEventY = (m_currentHeight-event.xcrossing.y); m_cursorEventY = (m_currentHeight-event.xcrossing.y);
//EWOL_DEBUG("X11 event : " << event.type << " = \"LeaveNotify\" (" << (float)event.xcrossing.x << "," << (float)event.xcrossing.y << ")"); //EWOL_DEBUG("X11 event : " << event.type << " = \"LeaveNotify\" (" << (float)event.xcrossing.x << "," << (float)event.xcrossing.y << ")");
m_curentGrabDelta += vec2(m_originX, -m_originY); m_curentGrabDelta += vec2(m_originX, -m_originY);
EWOL_DEBUG("change grab delta of : " << vec2(m_originX, m_originY) ); EWOL_VERBOSE("change grab delta of : " << vec2(m_originX, m_originY) );
break; break;
case MotionNotify: case MotionNotify:
X11_INFO("X11 event MotionNotify"); X11_INFO("X11 event MotionNotify");

2
sources/ewol/context/clipBoard.cpp
View File

@ -41,7 +41,7 @@ static const char* clipboardDescriptionString[ewol::context::clipBoard::clipboar
"clipboardCount" "clipboardCount"
}; };
etk::CCout& ewol::operator <<(etk::CCout& _os, const enum ewol::context::clipBoard::clipboardListe _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const enum ewol::context::clipBoard::clipboardListe _obj) {
if (_obj >= 0 && _obj <ewol::context::clipBoard::clipboardCount) { if (_obj >= 0 && _obj <ewol::context::clipBoard::clipboardCount) {
_os << clipboardDescriptionString[_obj]; _os << clipboardDescriptionString[_obj];
} else { } else {

3
sources/ewol/context/clipBoard.h
View File

@ -10,7 +10,6 @@
#define __EWOL_CLIPBOARD_H__ #define __EWOL_CLIPBOARD_H__
#include <ewol/debug.h> #include <ewol/debug.h>
#include <etk/types.h>
// TODO : Remove this ... ==> set it in the context .... // TODO : Remove this ... ==> set it in the context ....
namespace ewol { namespace ewol {
@ -77,7 +76,7 @@ namespace ewol {
/** /**
* @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
*/ */
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::context::clipBoard::clipboardListe _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::context::clipBoard::clipboardListe _obj);
}; };
#endif #endif

3
sources/ewol/context/commandLine.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_COMMAND_LINE_H__ #ifndef __EWOL_COMMAND_LINE_H__
#define __EWOL_COMMAND_LINE_H__ #define __EWOL_COMMAND_LINE_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/types.h>
namespace ewol { namespace ewol {
namespace context { namespace context {

2
sources/ewol/context/cursor.cpp
View File

@ -33,7 +33,7 @@ static const char* cursorDescriptionString[ewol::context::cursorCount+1] = {
"cursorCount" "cursorCount"
}; };
etk::CCout& ewol::operator <<(etk::CCout& _os, const enum ewol::context::cursorDisplay _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const enum ewol::context::cursorDisplay _obj) {
if (_obj >= 0 && _obj <ewol::context::cursorCount) { if (_obj >= 0 && _obj <ewol::context::cursorCount) {
_os << cursorDescriptionString[_obj]; _os << cursorDescriptionString[_obj];
} else { } else {

6
sources/ewol/context/cursor.h
View File

@ -9,8 +9,8 @@
#ifndef __EWOL_CURSOR_H__ #ifndef __EWOL_CURSOR_H__
#define __EWOL_CURSOR_H__ #define __EWOL_CURSOR_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
namespace ewol { namespace ewol {
namespace context { namespace context {
enum cursorDisplay { enum cursorDisplay {
@ -42,7 +42,7 @@ namespace ewol {
/** /**
* @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
*/ */
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::context::cursorDisplay _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::context::cursorDisplay _obj);
}; };
#endif #endif

5
sources/ewol/debug.cpp
View File

@ -8,4 +8,7 @@
#include <ewol/debug.h> #include <ewol/debug.h>
const char * g_ewolLibName = "ewol "; int32_t ewol::getLogId(void) {
static int32_t g_val = etk::log::registerInstance("ewol");
return g_val;
}

48
sources/ewol/debug.h
View File

@ -9,20 +9,44 @@
#ifndef __EWOL_DEBUG_H__ #ifndef __EWOL_DEBUG_H__
#define __EWOL_DEBUG_H__ #define __EWOL_DEBUG_H__
#include <etk/types.h> #include <etk/log.h>
#include <etk/debugGeneric.h>
extern const char * g_ewolLibName; namespace ewol {
int32_t getLogId(void);
};
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define EWOL_BASE(info,data) \
do { \
if (info <= etk::log::getLevel(ewol::getLogId())) { \
std::stringbuf sb; \
std::ostream tmpStream(&sb); \
tmpStream << data; \
etk::log::logStream(ewol::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \
} \
} while(0)
#define EWOL_CRITICAL(data) ETK_CRITICAL(g_ewolLibName, data) #define EWOL_CRITICAL(data) EWOL_BASE(1, data)
#define EWOL_WARNING(data) ETK_WARNING(g_ewolLibName, data) #define EWOL_ERROR(data) EWOL_BASE(2, data)
#define EWOL_ERROR(data) ETK_ERROR(g_ewolLibName, data) #define EWOL_WARNING(data) EWOL_BASE(3, data)
#define EWOL_INFO(data) ETK_INFO(g_ewolLibName, data) #ifdef DEBUG
#define EWOL_DEBUG(data) ETK_DEBUG(g_ewolLibName, data) #define EWOL_INFO(data) EWOL_BASE(4, data)
#define EWOL_VERBOSE(data) ETK_VERBOSE(g_ewolLibName, data) #define EWOL_DEBUG(data) EWOL_BASE(5, data)
#define EWOL_ASSERT(cond, data) ETK_ASSERT(g_ewolLibName, cond, data) #define EWOL_VERBOSE(data) EWOL_BASE(6, data)
#define EWOL_CHECK_INOUT(cond) ETK_CHECK_INOUT(g_ewolLibName, cond) #define EWOL_TODO(data) EWOL_BASE(4, "TODO : " << data)
#define EWOL_TODO(cond) ETK_TODO(g_ewolLibName, cond) #else
#define EWOL_INFO(data) do { } while(false)
#define EWOL_DEBUG(data) do { } while(false)
#define EWOL_VERBOSE(data) do { } while(false)
#define EWOL_TODO(data) do { } while(false)
#endif
#define EWOL_ASSERT(cond,data) \
do { \
if (!(cond)) { \
EWOL_CRITICAL(data); \
assert(!#cond); \
} \
} while (0)
#endif #endif

4
sources/ewol/event/Entry.cpp
View File

@ -11,7 +11,7 @@
#undef __class__ #undef __class__
#define __class__ "event::Entry" #define __class__ "event::Entry"
etk::CCout& ewol::event::operator <<(etk::CCout& _os, const ewol::event::Entry& _obj) { std::ostream& ewol::event::operator <<(std::ostream& _os, const ewol::event::Entry& _obj) {
_os << "{type=" << _obj.getType(); _os << "{type=" << _obj.getType();
_os << " status=" << _obj.getStatus(); _os << " status=" << _obj.getStatus();
if (_obj.getType() == ewol::key::keyboardChar) { if (_obj.getType() == ewol::key::keyboardChar) {
@ -21,7 +21,7 @@ etk::CCout& ewol::event::operator <<(etk::CCout& _os, const ewol::event::Entry&
return _os; return _os;
} }
etk::CCout& ewol::event::operator <<(etk::CCout& _os, const ewol::event::EntrySystem& _obj) { std::ostream& ewol::event::operator <<(std::ostream& _os, const ewol::event::EntrySystem& _obj) {
_os << _obj.m_event; _os << _obj.m_event;
return _os; return _os;
} }

4
sources/ewol/event/Entry.h
View File

@ -56,7 +56,7 @@ namespace ewol {
return m_unicodeData; return m_unicodeData;
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::event::Entry& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::event::Entry& _obj);
class EntrySystem { class EntrySystem {
public: public:
@ -69,7 +69,7 @@ namespace ewol {
}; };
ewol::event::Entry m_event; ewol::event::Entry m_event;
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::event::EntrySystem& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::event::EntrySystem& _obj);
}; };
}; };

4
sources/ewol/event/Input.cpp
View File

@ -11,7 +11,7 @@
#undef __class__ #undef __class__
#define __class__ "event::Input" #define __class__ "event::Input"
etk::CCout& ewol::event::operator <<(etk::CCout& _os, const ewol::event::Input& _obj) { std::ostream& ewol::event::operator <<(std::ostream& _os, const ewol::event::Input& _obj) {
_os << "{type=" << _obj.getType(); _os << "{type=" << _obj.getType();
_os << " status=" << _obj.getStatus(); _os << " status=" << _obj.getStatus();
_os << " id=" << _obj.getId(); _os << " id=" << _obj.getId();
@ -20,7 +20,7 @@ etk::CCout& ewol::event::operator <<(etk::CCout& _os, const ewol::event::Input&
return _os; return _os;
} }
etk::CCout& ewol::event::operator <<(etk::CCout& _os, const ewol::event::InputSystem& _obj) { std::ostream& ewol::event::operator <<(std::ostream& _os, const ewol::event::InputSystem& _obj) {
_os << _obj.m_event; _os << _obj.m_event;
return _os; return _os;
} }

4
sources/ewol/event/Input.h
View File

@ -70,7 +70,7 @@ namespace ewol {
// TODO : Call the entry element ant rest it ... // TODO : Call the entry element ant rest it ...
} }
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::event::Input& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::event::Input& _obj);
class InputSystem { class InputSystem {
public: public:
@ -102,7 +102,7 @@ namespace ewol {
return m_realIdEvent; return m_realIdEvent;
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::event::InputSystem& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::event::InputSystem& _obj);
}; };
}; };

2
sources/ewol/event/Time.cpp
View File

@ -11,7 +11,7 @@
#undef __class__ #undef __class__
#define __class__ "event::Time" #define __class__ "event::Time"
etk::CCout& ewol::event::operator <<(etk::CCout& _os, const ewol::event::Time& _obj) { std::ostream& ewol::event::operator <<(std::ostream& _os, const ewol::event::Time& _obj) {
_os << "{time=" << _obj.getTime(); _os << "{time=" << _obj.getTime();
_os << " uptime=" << _obj.getApplUpTime(); _os << " uptime=" << _obj.getApplUpTime();
_os << " delta=" << _obj.getDelta(); _os << " delta=" << _obj.getDelta();

2
sources/ewol/event/Time.h
View File

@ -59,7 +59,7 @@ namespace ewol {
return m_timeDeltaCall; return m_timeDeltaCall;
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::event::Time& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::event::Time& _obj);
}; };
}; };

2
sources/ewol/key/Special.cpp
View File

@ -201,7 +201,7 @@ void ewol::key::Special::setInsert(bool _value) {
} }
} }
etk::CCout& ewol::key::operator <<(etk::CCout& _os, const ewol::key::Special _obj) { std::ostream& ewol::key::operator <<(std::ostream& _os, const ewol::key::Special _obj) {
_os << " capLock=" << _obj.getCapsLock(); _os << " capLock=" << _obj.getCapsLock();
_os << " shift=" << _obj.getShift(); _os << " shift=" << _obj.getShift();
_os << " ctrl=" << _obj.getCtrl(); _os << " ctrl=" << _obj.getCtrl();

5
sources/ewol/key/Special.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_KEY_SPECIAL_H__ #ifndef __EWOL_KEY_SPECIAL_H__
#define __EWOL_KEY_SPECIAL_H__ #define __EWOL_KEY_SPECIAL_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
#include <ewol/key/keyboard.h> #include <ewol/key/keyboard.h>
namespace ewol { namespace ewol {
@ -113,7 +112,7 @@ namespace ewol {
*/ */
void update(enum ewol::key::keyboard _move, bool _isDown); void update(enum ewol::key::keyboard _move, bool _isDown);
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::key::Special _obj); std::ostream& operator <<(std::ostream& _os, const ewol::key::Special _obj);
}; };
}; };

4
sources/ewol/key/keyboard.cpp
View File

@ -49,7 +49,7 @@ static const char* keyboardDescriptionString[ewol::key::keyboardCount+1] = {
"keyboardCount" "keyboardCount"
}; };
etk::CCout& ewol::key::operator <<(etk::CCout& _os, const enum ewol::key::keyboard _obj) { std::ostream& ewol::key::operator <<(std::ostream& _os, const enum ewol::key::keyboard _obj) {
if (_obj >= 0 && _obj <ewol::key::keyboardCount) { if (_obj >= 0 && _obj <ewol::key::keyboardCount) {
_os << keyboardDescriptionString[_obj]; _os << keyboardDescriptionString[_obj];
} else { } else {
@ -70,7 +70,7 @@ static const char* keyboardSystemDescriptionString[ewol::key::keyboardSystemCoun
"keyboardSystemCount" "keyboardSystemCount"
}; };
etk::CCout& ewol::key::operator <<(etk::CCout& _os, const enum ewol::key::keyboardSystem _obj) { std::ostream& ewol::key::operator <<(std::ostream& _os, const enum ewol::key::keyboardSystem _obj) {
if (_obj >= 0 && _obj <ewol::key::keyboardSystemCount) { if (_obj >= 0 && _obj <ewol::key::keyboardSystemCount) {
_os << keyboardSystemDescriptionString[_obj]; _os << keyboardSystemDescriptionString[_obj];
} else { } else {

7
sources/ewol/key/keyboard.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_KEY_KEYBOARD_H__ #ifndef __EWOL_KEY_KEYBOARD_H__
#define __EWOL_KEY_KEYBOARD_H__ #define __EWOL_KEY_KEYBOARD_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
namespace ewol { namespace ewol {
namespace key { namespace key {
@ -61,7 +60,7 @@ namespace ewol {
/** /**
* @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
*/ */
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::key::keyboard _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::key::keyboard _obj);
enum keyboardSystem { enum keyboardSystem {
keyboardSystemUnknow = 0, //!< Unknown keyboard system key keyboardSystemUnknow = 0, //!< Unknown keyboard system key
@ -74,7 +73,7 @@ namespace ewol {
keyboardSystemBack, //!< Hardware Back key keyboardSystemBack, //!< Hardware Back key
keyboardSystemCount //!< number of posible System key keyboardSystemCount //!< number of posible System key
}; };
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::key::keyboardSystem _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::key::keyboardSystem _obj);
}; };
}; };

2
sources/ewol/key/status.cpp
View File

@ -26,7 +26,7 @@ static const char* statusDescriptionString[ewol::key::statusCount+1] = {
"statusCount" "statusCount"
}; };
etk::CCout& ewol::key::operator <<(etk::CCout& _os, const enum ewol::key::status _obj) { std::ostream& ewol::key::operator <<(std::ostream& _os, const enum ewol::key::status _obj) {
if (_obj >= 0 && _obj <ewol::key::statusCount) { if (_obj >= 0 && _obj <ewol::key::statusCount) {
_os << statusDescriptionString[_obj]; _os << statusDescriptionString[_obj];
} else { } else {

5
sources/ewol/key/status.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_KEY_STATUS_H__ #ifndef __EWOL_KEY_STATUS_H__
#define __EWOL_KEY_STATUS_H__ #define __EWOL_KEY_STATUS_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
namespace ewol { namespace ewol {
namespace key { namespace key {
@ -37,7 +36,7 @@ namespace ewol {
/** /**
* @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
*/ */
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::key::status _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::key::status _obj);
}; };
}; };

2
sources/ewol/key/type.cpp
View File

@ -17,7 +17,7 @@ static const char* typeDescriptionString[ewol::key::typeCount+1] = {
"typeCount" "typeCount"
}; };
etk::CCout& ewol::operator <<(etk::CCout& _os, const enum ewol::key::type _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const enum ewol::key::type _obj) {
if (_obj >= 0 && _obj < ewol::key::typeCount) { if (_obj >= 0 && _obj < ewol::key::typeCount) {
_os << typeDescriptionString[_obj]; _os << typeDescriptionString[_obj];
} else { } else {

5
sources/ewol/key/type.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_KEY_TYPE_H__ #ifndef __EWOL_KEY_TYPE_H__
#define __EWOL_KEY_TYPE_H__ #define __EWOL_KEY_TYPE_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
namespace ewol { namespace ewol {
namespace key { namespace key {
@ -28,7 +27,7 @@ namespace ewol {
/** /**
* @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
*/ */
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::key::type _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::key::type _obj);
}; };

2
sources/ewol/object/Config.cpp
View File

@ -13,7 +13,7 @@
#undef __class__ #undef __class__
#define __class__ "object::Config" #define __class__ "object::Config"
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::object::Config& _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const ewol::object::Config& _obj) {
_os << "{"; _os << "{";
_os << "config=\"" << _obj.getConfig() << "\""; _os << "config=\"" << _obj.getConfig() << "\"";
_os << " data=\"" << _obj.getData() << "\"}"; _os << " data=\"" << _obj.getData() << "\"}";

5
sources/ewol/object/Config.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_OBJECT_CONFIG_H__ #ifndef __EWOL_OBJECT_CONFIG_H__
#define __EWOL_OBJECT_CONFIG_H__ #define __EWOL_OBJECT_CONFIG_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
namespace ewol { namespace ewol {
namespace object { namespace object {
@ -39,7 +38,7 @@ namespace ewol {
}; };
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::object::Config& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::object::Config& _obj);
}; };

2
sources/ewol/object/ConfigElement.cpp
View File

@ -11,7 +11,7 @@
#undef __class__ #undef __class__
#define __class__ "object::ConfigElement" #define __class__ "object::ConfigElement"
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::object::ConfigElement& _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const ewol::object::ConfigElement& _obj) {
_os << "{"; _os << "{";
if (NULL != _obj.getConfig()) { if (NULL != _obj.getConfig()) {
_os << "config=\"" << _obj.getConfig() << "\""; _os << "config=\"" << _obj.getConfig() << "\"";

5
sources/ewol/object/ConfigElement.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_OBJECT_CONFIG_ELEMENT_H__ #ifndef __EWOL_OBJECT_CONFIG_ELEMENT_H__
#define __EWOL_OBJECT_CONFIG_ELEMENT_H__ #define __EWOL_OBJECT_CONFIG_ELEMENT_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
namespace ewol { namespace ewol {
namespace object { namespace object {
@ -52,7 +51,7 @@ namespace ewol {
}; };
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::object::ConfigElement& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::object::ConfigElement& _obj);
}; };

2
sources/ewol/object/Message.cpp
View File

@ -11,7 +11,7 @@
#undef __class__ #undef __class__
#define __class__ "object/Message" #define __class__ "object/Message"
etk::CCout& ewol::object::operator <<(etk::CCout& _os, const ewol::object::Message& _obj) { std::ostream& ewol::object::operator <<(std::ostream& _os, const ewol::object::Message& _obj) {
_os << "{"; _os << "{";
if (NULL != _obj.getMessage()) { if (NULL != _obj.getMessage()) {
_os << "msg=\"" << _obj.getMessage() << "\""; _os << "msg=\"" << _obj.getMessage() << "\"";

5
sources/ewol/object/Message.h
View File

@ -9,8 +9,7 @@
#ifndef __EWOL_OBJECT_MESSAGE_H__ #ifndef __EWOL_OBJECT_MESSAGE_H__
#define __EWOL_OBJECT_MESSAGE_H__ #define __EWOL_OBJECT_MESSAGE_H__
#include <etk/types.h> #include <ewol/debug.h>
#include <etk/Stream.h>
namespace ewol { namespace ewol {
namespace object { namespace object {
@ -47,7 +46,7 @@ namespace ewol {
return m_data; return m_data;
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::object::Message& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::object::Message& _obj);
}; };
}; };

1
sources/ewol/openGL/openGL.cpp
View File

@ -9,6 +9,7 @@
#include <vector> #include <vector>
#include <ewol/debug.h> #include <ewol/debug.h>
#include <ewol/openGL/openGL.h> #include <ewol/openGL/openGL.h>
#include <etk/os/Mutex.h>
/** /**
* @brief get the draw mutex (ewol render). * @brief get the draw mutex (ewol render).

6
sources/ewol/resource/TexturedFont.cpp
View File

@ -18,7 +18,7 @@
#include <ewol/context/Context.h> #include <ewol/context/Context.h>
etk::CCout& ewol::operator <<(etk::CCout& _os, enum ewol::font::mode _obj) { std::ostream& ewol::operator <<(std::ostream& _os, enum ewol::font::mode _obj) {
switch(_obj) { switch(_obj) {
default : default :
_os << "error"; _os << "error";
@ -344,7 +344,7 @@ ewol::GlyphProperty* ewol::resource::TexturedFont::getGlyphPointer(const char32_
} }
ewol::resource::TexturedFont* ewol::resource::TexturedFont::keep(const std::string& _filename) { ewol::resource::TexturedFont* ewol::resource::TexturedFont::keep(const std::string& _filename) {
EWOL_INFO("KEEP : TexturedFont : file : '" << _filename << "'"); EWOL_VERBOSE("KEEP : TexturedFont : file : '" << _filename << "'");
ewol::resource::TexturedFont* object = NULL; ewol::resource::TexturedFont* object = NULL;
ewol::Resource* object2 = getManager().localKeep(_filename); ewol::Resource* object2 = getManager().localKeep(_filename);
if (NULL != object2) { if (NULL != object2) {
@ -372,7 +372,7 @@ void ewol::resource::TexturedFont::release(ewol::resource::TexturedFont*& _objec
if (NULL == _object) { if (NULL == _object) {
return; return;
} }
EWOL_INFO("RELEASE: TexturedFont : file : '" << _object->getName() << "' count=" << _object->getCounter()); EWOL_VERBOSE("RELEASE: TexturedFont : file : '" << _object->getName() << "' count=" << _object->getCounter());
std::string name = _object->getName(); std::string name = _object->getName();
int32_t count = _object->getCounter() - 1; int32_t count = _object->getCounter() - 1;
ewol::Resource* object2 = static_cast<ewol::Resource*>(_object); ewol::Resource* object2 = static_cast<ewol::Resource*>(_object);

2
sources/ewol/resource/TexturedFont.h
View File

@ -25,7 +25,7 @@ namespace ewol {
BoldItalic, BoldItalic,
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, enum ewol::font::mode _obj); std::ostream& operator <<(std::ostream& _os, enum ewol::font::mode _obj);
namespace resource { namespace resource {
class TexturedFont : public ewol::resource::Texture { class TexturedFont : public ewol::resource::Texture {

2
sources/ewol/widget/WSlider.cpp
View File

@ -15,7 +15,7 @@ static const char* l_listsladingMode[ewol::widget::WSlider::sladingTransition_co
"transition horisantal" "transition horisantal"
}; };
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::widget::WSlider::sladingMode _obj) { std::ostream& operator <<(std::ostream& _os, const enum ewol::widget::WSlider::sladingMode _obj) {
_os << l_listsladingMode[_obj]; _os << l_listsladingMode[_obj];
return _os; return _os;
} }

2
sources/ewol/widget/WSlider.h
View File

@ -106,7 +106,7 @@ namespace ewol {
virtual bool onGetConfig(const char* _config, std::string& _result) const; virtual bool onGetConfig(const char* _config, std::string& _result) const;
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::widget::WSlider::sladingMode _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::widget::WSlider::sladingMode _obj);
}; };
#endif #endif

4
sources/ewol/widget/Widget.cpp
View File

@ -16,7 +16,7 @@
#undef __class__ #undef __class__
#define __class__ "DrawProperty" #define __class__ "DrawProperty"
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::DrawProperty& _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const ewol::DrawProperty& _obj) {
_os << "{ windowsSize=" << _obj.m_windowsSize << " start=" << _obj.m_origin << " stop=" << (_obj.m_origin+_obj.m_size) << "}"; _os << "{ windowsSize=" << _obj.m_windowsSize << " start=" << _obj.m_origin << " stop=" << (_obj.m_origin+_obj.m_size) << "}";
return _os; return _os;
} }
@ -78,7 +78,7 @@ enum ewol::gravity ewol::stringToGravity(const std::string& _obj) {
return ewol::gravityCenter; return ewol::gravityCenter;
} }
etk::CCout& ewol::operator <<(etk::CCout& _os, const enum ewol::gravity _obj) { std::ostream& ewol::operator <<(std::ostream& _os, const enum ewol::gravity _obj) {
_os << ewol::gravityToString(_obj); _os << ewol::gravityToString(_obj);
return _os; return _os;
} }

4
sources/ewol/widget/Widget.h
View File

@ -67,7 +67,7 @@ namespace ewol {
ivec2 m_size; //!< Windows clipping upper widget (can not be <0 and >m_windowsSize) ivec2 m_size; //!< Windows clipping upper widget (can not be <0 and >m_windowsSize)
void limit(const vec2& _origin, const vec2& _size); void limit(const vec2& _origin, const vec2& _size);
}; };
etk::CCout& operator <<(etk::CCout& _os, const ewol::DrawProperty& _obj); std::ostream& operator <<(std::ostream& _os, const ewol::DrawProperty& _obj);
/** /**
* @brief Gravity of the widget property * @brief Gravity of the widget property
* @not-in-doc * @not-in-doc
@ -83,7 +83,7 @@ namespace ewol {
gravityButtomLeft=0x0C, gravityButtomLeft=0x0C,
gravityLeft=0x08, gravityLeft=0x08,
}; };
etk::CCout& operator <<(etk::CCout& _os, const enum ewol::gravity _obj); std::ostream& operator <<(std::ostream& _os, const enum ewol::gravity _obj);
std::string gravityToString(const enum ewol::gravity _obj); std::string gravityToString(const enum ewol::gravity _obj);
enum ewol::gravity stringToGravity(const std::string& _obj); enum ewol::gravity stringToGravity(const std::string& _obj);
/** /**