diff --git a/sources/appl/Buffer/BufferManager.cpp b/sources/appl/Buffer/BufferManager.cpp index d3312fa..7db26fc 100644 --- a/sources/appl/Buffer/BufferManager.cpp +++ b/sources/appl/Buffer/BufferManager.cpp @@ -39,7 +39,7 @@ class classBufferManager: public ewol::EObject * @param[in] data Data registered by this class * @return --- */ - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); private: // return the ID of the buffer allocated // create a buffer with no element @@ -115,7 +115,7 @@ classBufferManager::~classBufferManager(void) * @param[in] data Data registered by this class * @return --- */ -void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { ewol::EObject::OnReceiveMessage(CallerObject, eventId, data); diff --git a/sources/appl/Buffer/EdnBuf/EdnBuf.cpp b/sources/appl/Buffer/EdnBuf/EdnBuf.cpp index 1aa8c48..21df458 100644 --- a/sources/appl/Buffer/EdnBuf/EdnBuf.cpp +++ b/sources/appl/Buffer/EdnBuf/EdnBuf.cpp @@ -240,7 +240,8 @@ int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::UString &insertText) GetRange(start, end, deletedText); etk::Vector tmpInsertText; if (true == m_isUtf8) { - char * tmpPointer = insertText.c_str(); + etk::Char tmpChar = insertText.c_str(); + const char * tmpPointer = tmpChar; while (*tmpPointer != '\0') { tmpInsertText.PushBack(*tmpPointer++); } @@ -932,7 +933,8 @@ bool EdnBuf::SearchForward(int32_t startPos, etk::UString &search, int32_t *foun { etk::Vector searchVect; if (true == m_isUtf8) { - char * tmpPointer = search.c_str(); + etk::Char tmpChar = search.c_str(); + const char * tmpPointer = tmpChar; while (*tmpPointer != '\0') { searchVect.PushBack(*tmpPointer++); } @@ -987,7 +989,8 @@ bool EdnBuf::SearchBackward(int32_t startPos, etk::UString &search, int32_t *fou { etk::Vector searchVect; if (true == m_isUtf8) { - char * tmpPointer = search.c_str(); + etk::Char tmpChar = search.c_str(); + const char * tmpPointer = tmpChar; while (*tmpPointer != '\0') { searchVect.PushBack(*tmpPointer++); } @@ -1137,7 +1140,8 @@ int32_t EdnBuf::LocalInsert(int32_t pos, etk::UString &insertText) { etk::Vector tmpInsertText; if (true == m_isUtf8) { - char * tmpPointer = insertText.c_str(); + etk::Char tmpChar = insertText.c_str(); + const char * tmpPointer = tmpChar; while (*tmpPointer != '\0') { tmpInsertText.PushBack(*tmpPointer++); } diff --git a/sources/appl/Colorize/ColorizeManager.cpp b/sources/appl/Colorize/ColorizeManager.cpp index 83dc146..8e65c6e 100644 --- a/sources/appl/Colorize/ColorizeManager.cpp +++ b/sources/appl/Colorize/ColorizeManager.cpp @@ -40,7 +40,7 @@ class classColorManager: public ewol::EObject * @param[in] data Data registered by this class * @return --- */ - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); public: void LoadFile(etk::UString &xmlFilename); void LoadFile(const char * xmlFilename); @@ -80,7 +80,7 @@ classColorManager::~classColorManager(void) listMyColor.Clear(); } -void classColorManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void classColorManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { /* switch (id) diff --git a/sources/appl/Gui/BufferView.cpp b/sources/appl/Gui/BufferView.cpp index 096fcc4..f11ffb9 100644 --- a/sources/appl/Gui/BufferView.cpp +++ b/sources/appl/Gui/BufferView.cpp @@ -75,7 +75,7 @@ void BufferView::RemoveAllElement(void) * @param[in] data Data registered by this class * @return --- */ -void BufferView::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void BufferView::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { widget::List::OnReceiveMessage(CallerObject, eventId, data); if (eventId == ednMsgBufferListChange) { diff --git a/sources/appl/Gui/BufferView.h b/sources/appl/Gui/BufferView.h index dbd8850..d7cdb00 100644 --- a/sources/appl/Gui/BufferView.h +++ b/sources/appl/Gui/BufferView.h @@ -47,7 +47,7 @@ class BufferView : public widget::List // Derived function const char * const GetObjectType(void) { return "ApplBufferView"; }; // Derived function - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); protected: // function call to display the list : virtual draw::Color GetBasicBG(void); diff --git a/sources/appl/Gui/CodeView.cpp b/sources/appl/Gui/CodeView.cpp index 56eb626..a15f175 100644 --- a/sources/appl/Gui/CodeView.cpp +++ b/sources/appl/Gui/CodeView.cpp @@ -343,7 +343,7 @@ bool CodeView::OnEventInput(ewol::keyEvent::type_te type, int32_t IdInput, ewol: * @param[in] data Data registered by this class * @return --- */ -void CodeView::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void CodeView::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { widget::WidgetScrooled::OnReceiveMessage(CallerObject, eventId, data); APPL_DEBUG("Extern Event : " << CallerObject << " type : " << eventId << " data=\"" << data << "\""); diff --git a/sources/appl/Gui/CodeView.h b/sources/appl/Gui/CodeView.h index b321af5..e6ae3e3 100644 --- a/sources/appl/Gui/CodeView.h +++ b/sources/appl/Gui/CodeView.h @@ -44,7 +44,7 @@ class CodeView :public widget::WidgetScrooled // Derived function virtual void OnRegenerateDisplay(void); // Derived function - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); public: // Derived function virtual bool OnEventInput(ewol::keyEvent::type_te type, int32_t IdInput, ewol::keyEvent::status_te typeEvent, vec2 pos); diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp index 5913f3f..6c1faa7 100644 --- a/sources/appl/Gui/MainWindows.cpp +++ b/sources/appl/Gui/MainWindows.cpp @@ -16,8 +16,7 @@ #include #include -#include -#include +#include #include #include #include @@ -40,10 +39,11 @@ #include #include -class ParameterAboutGui : public widget::SizerVert +class ParameterAboutGui : public widget::Sizer { public : - ParameterAboutGui(void) + ParameterAboutGui(void) : + widget::Sizer(widget::Sizer::modeVert) { widget::Spacer* mySpacer = NULL; @@ -93,18 +93,18 @@ const char * l_smoothMax = "tmpEvent_maxChange"; MainWindows::MainWindows(void) { APPL_DEBUG("CREATE WINDOWS ... "); - widget::SizerVert * mySizerVert = NULL; - widget::SizerVert * mySizerVert2 = NULL; - widget::SizerHori * mySizerHori = NULL; + widget::Sizer * mySizerVert = NULL; + widget::Sizer * mySizerVert2 = NULL; + widget::Sizer * mySizerHori = NULL; //ewol::Button * myButton = NULL; CodeView * myCodeView = NULL; BufferView * myBufferView = NULL; widget::Menu * myMenu = NULL; - mySizerVert = new widget::SizerVert(); + mySizerVert = new widget::Sizer(widget::Sizer::modeVert); SetSubWidget(mySizerVert); - mySizerHori = new widget::SizerHori(); + mySizerHori = new widget::Sizer(widget::Sizer::modeHori); mySizerVert->SubWidgetAdd(mySizerHori); myBufferView = new BufferView(); myBufferView->SetExpendX(false); @@ -113,7 +113,7 @@ MainWindows::MainWindows(void) myBufferView->SetFillY(true); mySizerHori->SubWidgetAdd(myBufferView); - mySizerVert2 = new widget::SizerVert(); + mySizerVert2 = new widget::Sizer(widget::Sizer::modeVert); mySizerHori->SubWidgetAdd(mySizerVert2); // main buffer Area : @@ -129,7 +129,7 @@ MainWindows::MainWindows(void) mySizerVert2->SubWidgetAdd(mySearch); #ifdef APPL_BUFFER_FONT_DISTANCE_FIELD { - widget::SizerHori * mySizerHori2 = new widget::SizerHori(); + widget::Sizer * mySizerHori2 = new widget::Sizer(widget::Sizer::modeHori); mySizerVert2->SubWidgetAdd(mySizerHori2); widget::CheckBox* tmpCheck = new widget::CheckBox("smooth"); @@ -156,7 +156,7 @@ MainWindows::MainWindows(void) } #endif - mySizerHori = new widget::SizerHori(); + mySizerHori = new widget::Sizer(widget::Sizer::modeHori); mySizerVert->SubWidgetAdd(mySizerHori); myMenu = new widget::Menu(); @@ -257,14 +257,8 @@ MainWindows::~MainWindows(void) const char *const ednEventPopUpFileSelected = "edn-mainWindows-openSelected"; const char *const ednEventPopUpFileSaveAs = "edn-mainWindows-saveAsSelected"; -/** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ -void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) + +void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { ewol::Windows::OnReceiveMessage(CallerObject, eventId, data); @@ -378,13 +372,6 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev return; } - -/** -* @brief Inform object that an other object is removed ... -* @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject -* @note : Sub classes must call this class -* @return --- -*/ void MainWindows::OnObjectRemove(ewol::EObject * removeObject) { ewol::Windows::OnObjectRemove(removeObject); diff --git a/sources/appl/Gui/MainWindows.h b/sources/appl/Gui/MainWindows.h index 43a4925..657cec4 100644 --- a/sources/appl/Gui/MainWindows.h +++ b/sources/appl/Gui/MainWindows.h @@ -29,7 +29,7 @@ class MainWindows : public ewol::Windows // Derived function const char * const GetObjectType(void) { return "MainWindows"; }; // Derived function - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); // Derived function virtual void OnObjectRemove(ewol::EObject * removeObject); }; diff --git a/sources/appl/Gui/Search.cpp b/sources/appl/Gui/Search.cpp index 6240eae..1d55fad 100644 --- a/sources/appl/Gui/Search.cpp +++ b/sources/appl/Gui/Search.cpp @@ -31,6 +31,7 @@ const char* const l_eventForwardCb = "appl-forward-CheckBox"; const char* const l_eventHideBt = "appl-hide-button"; Search::Search(void) : + widget::Sizer(widget::Sizer::modeHori), m_searchEntry(NULL), m_replaceEntry(NULL) { @@ -139,16 +140,9 @@ Search::~Search(void) } -/** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ -void Search::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void Search::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { - widget::SizerHori::OnReceiveMessage(CallerObject, eventId, data); + widget::Sizer::OnReceiveMessage(CallerObject, eventId, data); //APPL_INFO("Search receive message : \"" << eventId << "\" data=\"" << data << "\""); if ( eventId == l_eventSearchEntry) { SearchData::SetSearch(data); @@ -221,15 +215,9 @@ void Search::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId } } -/** - * @brief Inform object that an other object is removed ... - * @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject - * @note : Sub classes must call this class - * @return --- - */ void Search::OnObjectRemove(ewol::EObject * removeObject) { - widget::SizerHori::OnObjectRemove(removeObject); + widget::Sizer::OnObjectRemove(removeObject); if (removeObject == m_searchEntry) { m_searchEntry = NULL; } diff --git a/sources/appl/Gui/Search.h b/sources/appl/Gui/Search.h index 927bb02..8ccf736 100644 --- a/sources/appl/Gui/Search.h +++ b/sources/appl/Gui/Search.h @@ -10,36 +10,20 @@ #define __SEARCH_H__ #include -#include +#include #include -class Search : public widget::SizerHori +class Search : public widget::Sizer { public: // Constructeur Search(void); ~Search(void); - /** - * @brief Get the current Object type of the EObject - * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it - * @param[in] objectType type description - * @return true if the object is compatible, otherwise false - */ + // herited function const char * const GetObjectType(void) { return "ApplSearch"; }; - /** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); - /** - * @brief Inform object that an other object is removed ... - * @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject - * @note : Sub classes must call this class - * @return --- - */ + // herited function + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); + // herited function virtual void OnObjectRemove(ewol::EObject * removeObject); private: bool m_forward; diff --git a/sources/appl/Gui/SearchData.cpp b/sources/appl/Gui/SearchData.cpp index 5892131..b64b145 100644 --- a/sources/appl/Gui/SearchData.cpp +++ b/sources/appl/Gui/SearchData.cpp @@ -16,7 +16,7 @@ static etk::UString m_findRequest = ""; -void SearchData::SetSearch(etk::UString &myData) +void SearchData::SetSearch(const etk::UString &myData) { m_findRequest = myData; } @@ -33,7 +33,7 @@ bool SearchData::IsSearchEmpty(void) } static etk::UString m_replaceRequest = ""; -void SearchData::SetReplace(etk::UString &myData) +void SearchData::SetReplace(const etk::UString &myData) { m_replaceRequest = myData; } diff --git a/sources/appl/Gui/SearchData.h b/sources/appl/Gui/SearchData.h index 408f2cc..996f847 100644 --- a/sources/appl/Gui/SearchData.h +++ b/sources/appl/Gui/SearchData.h @@ -14,10 +14,10 @@ namespace SearchData { - void SetSearch(etk::UString &myData); + void SetSearch(const etk::UString &myData); void GetSearch(etk::UString &myData); bool IsSearchEmpty(void); - void SetReplace(etk::UString &myData); + void SetReplace(const etk::UString &myData); void GetReplace(etk::UString &myData); bool IsReplaceEmpty(void); void SetCase(bool value); diff --git a/sources/appl/Gui/TagFileSelection.cpp b/sources/appl/Gui/TagFileSelection.cpp index 7d387be..c0362a8 100644 --- a/sources/appl/Gui/TagFileSelection.cpp +++ b/sources/appl/Gui/TagFileSelection.cpp @@ -7,8 +7,7 @@ */ #include -#include -#include +#include #include #include #include @@ -39,8 +38,8 @@ appl::TagFileSelection::TagFileSelection(void) widget::Button* myWidgetValidate = NULL; widget::Button* myWidgetCancel = NULL; - widget::SizerVert * mySizerVert = NULL; - widget::SizerHori * mySizerHori = NULL; + widget::Sizer * mySizerVert = NULL; + widget::Sizer * mySizerHori = NULL; widget::Spacer * mySpacer = NULL; #if defined(__TARGET_OS__Android) SetDisplayRatio(0.90); @@ -50,7 +49,7 @@ appl::TagFileSelection::TagFileSelection(void) SetDisplayRatio(0.80); #endif - mySizerVert = new widget::SizerVert(); + mySizerVert = new widget::Sizer(widget::Sizer::modeVert); if (NULL == mySizerVert) { EWOL_ERROR("Can not allocate widget ==> display might be in error"); } else { @@ -58,7 +57,7 @@ appl::TagFileSelection::TagFileSelection(void) // set it in the pop-up-system : SubWidgetSet(mySizerVert); - mySizerHori = new widget::SizerHori(); + mySizerHori = new widget::Sizer(widget::Sizer::modeHori); if (NULL == mySizerHori) { EWOL_ERROR("Can not allocate widget ==> display might be in error"); } else { @@ -116,15 +115,7 @@ appl::TagFileSelection::~TagFileSelection(void) } - -/** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ -void appl::TagFileSelection::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void appl::TagFileSelection::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { EWOL_INFO("ctags LIST ... : \"" << eventId << "\" ==> data=\"" << data << "\"" ); if (eventId == applEventctagsSelection) { @@ -155,7 +146,6 @@ void appl::TagFileSelection::OnReceiveMessage(ewol::EObject * CallerObject, cons * @brief Add a Ctags item on the curent list * @param[in] file Compleate file name * @param[in] jump line id - * @return --- */ void appl::TagFileSelection::AddCtagsNewItem(etk::UString file, int32_t line) { @@ -164,13 +154,6 @@ void appl::TagFileSelection::AddCtagsNewItem(etk::UString file, int32_t line) } } - -/** - * @brief Inform object that an other object is removed ... - * @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject - * @note : Sub classes must call this class - * @return --- - */ void appl::TagFileSelection::OnObjectRemove(ewol::EObject * removeObject) { // First step call parrent : diff --git a/sources/appl/Gui/TagFileSelection.h b/sources/appl/Gui/TagFileSelection.h index 4dde6ef..dc72be0 100644 --- a/sources/appl/Gui/TagFileSelection.h +++ b/sources/appl/Gui/TagFileSelection.h @@ -25,33 +25,16 @@ namespace appl { public: TagFileSelection(void); virtual ~TagFileSelection(void); - /** - * @brief Get the current Object type of the EObject - * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it - * @param[in] objectType type description - * @return true if the object is compatible, otherwise false - */ + // herited function const char * const GetObjectType(void) { return "EwolFileChooser"; }; - /** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ - void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); - /** - * @brief Inform object that an other object is removed ... - * @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject - * @note : Sub classes must call this class - * @return --- - */ + // herited function + void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); + // herited function void OnObjectRemove(ewol::EObject * removeObject); /** * @brief Add a Ctags item on the curent list * @param[in] file Compleate file name * @param[in] jump line id - * @return --- */ void AddCtagsNewItem(etk::UString file, int32_t line); diff --git a/sources/appl/Highlight/HighlightManager.cpp b/sources/appl/Highlight/HighlightManager.cpp index 3b39344..2e70b19 100644 --- a/sources/appl/Highlight/HighlightManager.cpp +++ b/sources/appl/Highlight/HighlightManager.cpp @@ -37,25 +37,14 @@ class localClassHighlightManager: public ewol::EObject listHighlight.Clear(); }; - /** - * @brief Get the current Object type of the EObject - * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it - * @param[in] objectType type description - * @return true if the object is compatible, otherwise false - */ + // herited function const char * const GetObjectType(void) { return "ApplHighlightManager"; } - /** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) + // herited function + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { /* switch (id) @@ -147,8 +136,6 @@ class localClassHighlightManager: public ewol::EObject }; -#define EDN_CAST_HIGHLIGHT_MANAGER(curentPointer) EWOL_CAST(TYPE_EOBJECT_EDN_HIGHLIGHT_MANAGER,localClassHighlightManager,curentPointer) - static localClassHighlightManager * localManager = NULL; diff --git a/sources/appl/ctags/CTagsManager.cpp b/sources/appl/ctags/CTagsManager.cpp index 39d48f1..e8b061d 100644 --- a/sources/appl/ctags/CTagsManager.cpp +++ b/sources/appl/ctags/CTagsManager.cpp @@ -43,7 +43,7 @@ class CTagsManager: public ewol::EObject * @param[in] data Data registered by this class * @return --- */ - void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); + void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); int32_t m_currentSelectedID; void LoadTagFile(void); @@ -125,7 +125,7 @@ CTagsManager::~CTagsManager(void) const char * ednEventPopUpCtagsLoadFile = "edn-event-load-ctags"; -void CTagsManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void CTagsManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { //EWOL_INFO("ctags manager event ... : \"" << eventId << "\" ==> data=\"" << data << "\"" ); if (eventId == ednMsgBufferId) { diff --git a/sources/appl/global.cpp b/sources/appl/global.cpp index 3979e37..c5ec7a8 100644 --- a/sources/appl/global.cpp +++ b/sources/appl/global.cpp @@ -113,7 +113,8 @@ static const char * const l_changeTabulation = "edn-event-change-tabulation"; static const char * const l_changeEndOfLine = "edn-event-change-endOfLine"; static const char * const l_changeRounded = "edn-event-change-rounded"; -globals::ParameterGlobalsGui::ParameterGlobalsGui(void) +globals::ParameterGlobalsGui::ParameterGlobalsGui(void) : + widget::Sizer(widget::Sizer::modeVert) { widget::CheckBox* myCheckbox = NULL; widget::Spacer* mySpacer = NULL; @@ -179,16 +180,9 @@ globals::ParameterGlobalsGui::~ParameterGlobalsGui(void) } -/** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ -void globals::ParameterGlobalsGui::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data) +void globals::ParameterGlobalsGui::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data) { - widget::SizerVert::OnReceiveMessage(CallerObject, eventId, data); + widget::Sizer::OnReceiveMessage(CallerObject, eventId, data); if (eventId == l_changeEndOfLine) { if (data == "true") { diff --git a/sources/appl/global.h b/sources/appl/global.h index 62f498b..78dced2 100644 --- a/sources/appl/global.h +++ b/sources/appl/global.h @@ -10,7 +10,7 @@ #define __TOOLS_GLOBALS_H__ #include -#include +#include namespace globals @@ -35,19 +35,13 @@ namespace globals bool OrderTheBufferList(void); - class ParameterGlobalsGui : public widget::SizerVert + class ParameterGlobalsGui : public widget::Sizer { public : ParameterGlobalsGui(void); ~ParameterGlobalsGui(void); - /** - * @brief Receive a message from an other EObject with a specific eventId and data - * @param[in] CallerObject Pointer on the EObject that information came from - * @param[in] eventId Message registered by this class - * @param[in] data Data registered by this class - * @return --- - */ - virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); + // herited function + virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data); }; }