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

renamed EvasEdje to EdjeObject 

SVN revision: 43625
This commit is contained in:
Andreas Volz 2009-11-11 21:53:46 +00:00
parent 6f2b2df20a
commit 5176c30c6f
9 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
edjexx/README
View File

@ -1,3 +1,2 @@
TODO
-----
rename EvasEdje to EdjeObject

24
edjexx/include/edjexx/EvasEdje.h → edjexx/include/edjexx/EdjeObject.h
View File

@ -22,14 +22,14 @@ namespace efl {
typedef sigc::signal<void, const char*, const char*> EdjeSignalSignal;
typedef sigc::slot2<void, const char*, const char*> EdjeSignalSlot;
class EvasEdje : public EvasObject
class EdjeObject : public EvasObject
{
public:
EvasEdje( EvasCanvas &canvas );
EvasEdje( EvasCanvas &canvas, const std::string &filename, const std::string &groupname );
EvasEdje( EvasCanvas &canvas, const Point &pos, const std::string &filename, const std::string &groupname );
EdjeObject( EvasCanvas &canvas );
EdjeObject( EvasCanvas &canvas, const std::string &filename, const std::string &groupname );
EdjeObject( EvasCanvas &canvas, const Point &pos, const std::string &filename, const std::string &groupname );
~EvasEdje();
~EdjeObject();
/*
EAPI void edje_object_signal_callback_add (Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *obj, const char *emission, const char *source), void *data);
@ -74,7 +74,7 @@ public:
CountedPtr <EdjePart> operator[]( const std::string &partname );
/*!
* @param partname Access a EdjePart in the EvasEdje.
* @param partname Access a EdjePart in the EdjeObject.
* @throw EdjePartNotExistingException
*/
CountedPtr <EdjePart> getPart( const std::string &partname );
@ -83,20 +83,20 @@ public:
void connect( const std::string &emission, const std::string &source, const EdjeSignalSlot& slot );
void emit( const std::string &emission, const std::string &source );
static EvasEdje *wrap( Evas_Object* o );
static EdjeObject *wrap( Evas_Object* o );
private:
// TODO: wrap Edje_Message_Type to avoid include of C header
static void _edje_message_handler_callback( void* data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg );
static void _edje_signal_handler_callback( void *data, Evas_Object *obj, const char *emission, const char *source );
EvasEdje();
EvasEdje( const EvasEdje& );
EdjeObject();
EdjeObject( const EdjeObject& );
EvasEdje( Evas_Object* object );
EdjeObject( Evas_Object* object );
bool operator=( const EvasEdje& );
bool operator==( const EvasEdje& );
bool operator=( const EdjeObject& );
bool operator==( const EdjeObject& );
};

8
edjexx/include/edjexx/EdjePart.h
View File

@ -14,14 +14,14 @@ using std::string;
namespace efl {
class EvasEdje;
class EdjeObject;
class EdjePart
{
friend class EvasEdje;
friend class EdjeObject;
private:
EdjePart( EvasEdje* parent, const std::string &partname );
EdjePart( EdjeObject* parent, const std::string &partname );
public:
~EdjePart();
@ -39,7 +39,7 @@ public:
//const EvasObject* getObject ( const char* name );
private:
EvasEdje* _parent;
EdjeObject* _parent;
const std::string &_partname;
/* State?

2
edjexx/include/edjexx/Edjexx.h
View File

@ -10,7 +10,7 @@
#include "EdjeBase.h"
#include "EdjeExceptions.h"
#include "EdjePart.h"
#include "EvasEdje.h"
#include "EdjeObject.h"
#endif // EDJEXX_H

2
edjexx/include/edjexx/Makefile.am
View File

@ -2,7 +2,7 @@
libedjexx_HEADERS = \
EdjeBase.h \
EdjePart.h \
EvasEdje.h \
EdjeObject.h \
EdjeExceptions.h \
Edjexx.h

4
edjexx/src/EdjeExceptions.cpp
View File

@ -9,7 +9,7 @@ namespace efl {
const char* EdjeLoadException::what () const throw ()
{
static std::ostringstream os;
os << "EvasEdje file load error: filename: '"
os << "EdjeObject file load error: filename: '"
<< mFilename
<< "' groupname: '"
<< mGroupname
@ -22,7 +22,7 @@ const char* EdjeLoadException::what () const throw ()
const char* EdjePartNotExistingException::what () const throw ()
{
std::ostringstream os;
os << "EvasEdje loaded with not existing part '";
os << "EdjeObject loaded with not existing part '";
os << txt.c_str (); // TODO: why is c_str() needed! -> rework Exception concept!
os << "'.";
return static_cast <const char*> (os.str ().c_str ());

44
edjexx/src/EvasEdje.cpp → edjexx/src/EdjeObject.cpp
View File

@ -3,7 +3,7 @@
#endif
#include "../include/edjexx/EdjePart.h"
#include "../include/edjexx/EvasEdje.h"
#include "../include/edjexx/EdjeObject.h"
#include "../include/edjexx/EdjeBase.h"
#include "../include/edjexx/EdjeExceptions.h"
@ -14,7 +14,7 @@ using namespace std;
namespace efl {
EvasEdje::EvasEdje( EvasCanvas &canvas )
EdjeObject::EdjeObject( EvasCanvas &canvas )
{
// Initialize the Edje library
EdjeBase::init ();
@ -28,7 +28,7 @@ EvasEdje::EvasEdje( EvasCanvas &canvas )
#endif
}
EvasEdje::EvasEdje( EvasCanvas &canvas, const std::string &filename, const std::string &groupname )
EdjeObject::EdjeObject( EvasCanvas &canvas, const std::string &filename, const std::string &groupname )
{
// Initialize the Edje library
EdjeBase::init ();
@ -43,7 +43,7 @@ EvasEdje::EvasEdje( EvasCanvas &canvas, const std::string &filename, const std::
setFile( filename, groupname );
}
EvasEdje::EvasEdje( EvasCanvas &canvas, const Point &pos, const std::string &filename, const std::string &groupname )
EdjeObject::EdjeObject( EvasCanvas &canvas, const Point &pos, const std::string &filename, const std::string &groupname )
{
// Initialize the Edje library
EdjeBase::init ();
@ -59,13 +59,13 @@ EvasEdje::EvasEdje( EvasCanvas &canvas, const Point &pos, const std::string &fil
move (pos);
}
EvasEdje::EvasEdje( Evas_Object* object)
EdjeObject::EdjeObject( Evas_Object* object)
{
o = object;
mFree = false;
}
EvasEdje::~EvasEdje()
EdjeObject::~EdjeObject()
{
//FIXME: Remove callbacks?
evas_object_del( o );
@ -74,7 +74,7 @@ EvasEdje::~EvasEdje()
EdjeBase::shutdown ();
}
void EvasEdje::setFile( const std::string &filename, const std::string &groupname )
void EdjeObject::setFile( const std::string &filename, const std::string &groupname )
{
if (!edje_object_file_set( o, filename.c_str (), groupname.c_str () ))
{
@ -82,7 +82,7 @@ void EvasEdje::setFile( const std::string &filename, const std::string &groupnam
}
}
Size EvasEdje::getMinimalSize() const
Size EdjeObject::getMinimalSize() const
{
int w, h;
edje_object_size_min_get( o, &w, &h );
@ -90,7 +90,7 @@ Size EvasEdje::getMinimalSize() const
return Size( w, h );
}
Size EvasEdje::getMaximumSize() const
Size EdjeObject::getMaximumSize() const
{
int w, h;
edje_object_size_max_get( o, &w, &h );
@ -98,17 +98,17 @@ Size EvasEdje::getMaximumSize() const
return Size( w, h );
}
bool EvasEdje::hasPart( const std::string &partname ) const
bool EdjeObject::hasPart( const std::string &partname ) const
{
return edje_object_part_exists( o, partname.c_str () );
}
CountedPtr <EdjePart> EvasEdje::operator[]( const std::string &partname )
CountedPtr <EdjePart> EdjeObject::operator[]( const std::string &partname )
{
return getPart( partname );
}
CountedPtr <EdjePart> EvasEdje::getPart( const std::string &partname )
CountedPtr <EdjePart> EdjeObject::getPart( const std::string &partname )
{
if ( hasPart( partname ) )
{
@ -118,7 +118,7 @@ CountedPtr <EdjePart> EvasEdje::getPart( const std::string &partname )
throw EdjePartNotExistingException (partname);
}
void EvasEdje::connect( const std::string &emission, const std::string &source, const EdjeSignalSlot& slot )
void EdjeObject::connect( const std::string &emission, const std::string &source, const EdjeSignalSlot& slot )
{
EdjeSignalSignal* signal = new EdjeSignalSignal();
AllocTag( signal, emission );
@ -126,28 +126,28 @@ void EvasEdje::connect( const std::string &emission, const std::string &source,
edje_object_signal_callback_add( o, emission.c_str (), source.c_str (), &_edje_signal_handler_callback, static_cast<void*>( signal ) );
}
void EvasEdje::emit( const std::string &emission, const std::string &source )
void EdjeObject::emit( const std::string &emission, const std::string &source )
{
edje_object_signal_emit( o, emission.c_str (), source.c_str () );
}
void EvasEdje::_edje_message_handler_callback( void* data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg )
void EdjeObject::_edje_message_handler_callback( void* data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg )
{
Dout( dc::notice, "EvasEdje::_edje_message_handler_callback()" );
//EvasEdje* instance = reinterpret_cast<EvasEdje*>( data );
Dout( dc::notice, "EdjeObject::_edje_message_handler_callback()" );
//EdjeObject* instance = reinterpret_cast<EdjeObject*>( data );
}
void EvasEdje::_edje_signal_handler_callback( void *data, Evas_Object *obj, const char *emission, const char *source )
void EdjeObject::_edje_signal_handler_callback( void *data, Evas_Object *obj, const char *emission, const char *source )
{
Dout( dc::notice, "EvasEdje::_edje_signal_handler_callback( " << (emission ? emission:"<null>") << ", " << (source ? source:"<null>") << " ) " );
Dout( dc::notice, "EdjeObject::_edje_signal_handler_callback( " << (emission ? emission:"<null>") << ", " << (source ? source:"<null>") << " ) " );
EdjeSignalSignal* signal = reinterpret_cast<EdjeSignalSignal*>( data );
if ( signal ) signal->emit( emission, source );
else Dout( dc::warning, "EvasEdje::_edje_signal_handler_callback() - got callback without valid signal" );
else Dout( dc::warning, "EdjeObject::_edje_signal_handler_callback() - got callback without valid signal" );
}
EvasEdje* EvasEdje::wrap( Evas_Object* o )
EdjeObject* EdjeObject::wrap( Evas_Object* o )
{
return new EvasEdje( o );
return new EdjeObject( o );
}
} // end namespace efl

4
edjexx/src/EdjePart.cpp
View File

@ -3,7 +3,7 @@
#endif
#include "../include/edjexx/EdjePart.h"
#include "../include/edjexx/EvasEdje.h"
#include "../include/edjexx/EdjeObject.h"
/* EFL */
#include <Edje.h>
@ -13,7 +13,7 @@
namespace efl {
EdjePart::EdjePart( EvasEdje* parent, const std::string &partname )
EdjePart::EdjePart( EdjeObject* parent, const std::string &partname )
:_parent( parent), _partname( partname )
{
Dout( dc::notice, " EdjePart::EdjePart( '" << _partname << "' ) constructing..." );

2
edjexx/src/Makefile.am
View File

@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
libedjexx_la_SOURCES = \
EdjeBase.cpp \
EdjePart.cpp \
EvasEdje.cpp \
EdjeObject.cpp \
EdjeExceptions.cpp
libedjexx_la_LIBADD = \