From da184c67674701cfdbd05ff476f97b5c18303450 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 4 Aug 2016 22:23:19 +0200 Subject: [PATCH] [DEV] update esignal removing ISignal --- sources/appl/Buffer.cpp | 5 ++--- sources/appl/Buffer.h | 10 +++++----- sources/appl/BufferManager.cpp | 2 +- sources/appl/BufferManager.h | 8 ++++---- sources/appl/Gui/TagFileList.h | 6 +++--- sources/appl/Gui/TagFileSelection.h | 4 ++-- sources/appl/Gui/WorkerCloseFile.h | 4 ++-- sources/appl/Gui/WorkerSaveFile.h | 4 ++-- sources/appl/HighlightPattern.cpp | 5 ++--- 9 files changed, 23 insertions(+), 25 deletions(-) diff --git a/sources/appl/Buffer.cpp b/sources/appl/Buffer.cpp index 3fe92b9..a27760e 100644 --- a/sources/appl/Buffer.cpp +++ b/sources/appl/Buffer.cpp @@ -1044,9 +1044,8 @@ namespace etk { } }; -#include +#include // declare for signal event -template class esignal::Signal>; -template class esignal::ISignal>; +ESIGNAL_DECLARE_SIGNAL(ememory::SharedPtr); diff --git a/sources/appl/Buffer.h b/sources/appl/Buffer.h index ed1fe1c..ff341f0 100644 --- a/sources/appl/Buffer.h +++ b/sources/appl/Buffer.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace appl { @@ -287,10 +287,10 @@ namespace appl { friend class Buffer; }; public: - esignal::ISignal<> signalIsModify; - esignal::ISignal<> signalIsSave; - esignal::ISignal<> signalSelectChange; - esignal::ISignal<> signalChangeName; + esignal::Signal<> signalIsModify; + esignal::Signal<> signalIsSave; + esignal::Signal<> signalSelectChange; + esignal::Signal<> signalChangeName; protected: Buffer(); void init(); diff --git a/sources/appl/BufferManager.cpp b/sources/appl/BufferManager.cpp index 27d2fa1..4ddccd8 100644 --- a/sources/appl/BufferManager.cpp +++ b/sources/appl/BufferManager.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include appl::BufferManager::BufferManager() : diff --git a/sources/appl/BufferManager.h b/sources/appl/BufferManager.h index bd494c2..2f31f8b 100644 --- a/sources/appl/BufferManager.h +++ b/sources/appl/BufferManager.h @@ -18,10 +18,10 @@ namespace appl { // TODO: This is a service ... class BufferManager : public ewol::Object { public: - esignal::ISignal signalNewBuffer; - esignal::ISignal signalSelectFile; - esignal::ISignal<> signalTextSelectionChange; - esignal::ISignal> signalRemoveBuffer; + esignal::Signal signalNewBuffer; + esignal::Signal signalSelectFile; + esignal::Signal<> signalTextSelectionChange; + esignal::Signal> signalRemoveBuffer; protected: BufferManager(); public: diff --git a/sources/appl/Gui/TagFileList.h b/sources/appl/Gui/TagFileList.h index adecce4..80195f9 100644 --- a/sources/appl/Gui/TagFileList.h +++ b/sources/appl/Gui/TagFileList.h @@ -24,9 +24,9 @@ namespace appl { }; class TagFileList : public ewol::widget::List { public: - esignal::ISignal signalSelect; - esignal::ISignal signalValidate; - esignal::ISignal<> signalUnSelect; + esignal::Signal signalSelect; + esignal::Signal signalValidate; + esignal::Signal<> signalUnSelect; private: int32_t m_selectedLine; std::vector m_list; diff --git a/sources/appl/Gui/TagFileSelection.h b/sources/appl/Gui/TagFileSelection.h index 4f24b1a..638c99e 100644 --- a/sources/appl/Gui/TagFileSelection.h +++ b/sources/appl/Gui/TagFileSelection.h @@ -11,8 +11,8 @@ namespace appl { class TagFileSelection : public ewol::widget::PopUp { public: - esignal::ISignal signalSelect; - esignal::ISignal<> signalCancel; + esignal::Signal signalSelect; + esignal::Signal<> signalCancel; private: ememory::SharedPtr m_listTag; std::string m_eventNamed; diff --git a/sources/appl/Gui/WorkerCloseFile.h b/sources/appl/Gui/WorkerCloseFile.h index aab67a9..f4f9560 100644 --- a/sources/appl/Gui/WorkerCloseFile.h +++ b/sources/appl/Gui/WorkerCloseFile.h @@ -12,8 +12,8 @@ namespace appl { class WorkerCloseFile : public ewol::object::Worker { public: - esignal::ISignal<> signalCloseDone; - esignal::ISignal<> signalAbort; + esignal::Signal<> signalCloseDone; + esignal::Signal<> signalAbort; protected: // note : if == "" ==> current ... WorkerCloseFile(); diff --git a/sources/appl/Gui/WorkerSaveFile.h b/sources/appl/Gui/WorkerSaveFile.h index 57a131f..8e46f51 100644 --- a/sources/appl/Gui/WorkerSaveFile.h +++ b/sources/appl/Gui/WorkerSaveFile.h @@ -11,8 +11,8 @@ namespace appl { class WorkerSaveFile : public ewol::object::Worker { public: - esignal::ISignal<> signalSaveDone; - esignal::ISignal<> signalAbort; + esignal::Signal<> signalSaveDone; + esignal::Signal<> signalAbort; eproperty::Value propertyBufferName; eproperty::Value propertyForceSave; protected: diff --git a/sources/appl/HighlightPattern.cpp b/sources/appl/HighlightPattern.cpp index 87ba76f..4d71daf 100644 --- a/sources/appl/HighlightPattern.cpp +++ b/sources/appl/HighlightPattern.cpp @@ -39,7 +39,7 @@ void appl::HighlightPattern::setPatern(const std::string& _regExp, const std::st m_regexValue[0] = _regExp; m_regexValue[1] = _regExpStop; m_hasEndRegEx = _hasEndRegEx; - APPL_INFO("parse regex='" << _regExp << "' -> '" << _regExpStop << "'"); + APPL_DEBUG("parse regex='" << _regExp << "' -> '" << _regExpStop << "'"); m_hasParsingError = false; if (_regExp != "") { try { @@ -72,8 +72,7 @@ void appl::HighlightPattern::setColorGlyph(const std::string& _colorName) { void appl::HighlightPattern::display() { APPL_INFO("patern : '" << m_paternName << "' level=" << m_level ); APPL_INFO(" == > colorName '" << m_colorName << "'"); - //APPL_INFO(" == > regExp '" << m_regExp.getRegExp() << "'"); - APPL_INFO(" == > regex '" << m_regexValue << "'"); + APPL_INFO(" == > regex '" << m_regexValue[0] << "' ==> '" << m_regexValue[1] << "'"); } void appl::HighlightPattern::parseRules(const exml::Element& _child, int32_t _level) {