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

[DEV] remove some unneded copy

Browse Source
This commit is contained in:
Edouard DUPIN 2014-05-17 21:09:15 +02:00
parent 357371847b
commit 4c68791bdd
35 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,7 +650,7 @@ bool ewol::Context::OS_Draw(bool _displayEveryTime) {
return hasDisplayDone; return hasDisplayDone;
} }
void ewol::Context::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::Context::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
//EWOL_CRITICAL("element removed"); //EWOL_CRITICAL("element removed");
m_input.onObjectRemove(_removeObject); m_input.onObjectRemove(_removeObject);
} }

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

@ -140,7 +140,7 @@ namespace ewol {
* @param[in] removeObject Pointer on the EObject removed == > the user must remove all reference on this EObject * @param[in] removeObject Pointer on the EObject removed == > the user must remove all reference on this EObject
* @note : Sub classes must call this class * @note : Sub classes must call this class
*/ */
void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
/** /**
* @brief reset event management for the IO like Input ou Mouse or keyborad * @brief reset event management for the IO like Input ou Mouse or keyborad
*/ */

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

@ -138,7 +138,7 @@ void ewol::context::InputManager::unGrabPointer() {
m_context.grabPointerEvents(false, vec2(0,0)); m_context.grabPointerEvents(false, vec2(0,0));
} }
void ewol::context::InputManager::onObjectRemove(ewol::object::Shared<ewol::Object> removeObject) { void ewol::context::InputManager::onObjectRemove(const ewol::object::Shared<ewol::Object>& removeObject) {
for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) { for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) {
if (m_eventInputSaved[iii].curentWidgetEvent == removeObject) { if (m_eventInputSaved[iii].curentWidgetEvent == removeObject) {
// remove the property of this input ... // remove the property of this input ...

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

@ -99,7 +99,7 @@ namespace ewol {
* @param[in] removeObject Pointer on the Object remeved == > the user must remove all reference on this Object * @param[in] removeObject Pointer on the Object remeved == > the user must remove all reference on this Object
* @note : Sub classes must call this class * @note : Sub classes must call this class
*/ */
void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
/** /**
* @brief a new layer on the windows is set == > might remove all the property of the current element ... * @brief a new layer on the windows is set == > might remove all the property of the current element ...
*/ */

8
sources/ewol/object/Manager.cpp
View File

@ -81,7 +81,7 @@ void ewol::object::Manager::unInit() {
} }
} }
void ewol::object::Manager::add(ewol::object::Shared<ewol::Object> _object) { void ewol::object::Manager::add(const ewol::object::Shared<ewol::Object>& _object) {
if (_object == nullptr) { if (_object == nullptr) {
EWOL_ERROR("try to add an inexistant Object in manager"); EWOL_ERROR("try to add an inexistant Object in manager");
} }
@ -93,7 +93,7 @@ int32_t ewol::object::Manager::getNumberObject() {
return m_eObjectList.size() + m_eObjectAutoRemoveList.size(); return m_eObjectList.size() + m_eObjectAutoRemoveList.size();
} }
void ewol::object::Manager::informOneObjectIsRemoved(ewol::object::Shared<ewol::Object> _object) { void ewol::object::Manager::informOneObjectIsRemoved(const ewol::object::Shared<ewol::Object>& _object) {
size_t mbElement = m_eObjectList.size(); size_t mbElement = m_eObjectList.size();
for (int64_t iii=0; iii<(int64_t)m_eObjectList.size(); ++iii) { for (int64_t iii=0; iii<(int64_t)m_eObjectList.size(); ++iii) {
if ( m_eObjectList[iii] != nullptr if ( m_eObjectList[iii] != nullptr
@ -125,7 +125,7 @@ void ewol::object::Manager::informOneObjectIsRemoved(ewol::object::Shared<ewol::
ewol::getContext().onObjectRemove(_object); ewol::getContext().onObjectRemove(_object);
} }
void ewol::object::Manager::rm(ewol::object::Shared<ewol::Object> _object) { void ewol::object::Manager::rm(const ewol::object::Shared<ewol::Object>& _object) {
if (_object == nullptr) { if (_object == nullptr) {
EWOL_ERROR("Try to remove (nullptr) Object"); EWOL_ERROR("Try to remove (nullptr) Object");
return; return;
@ -150,7 +150,7 @@ void ewol::object::Manager::rm(ewol::object::Shared<ewol::Object> _object) {
EWOL_ERROR("Try to remove Object that is not referenced ..."); EWOL_ERROR("Try to remove Object that is not referenced ...");
} }
void ewol::object::Manager::autoRemove(ewol::object::Shared<ewol::Object> _object) { void ewol::object::Manager::autoRemove(const ewol::object::Shared<ewol::Object>& _object) {
if (nullptr == _object) { if (nullptr == _object) {
EWOL_ERROR("Try to Auto-Remove (nullptr) Object"); EWOL_ERROR("Try to Auto-Remove (nullptr) Object");
return; return;

8
sources/ewol/object/Manager.h
View File

@ -27,16 +27,16 @@ namespace ewol {
*/ */
void unInit(); void unInit();
void add(ewol::object::Shared<ewol::Object> _object); void add(const ewol::object::Shared<ewol::Object>& _object);
void rm(ewol::object::Shared<ewol::Object> _object); void rm(const ewol::object::Shared<ewol::Object>& _object);
int32_t getNumberObject(); int32_t getNumberObject();
void autoRemove(ewol::object::Shared<ewol::Object> _object); void autoRemove(const ewol::object::Shared<ewol::Object>& _object);
void removeAllAutoRemove(); void removeAllAutoRemove();
ewol::object::Shared<ewol::Object> get(const std::string& _name); ewol::object::Shared<ewol::Object> get(const std::string& _name);
private: private:
void informOneObjectIsRemoved(ewol::object::Shared<ewol::Object> _object); void informOneObjectIsRemoved(const ewol::object::Shared<ewol::Object>& _object);
private: private:
ewol::object::MultiCast m_multiCast; //!< muticast manager ewol::object::MultiCast m_multiCast; //!< muticast manager
public: public:

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

@ -19,7 +19,7 @@ namespace ewol {
const char* m_event; //!< Event pointer == > unique Id define by the system ... const char* m_event; //!< Event pointer == > unique Id define by the system ...
std::string m_data; //!< compositing additionnal message Value. std::string m_data; //!< compositing additionnal message Value.
public: public:
Message(ewol::object::Shared<ewol::Object> _caller, Message(const ewol::object::Shared<ewol::Object>& _caller,
const char* _message, const char* _message,
const std::string& _data) : const std::string& _data) :
m_callerObject(_caller), m_callerObject(_caller),
@ -27,7 +27,7 @@ namespace ewol {
m_data(_data) { m_data(_data) {
}; };
void setCaller(ewol::object::Shared<ewol::Object> _caller) { void setCaller(const ewol::object::Shared<ewol::Object>& _caller) {
m_callerObject = _caller; m_callerObject = _caller;
}; };
inline ewol::object::Shared<ewol::Object> getCaller() const { inline ewol::object::Shared<ewol::Object> getCaller() const {

6
sources/ewol/object/MultiCast.cpp
View File

@ -24,7 +24,7 @@ ewol::object::MultiCast::~MultiCast() {
} }
void ewol::object::MultiCast::add(ewol::object::Shared<ewol::Object> _object, const char* const _message) { void ewol::object::MultiCast::add(const ewol::object::Shared<ewol::Object>& _object, const char* const _message) {
if (nullptr == _object) { if (nullptr == _object) {
EWOL_ERROR("Add with nullptr object"); EWOL_ERROR("Add with nullptr object");
return; return;
@ -38,7 +38,7 @@ void ewol::object::MultiCast::add(ewol::object::Shared<ewol::Object> _object, co
} }
void ewol::object::MultiCast::rm(ewol::object::Shared<ewol::Object> _object) { void ewol::object::MultiCast::rm(const ewol::object::Shared<ewol::Object>& _object) {
if (nullptr == _object) { if (nullptr == _object) {
EWOL_ERROR("Rm with nullptr object"); EWOL_ERROR("Rm with nullptr object");
return; return;
@ -54,7 +54,7 @@ void ewol::object::MultiCast::rm(ewol::object::Shared<ewol::Object> _object) {
} }
} }
void ewol::object::MultiCast::send(ewol::object::Shared<ewol::Object> _object, const char* const _message, const std::string& _data) { void ewol::object::MultiCast::send(const ewol::object::Shared<ewol::Object>& _object, const char* const _message, const std::string& _data) {
EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to :"); EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to :");
// send the message at all registered widget ... // send the message at all registered widget ...

6
sources/ewol/object/MultiCast.h
View File

@ -36,9 +36,9 @@ namespace ewol {
void anonymousSend(const char* const _messageId, const std::string& _data) { void anonymousSend(const char* const _messageId, const std::string& _data) {
send(nullptr, _messageId, _data); send(nullptr, _messageId, _data);
}; };
void send(ewol::object::Shared<ewol::Object> _object, const char* const _message, const std::string& _data); void send(const ewol::object::Shared<ewol::Object>& _object, const char* const _message, const std::string& _data);
void rm(ewol::object::Shared<ewol::Object> _object); void rm(const ewol::object::Shared<ewol::Object>& _object);
void add(ewol::object::Shared<ewol::Object> _object, const char* const _message); void add(const ewol::object::Shared<ewol::Object>& _object, const char* const _message);
}; };
}; };
}; };

6
sources/ewol/object/Object.cpp
View File

@ -203,7 +203,7 @@ void ewol::Object::registerMultiCast(const char* const _messageId) {
getMultiCast().add(this, _messageId); getMultiCast().add(this, _messageId);
} }
void ewol::Object::registerOnEvent(ewol::object::Shared<ewol::Object> _destinationObject, void ewol::Object::registerOnEvent(const ewol::object::Shared<ewol::Object>& _destinationObject,
const char * _eventId, const char * _eventId,
const char * _eventIdgenerated, const char * _eventIdgenerated,
const std::string& _overloadData) { const std::string& _overloadData) {
@ -275,7 +275,7 @@ void ewol::Object::registerOnEvent(ewol::object::Shared<ewol::Object> _destinati
m_externEvent.push_back(tmpEvent); m_externEvent.push_back(tmpEvent);
} }
void ewol::Object::unRegisterOnEvent(ewol::object::Shared<ewol::Object> _destinationObject, void ewol::Object::unRegisterOnEvent(const ewol::object::Shared<ewol::Object>& _destinationObject,
const char * _eventId) { const char * _eventId) {
if (nullptr == _destinationObject) { if (nullptr == _destinationObject) {
EWOL_ERROR("Input ERROR nullptr pointer Object ..."); EWOL_ERROR("Input ERROR nullptr pointer Object ...");
@ -297,7 +297,7 @@ void ewol::Object::unRegisterOnEvent(ewol::object::Shared<ewol::Object> _destina
} }
} }
void ewol::Object::onObjectRemove(ewol::object::Shared<ewol::Object> _object) { void ewol::Object::onObjectRemove(const ewol::object::Shared<ewol::Object>& _object) {
for(int32_t iii=m_externEvent.size()-1; iii >= 0; iii--) { for(int32_t iii=m_externEvent.size()-1; iii >= 0; iii--) {
if ( m_externEvent[iii] != nullptr if ( m_externEvent[iii] != nullptr
&& m_externEvent[iii]->destObject.hasOwner() == false) { && m_externEvent[iii]->destObject.hasOwner() == false) {

6
sources/ewol/object/Object.h
View File

@ -182,7 +182,7 @@ namespace ewol {
* @param[in] _eventIdgenerated event generated when call the distant Object.onReceiveMessage(...) * @param[in] _eventIdgenerated event generated when call the distant Object.onReceiveMessage(...)
* @param[in] _overloadData When the user prever to receive a data specificly for this event ... * @param[in] _overloadData When the user prever to receive a data specificly for this event ...
*/ */
void registerOnEvent(ewol::object::Shared<ewol::Object> _destinationObject, void registerOnEvent(const ewol::object::Shared<ewol::Object>& _destinationObject,
const char * _eventId, const char * _eventId,
const char * _eventIdgenerated = nullptr, const char * _eventIdgenerated = nullptr,
const std::string& _overloadData = ""); const std::string& _overloadData = "");
@ -191,13 +191,13 @@ namespace ewol {
* @param[in] _destinationObject pointer on the object that might be call when an event is generated * @param[in] _destinationObject pointer on the object that might be call when an event is generated
* @param[in] _eventId Event generate inside the object (nullptr to remove all event on this object) * @param[in] _eventId Event generate inside the object (nullptr to remove all event on this object)
*/ */
void unRegisterOnEvent(ewol::object::Shared<ewol::Object> _destinationObject, void unRegisterOnEvent(const ewol::object::Shared<ewol::Object>& _destinationObject,
const char * _eventId = nullptr); const char * _eventId = nullptr);
/** /**
* @brief Inform object that an other object is removed ... * @brief Inform object that an other object is removed ...
* @note : Sub classes must call this class * @note : Sub classes must call this class
*/ */
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _object); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _object);
/** /**
* @brief Receive a message from an other Object with a specific eventId and data * @brief Receive a message from an other Object with a specific eventId and data
* @param[in] _msg Message handle * @param[in] _msg Message handle

2
sources/ewol/resource/Manager.cpp
View File

@ -215,7 +215,7 @@ bool ewol::resource::Manager::release(ewol::Resource*& _object) {
} }
// in case of error ... // in case of error ...
void ewol::resource::Manager::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::resource::Manager::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
for (size_t iii=0; iii<m_resourceList.size(); ++iii) { for (size_t iii=0; iii<m_resourceList.size(); ++iii) {
if (m_resourceList[iii] == _removeObject) { if (m_resourceList[iii] == _removeObject) {
EWOL_WARNING("Remove Resource that is not removed ... "); EWOL_WARNING("Remove Resource that is not removed ... ");

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

@ -68,7 +68,7 @@ namespace ewol {
*/ */
bool release(ewol::Resource*& _object); bool release(ewol::Resource*& _object);
public: // herited function public: // herited function
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
}; };
}; };
}; };

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

@ -96,7 +96,7 @@ void ewol::widget::Composer::registerOnEventNameWidget(const std::string& _subWi
registerOnEventNameWidget(this, _subWidgetName, _eventId, _eventIdgenerated, _overloadData); registerOnEventNameWidget(this, _subWidgetName, _eventId, _eventIdgenerated, _overloadData);
} }
void ewol::widget::Composer::registerOnEventNameWidget(ewol::object::Shared<ewol::Object> _destinationObject, void ewol::widget::Composer::registerOnEventNameWidget(const ewol::object::Shared<ewol::Object>& _destinationObject,
const std::string& _subWidgetName, const std::string& _subWidgetName,
const char * _eventId, const char * _eventId,
const char * _eventIdgenerated, const char * _eventIdgenerated,

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

@ -78,7 +78,7 @@ namespace ewol {
* @param[in] _overloadData When the user prever to receive a data specificly for this event ... * @param[in] _overloadData When the user prever to receive a data specificly for this event ...
* @note : To used when NOT herited from this object. * @note : To used when NOT herited from this object.
*/ */
void registerOnEventNameWidget(ewol::object::Shared<ewol::Object> _destinationObject, void registerOnEventNameWidget(const ewol::object::Shared<ewol::Object>& _destinationObject,
const std::string& _subWidgetName, const std::string& _subWidgetName,
const char * _eventId, const char * _eventId,
const char * _eventIdgenerated = nullptr, const char * _eventIdgenerated = nullptr,

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

@ -71,7 +71,7 @@ ewol::object::Shared<ewol::Widget> ewol::widget::Container::getWidgetNamed(const
return nullptr; return nullptr;
} }
void ewol::widget::Container::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::Container::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
if (m_subWidget == _removeObject) { if (m_subWidget == _removeObject) {
m_subWidget=nullptr; m_subWidget=nullptr;
markToRedraw(); markToRedraw();

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

@ -54,7 +54,7 @@ namespace ewol {
public: // Derived function public: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual void calculateSize(const vec2& _availlable); virtual void calculateSize(const vec2& _availlable);
virtual void calculateMinMaxSize(); virtual void calculateMinMaxSize();
virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& _pos); virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& _pos);

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

@ -74,7 +74,7 @@ ewol::object::Shared<ewol::Widget> ewol::widget::Container2::getWidgetNamed(cons
return nullptr; return nullptr;
} }
void ewol::widget::Container2::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::Container2::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
if (m_subWidget[0] == _removeObject) { if (m_subWidget[0] == _removeObject) {
m_subWidget[0] = nullptr; m_subWidget[0] = nullptr;
markToRedraw(); markToRedraw();

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

@ -152,7 +152,7 @@ namespace ewol {
public: // Derived function public: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual void calculateSize(const vec2& _availlable) { virtual void calculateSize(const vec2& _availlable) {
calculateSizePadded(_availlable); calculateSizePadded(_availlable);
} }

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

@ -170,7 +170,7 @@ ewol::object::Shared<ewol::Widget> ewol::widget::ContainerN::getWidgetNamed(cons
return nullptr; return nullptr;
} }
void ewol::widget::ContainerN::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::ContainerN::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
// First step call parrent : // First step call parrent :
ewol::Widget::onObjectRemove(_removeObject); ewol::Widget::onObjectRemove(_removeObject);
// second step find if in all the elements ... // second step find if in all the elements ...

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

@ -88,7 +88,7 @@ namespace ewol {
public:// Derived function public:// Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual void calculateSize(const vec2& _availlable); virtual void calculateSize(const vec2& _availlable);
virtual void calculateMinMaxSize(); virtual void calculateMinMaxSize();
virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& _pos); virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& _pos);

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

@ -354,7 +354,7 @@ ewol::object::Shared<ewol::Widget> ewol::widget::Gird::getWidgetAtPos(const vec2
return nullptr; return nullptr;
} }
void ewol::widget::Gird::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::Gird::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
// First step call parrent : // First step call parrent :
ewol::Widget::onObjectRemove(_removeObject); ewol::Widget::onObjectRemove(_removeObject);
// second step find if in all the elements ... // second step find if in all the elements ...

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

@ -139,7 +139,7 @@ namespace ewol {
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& pos); virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& pos);
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual void calculateSize(const vec2& _availlable); virtual void calculateSize(const vec2& _availlable);
virtual void calculateMinMaxSize(); virtual void calculateMinMaxSize();
}; };

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

@ -258,7 +258,7 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
} }
void ewol::widget::Menu::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::Menu::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
ewol::widget::Sizer::onObjectRemove(_removeObject); ewol::widget::Sizer::onObjectRemove(_removeObject);
if (m_widgetContextMenu == _removeObject) { if (m_widgetContextMenu == _removeObject) {
delete(m_widgetContextMenu); delete(m_widgetContextMenu);

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

@ -52,7 +52,7 @@ namespace ewol {
void addSpacer(); void addSpacer();
// Derived function // Derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
}; };
}; };
}; };

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

@ -171,7 +171,7 @@ void ewol::Widget::setUpperWidget(ewol::object::Shared<ewol::Widget> _upper) {
m_up = _upper; m_up = _upper;
} }
void ewol::Widget::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::Widget::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
if (_removeObject == m_up) { if (_removeObject == m_up) {
EWOL_WARNING("[" << getId() << "] remove upper widget before removing this widget ..."); EWOL_WARNING("[" << getId() << "] remove upper widget before removing this widget ...");
m_up = nullptr; m_up = nullptr;

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

@ -699,7 +699,7 @@ namespace ewol {
*/ */
virtual enum ewol::context::cursorDisplay getCursor(); virtual enum ewol::context::cursorDisplay getCursor();
public: // Derived function public: // Derived function
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual bool loadXML(exml::Element* _node); virtual bool loadXML(exml::Element* _node);
protected: // Derived function protected: // Derived function
virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onSetConfig(const ewol::object::Config& _conf);

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

@ -202,7 +202,7 @@ void ewol::widget::Windows::popUpWidgetPop() {
widget->removeObject(); widget->removeObject();
} }
void ewol::widget::Windows::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::Windows::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
// First step call parrent : // First step call parrent :
ewol::Widget::onObjectRemove(_removeObject); ewol::Widget::onObjectRemove(_removeObject);
// second step find if in all the elements ... // second step find if in all the elements ...

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

@ -84,7 +84,7 @@ namespace ewol {
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);
public: // Derived function public: // Derived function
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual void calculateSize(const vec2& _availlable); virtual void calculateSize(const vec2& _availlable);
virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& _pos); virtual ewol::object::Shared<ewol::Widget> getWidgetAtPos(const vec2& _pos);
void setTitle(const std::string& _title); void setTitle(const std::string& _title);

2
sources/ewol/widget/meta/ColorChooser.cpp
View File

@ -169,7 +169,7 @@ void ewol::widget::ColorChooser::onReceiveMessage(const ewol::object::Message& _
}; };
void ewol::widget::ColorChooser::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::ColorChooser::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
// First step call parrent : // First step call parrent :
ewol::widget::Sizer::onObjectRemove(_removeObject); ewol::widget::Sizer::onObjectRemove(_removeObject);
// second step find if in all the elements ... // second step find if in all the elements ...

2
sources/ewol/widget/meta/ColorChooser.h
View File

@ -33,7 +33,7 @@ namespace ewol {
~ColorChooser(); ~ColorChooser();
public: // Derived function public: // Derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
public: public:
void setColor(etk::Color<> _newColor); void setColor(etk::Color<> _newColor);
etk::Color<> getColor(); etk::Color<> getColor();

2
sources/ewol/widget/meta/Parameter.cpp
View File

@ -217,7 +217,7 @@ void ewol::widget::Parameter::onReceiveMessage(const ewol::object::Message& _msg
return; return;
} }
void ewol::widget::Parameter::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::Parameter::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
// First step call parrent : // First step call parrent :
ewol::widget::PopUp::onObjectRemove(_removeObject); ewol::widget::PopUp::onObjectRemove(_removeObject);
// second step find if in all the elements ... // second step find if in all the elements ...

2
sources/ewol/widget/meta/Parameter.h
View File

@ -35,7 +35,7 @@ namespace ewol {
~Parameter(); ~Parameter();
public: // Derived function public: // Derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
public: public:
void setTitle(std::string _label); void setTitle(std::string _label);
void menuAdd(std::string _label, std::string _image, ewol::object::Shared<ewol::Widget> _associateWidget); void menuAdd(std::string _label, std::string _image, ewol::object::Shared<ewol::Widget> _associateWidget);

2
sources/ewol/widget/meta/StdPopUp.cpp
View File

@ -111,7 +111,7 @@ ewol::object::Shared<ewol::widget::Button> ewol::widget::StdPopUp::addButton(con
return myButton; return myButton;
} }
void ewol::widget::StdPopUp::onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject) { void ewol::widget::StdPopUp::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
// call parent: // call parent:
ewol::widget::PopUp::onObjectRemove(_removeObject); ewol::widget::PopUp::onObjectRemove(_removeObject);
if (_removeObject == m_subBar) { if (_removeObject == m_subBar) {

2
sources/ewol/widget/meta/StdPopUp.h
View File

@ -74,7 +74,7 @@ namespace ewol {
*/ */
ewol::object::Shared<ewol::widget::Button> addButton(const std::string& _text, bool _autoExit=false); ewol::object::Shared<ewol::widget::Button> addButton(const std::string& _text, bool _autoExit=false);
public: // Derived function public: // Derived function
virtual void onObjectRemove(ewol::object::Shared<ewol::Object> _removeObject); virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
}; };
}; };