From 686ec6d8bd2082f3c7358e11a6b989148fa15c60 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 22 Aug 2014 05:21:10 +0200 Subject: [PATCH] [DEV] remove caller in signal emit --- sources/appl/Buffer.cpp | 14 +++++++------- sources/appl/Gui/TagFileList.cpp | 6 +++--- sources/appl/Gui/TagFileSelection.cpp | 6 +++--- sources/appl/Gui/WorkerCloseFile.cpp | 6 +++--- sources/appl/Gui/WorkerSaveFile.cpp | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sources/appl/Buffer.cpp b/sources/appl/Buffer.cpp index a68a35d..42c7f65 100644 --- a/sources/appl/Buffer.cpp +++ b/sources/appl/Buffer.cpp @@ -170,7 +170,7 @@ void appl::Buffer::setFileName(const std::string& _name) { } m_fileName = name; m_hasFileName = true; - signalChangeName.emit(shared_from_this()); + signalChangeName.emit(); setModification(true); } @@ -189,9 +189,9 @@ void appl::Buffer::setModification(bool _status) { } m_isModify = _status; if (m_isModify == true) { - signalIsModify.emit(shared_from_this()); + signalIsModify.emit(); } else { - signalIsSave.emit(shared_from_this()); + signalIsSave.emit(); } } @@ -414,13 +414,13 @@ void appl::Buffer::moveCursor(int64_t _pos) { if (m_cursorPos == m_cursorSelectPos) { m_cursorSelectPos = -1; } - signalSelectChange.emit(shared_from_this()); + signalSelectChange.emit(); return; } // move mode m_cursorPos = _pos; m_cursorSelectPos = -1; - signalSelectChange.emit(shared_from_this()); + signalSelectChange.emit(); } bool appl::Buffer::getPosAround(const appl::Buffer::Iterator& _startPos, @@ -513,12 +513,12 @@ bool appl::Buffer::getPosAround(const appl::Buffer::Iterator& _startPos, void appl::Buffer::setSelectionPos(const appl::Buffer::Iterator& _pos) { m_cursorSelectPos = _pos; - signalSelectChange.emit(shared_from_this()); + signalSelectChange.emit(); } void appl::Buffer::unSelect() { m_cursorSelectPos = -1; - signalSelectChange.emit(shared_from_this()); + signalSelectChange.emit(); } static const char *ControlCodeTable[32] = { diff --git a/sources/appl/Gui/TagFileList.cpp b/sources/appl/Gui/TagFileList.cpp index 6216f25..9b3131f 100644 --- a/sources/appl/Gui/TagFileList.cpp +++ b/sources/appl/Gui/TagFileList.cpp @@ -93,12 +93,12 @@ bool appl::TagFileList::onItemEvent(int32_t _IdInput, enum ewol::key::status _ty && m_selectedLine < (int64_t)m_list.size() && nullptr != m_list[m_selectedLine] ) { if (previousRaw != m_selectedLine) { - signalSelect.emit(shared_from_this(), etk::to_string(m_list[_raw]->fileLine)+":"+m_list[m_selectedLine]->filename); + signalSelect.emit(etk::to_string(m_list[_raw]->fileLine)+":"+m_list[m_selectedLine]->filename); } else { - signalValidate.emit(shared_from_this(), etk::to_string(m_list[_raw]->fileLine)+":"+m_list[m_selectedLine]->filename); + signalValidate.emit(etk::to_string(m_list[_raw]->fileLine)+":"+m_list[m_selectedLine]->filename); } } else { - signalUnSelect.emit(shared_from_this()); + signalUnSelect.emit(); } // need to regenerate the display of the list : markToRedraw(); diff --git a/sources/appl/Gui/TagFileSelection.cpp b/sources/appl/Gui/TagFileSelection.cpp index 8a36cf1..82e19d6 100644 --- a/sources/appl/Gui/TagFileSelection.cpp +++ b/sources/appl/Gui/TagFileSelection.cpp @@ -112,7 +112,7 @@ void appl::TagFileSelection::onReceiveMessage(const ewol::object::Message& _msg) EWOL_INFO("ctags LIST ... : " << _msg ); if (_msg.getMessage() == applEventctagsSelection) { if (m_eventNamed!="") { - signalSelect.emit(shared_from_this(), m_eventNamed); + signalSelect.emit(m_eventNamed); // == > Auto remove ... autoDestroy(); } @@ -121,11 +121,11 @@ void appl::TagFileSelection::onReceiveMessage(const ewol::object::Message& _msg) } else if (_msg.getMessage() == applEventCtagsListUnSelect) { m_eventNamed = ""; } else if (_msg.getMessage() == applEventCtagsListValidate) { - signalSelect.emit(shared_from_this(), _msg.getData()); + signalSelect.emit(_msg.getData()); // == > Auto remove ... autoDestroy(); } else if (_msg.getMessage() == applEventctagsCancel) { - signalCancel.emit(shared_from_this()); + signalCancel.emit(); // == > Auto remove ... autoDestroy(); } diff --git a/sources/appl/Gui/WorkerCloseFile.cpp b/sources/appl/Gui/WorkerCloseFile.cpp index 1a7ceb3..2287b26 100644 --- a/sources/appl/Gui/WorkerCloseFile.cpp +++ b/sources/appl/Gui/WorkerCloseFile.cpp @@ -59,7 +59,7 @@ void appl::WorkerCloseFile::init(const std::string& _bufferName) { return; } if (m_buffer->isModify() == false) { - signalCloseDone.emit(shared_from_this()); + signalCloseDone.emit(); m_buffer->destroy(); return; } @@ -125,7 +125,7 @@ void appl::WorkerCloseFile::onReceiveMessage(const ewol::object::Message& _msg) } tmpWindows->displayWarningMessage("We can not save the file :
" + m_buffer->getFileName() + ""); } else { - signalCloseDone.emit(shared_from_this()); + signalCloseDone.emit(); } } else if ( _msg.getMessage() == s_closeValidate || _msg.getMessage() == s_saveAsDone) { @@ -134,7 +134,7 @@ void appl::WorkerCloseFile::onReceiveMessage(const ewol::object::Message& _msg) autoDestroy(); return; } - signalCloseDone.emit(shared_from_this()); + signalCloseDone.emit(); m_buffer->destroy(); m_buffer.reset(); } diff --git a/sources/appl/Gui/WorkerSaveFile.cpp b/sources/appl/Gui/WorkerSaveFile.cpp index 8f13fd5..e81dafe 100644 --- a/sources/appl/Gui/WorkerSaveFile.cpp +++ b/sources/appl/Gui/WorkerSaveFile.cpp @@ -54,7 +54,7 @@ void appl::WorkerSaveFile::init(const std::string& _bufferName, bool _forceSaveA if (_forceSaveAs == false) { if (tmpBuffer->hasFileName() == true) { tmpBuffer->storeFile(); - signalSaveDone.emit(shared_from_this()); + signalSaveDone.emit(); autoDestroy(); return; } @@ -111,7 +111,7 @@ void appl::WorkerSaveFile::onReceiveMessage(const ewol::object::Message& _msg) { } tmpWindows->displayWarningMessage("We can not save the file :
" + tmpBuffer->getFileName() + ""); } else { - signalSaveDone.emit(shared_from_this()); + signalSaveDone.emit(); } } }