enlightenment
/
eflxx
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

includes 

SVN revision: 65919
This commit is contained in:
Andreas Volz 2011-12-05 20:59:52 +00:00
parent a4078829c8
commit f06b476347
4 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eflxx/include/eflxx/Common.h
View File

@ -1,21 +1,19 @@
#ifndef EFL_COMMON_H #ifndef EFL_COMMON_H
#define EFL_COMMON_H #define EFL_COMMON_H
#ifdef HAVE_CONFIG_H // local
#include <config.h>
#endif
#include "System.h" #include "System.h"
#include "DebugInternal.h" #include "DebugInternal.h"
// SIGC
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <iostream>
// STD
#include <istd::ostream>
/* EFL */ /* EFL */
#include <Evas.h> #include <Evas.h>
using std::ostream;
using std::istream;
namespace Eflxx { namespace Eflxx {
typedef sigc::signal<void> Signal; typedef sigc::signal<void> Signal;
@ -136,19 +134,19 @@ class Color
int _a; int _a;
}; };
inline ostream& operator<<( ostream& s, const Color& color ) inline std::ostream& operator<<( ostream& s, const Color& color )
{ {
return s << "(RGBA " << color.red() << "," << color.green() << "," << color.blue() << "," << color.alpha() << ")"; return s << "(RGBA " << color.red() << "," << color.green() << "," << color.blue() << "," << color.alpha() << ")";
} }
inline ostream& operator<<( ostream& s, const Point& point ) inline std::ostream& operator<<( ostream& s, const Point& point )
{ {
return s << "(" << point.x() << "," << point.y() << ")"; return s << "(" << point.x() << "," << point.y() << ")";
} }
inline ostream& operator<<( ostream& s, const Size& size ) inline std::ostream& operator<<( ostream& s, const Size& size )
{ {
return s << "(" << size.width() << "*" << size.height() << ")"; return s << "(" << size.width() << "*" << size.height() << ")";
} }
inline ostream& operator<<( ostream& s, const Rect& rect ) inline std::ostream& operator<<( ostream& s, const Rect& rect )
{ {
return s << "(" << rect.x() << "," << rect.y() << "*" << rect.width() << "," << rect.height() << ")"; return s << "(" << rect.x() << "," << rect.y() << "*" << rect.width() << "," << rect.height() << ")";
} }

4
eflxx/include/eflxx/Debug.h
View File

@ -1,10 +1,6 @@
#ifndef EFL_DEBUG_H #ifndef EFL_DEBUG_H
#define EFL_DEBUG_H #define EFL_DEBUG_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef CWDEBUG #ifdef CWDEBUG
#include <libcwd/libraries_debug.h> #include <libcwd/libraries_debug.h>

4
eflxx/include/eflxx/DebugInternal.h
View File

@ -1,10 +1,6 @@
#ifndef EFL_DEBUG_INTERNAL_H #ifndef EFL_DEBUG_INTERNAL_H
#define EFL_DEBUG_INTERNAL_H #define EFL_DEBUG_INTERNAL_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifndef CWDEBUG #ifndef CWDEBUG
#include <iostream> // std::cerr #include <iostream> // std::cerr

4
eflxx/include/eflxx/System.h
View File

@ -1,9 +1,5 @@
#ifdef CWDEBUG #ifdef CWDEBUG
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif