HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update esignal removing ISignal

Browse Source
This commit is contained in:
Edouard DUPIN 2016-08-04 22:23:19 +02:00
parent 4667e78aa6
commit da184c6767
9 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sources/appl/Buffer.cpp
View File

@ -1044,9 +1044,8 @@ namespace etk {
} }
}; };
#include <esignal/details/ISignal.hxx> #include <esignal/details/Signal.hxx>
// declare for signal event // declare for signal event
template class esignal::Signal<ememory::SharedPtr<appl::Buffer>>; ESIGNAL_DECLARE_SIGNAL(ememory::SharedPtr<appl::Buffer>);
template class esignal::ISignal<ememory::SharedPtr<appl::Buffer>>;

10
sources/appl/Buffer.h
View File

@ -12,7 +12,7 @@
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/Highlight.h> #include <appl/Highlight.h>
#include <esignal/ISignal.h> #include <esignal/Signal.h>
namespace appl { namespace appl {
@ -287,10 +287,10 @@ namespace appl {
friend class Buffer; friend class Buffer;
}; };
public: public:
esignal::ISignal<> signalIsModify; esignal::Signal<> signalIsModify;
esignal::ISignal<> signalIsSave; esignal::Signal<> signalIsSave;
esignal::ISignal<> signalSelectChange; esignal::Signal<> signalSelectChange;
esignal::ISignal<> signalChangeName; esignal::Signal<> signalChangeName;
protected: protected:
Buffer(); Buffer();
void init(); void init();

2
sources/appl/BufferManager.cpp
View File

@ -10,7 +10,7 @@
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
#include <ewol/object/Object.h> #include <ewol/object/Object.h>
#include <ewol/object/Manager.h> #include <ewol/object/Manager.h>
#include <esignal/ISignal.h> #include <esignal/Signal.h>
#include <gale/resource/Manager.h> #include <gale/resource/Manager.h>
appl::BufferManager::BufferManager() : appl::BufferManager::BufferManager() :

8
sources/appl/BufferManager.h
View File

@ -18,10 +18,10 @@ namespace appl {
// TODO: This is a service ... // TODO: This is a service ...
class BufferManager : public ewol::Object { class BufferManager : public ewol::Object {
public: public:
esignal::ISignal<std::string> signalNewBuffer; esignal::Signal<std::string> signalNewBuffer;
esignal::ISignal<std::string> signalSelectFile; esignal::Signal<std::string> signalSelectFile;
esignal::ISignal<> signalTextSelectionChange; esignal::Signal<> signalTextSelectionChange;
esignal::ISignal<ememory::SharedPtr<appl::Buffer>> signalRemoveBuffer; esignal::Signal<ememory::SharedPtr<appl::Buffer>> signalRemoveBuffer;
protected: protected:
BufferManager(); BufferManager();
public: public:

6
sources/appl/Gui/TagFileList.h
View File

@ -24,9 +24,9 @@ namespace appl {
}; };
class TagFileList : public ewol::widget::List { class TagFileList : public ewol::widget::List {
public: public:
esignal::ISignal<std::string> signalSelect; esignal::Signal<std::string> signalSelect;
esignal::ISignal<std::string> signalValidate; esignal::Signal<std::string> signalValidate;
esignal::ISignal<> signalUnSelect; esignal::Signal<> signalUnSelect;
private: private:
int32_t m_selectedLine; int32_t m_selectedLine;
std::vector<appl::TagListElement*> m_list; std::vector<appl::TagListElement*> m_list;

4
sources/appl/Gui/TagFileSelection.h
View File

@ -11,8 +11,8 @@
namespace appl { namespace appl {
class TagFileSelection : public ewol::widget::PopUp { class TagFileSelection : public ewol::widget::PopUp {
public: public:
esignal::ISignal<std::string> signalSelect; esignal::Signal<std::string> signalSelect;
esignal::ISignal<> signalCancel; esignal::Signal<> signalCancel;
private: private:
ememory::SharedPtr<appl::TagFileList> m_listTag; ememory::SharedPtr<appl::TagFileList> m_listTag;
std::string m_eventNamed; std::string m_eventNamed;

4
sources/appl/Gui/WorkerCloseFile.h
View File

@ -12,8 +12,8 @@
namespace appl { namespace appl {
class WorkerCloseFile : public ewol::object::Worker { class WorkerCloseFile : public ewol::object::Worker {
public: public:
esignal::ISignal<> signalCloseDone; esignal::Signal<> signalCloseDone;
esignal::ISignal<> signalAbort; esignal::Signal<> signalAbort;
protected: protected:
// note : if == "" ==> current ... // note : if == "" ==> current ...
WorkerCloseFile(); WorkerCloseFile();

4
sources/appl/Gui/WorkerSaveFile.h
View File

@ -11,8 +11,8 @@
namespace appl { namespace appl {
class WorkerSaveFile : public ewol::object::Worker { class WorkerSaveFile : public ewol::object::Worker {
public: public:
esignal::ISignal<> signalSaveDone; esignal::Signal<> signalSaveDone;
esignal::ISignal<> signalAbort; esignal::Signal<> signalAbort;
eproperty::Value<std::string> propertyBufferName; eproperty::Value<std::string> propertyBufferName;
eproperty::Value<bool> propertyForceSave; eproperty::Value<bool> propertyForceSave;
protected: protected:

5
sources/appl/HighlightPattern.cpp
View File

@ -39,7 +39,7 @@ void appl::HighlightPattern::setPatern(const std::string& _regExp, const std::st
m_regexValue[0] = _regExp; m_regexValue[0] = _regExp;
m_regexValue[1] = _regExpStop; m_regexValue[1] = _regExpStop;
m_hasEndRegEx = _hasEndRegEx; m_hasEndRegEx = _hasEndRegEx;
APPL_INFO("parse regex='" << _regExp << "' -> '" << _regExpStop << "'"); APPL_DEBUG("parse regex='" << _regExp << "' -> '" << _regExpStop << "'");
m_hasParsingError = false; m_hasParsingError = false;
if (_regExp != "") { if (_regExp != "") {
try { try {
@ -72,8 +72,7 @@ void appl::HighlightPattern::setColorGlyph(const std::string& _colorName) {
void appl::HighlightPattern::display() { void appl::HighlightPattern::display() {
APPL_INFO("patern : '" << m_paternName << "' level=" << m_level ); APPL_INFO("patern : '" << m_paternName << "' level=" << m_level );
APPL_INFO(" == > colorName '" << m_colorName << "'"); APPL_INFO(" == > colorName '" << m_colorName << "'");
//APPL_INFO(" == > regExp '" << m_regExp.getRegExp() << "'"); APPL_INFO(" == > regex '" << m_regexValue[0] << "' ==> '" << m_regexValue[1] << "'");
APPL_INFO(" == > regex '" << m_regexValue << "'");
} }
void appl::HighlightPattern::parseRules(const exml::Element& _child, int32_t _level) { void appl::HighlightPattern::parseRules(const exml::Element& _child, int32_t _level) {