diff --git a/sources/appl/Buffer.h b/sources/appl/Buffer.h index 25e497c..0d471db 100644 --- a/sources/appl/Buffer.h +++ b/sources/appl/Buffer.h @@ -68,7 +68,7 @@ namespace appl { /** * @brief Basic destructor */ - ~Iterator() { + virtual ~Iterator() { m_current = 0; m_data = NULL; m_value = u32char::Null; @@ -294,7 +294,7 @@ namespace appl { static const char* const eventChangeName; public: Buffer(); - ~Buffer(); + virtual ~Buffer(); private: bool m_hasFileName; //!< when new file, the buffer has no name ==> but it might be reference with a single name ... std::string m_fileName; //!< name of the file (with his path) diff --git a/sources/appl/BufferManager.h b/sources/appl/BufferManager.h index 9ddf2b1..75dac80 100644 --- a/sources/appl/BufferManager.h +++ b/sources/appl/BufferManager.h @@ -20,7 +20,7 @@ namespace appl { protected: BufferManager(); public: - ~BufferManager(); + virtual ~BufferManager(); private: std::list> m_list; // list of all buffer curently open public: diff --git a/sources/appl/GlyphDecoration.h b/sources/appl/GlyphDecoration.h index 7b0c222..2c5198a 100644 --- a/sources/appl/GlyphDecoration.h +++ b/sources/appl/GlyphDecoration.h @@ -17,7 +17,7 @@ namespace appl { public: // Constructeur GlyphDecoration(const std::string& _newColorName = "no_name"); - ~GlyphDecoration() { + virtual ~GlyphDecoration() { // nothing to do ... }; private: diff --git a/sources/appl/Gui/BufferView.h b/sources/appl/Gui/BufferView.h index e8807ab..00ffae1 100644 --- a/sources/appl/Gui/BufferView.h +++ b/sources/appl/Gui/BufferView.h @@ -25,7 +25,7 @@ namespace appl { m_buffer(_buffer) { }; - ~dataBufferStruct() { }; + virtual ~dataBufferStruct() { }; }; }; @@ -51,7 +51,7 @@ class BufferView : public ewol::widget::List { public: // Constructeur BufferView(); - ~BufferView(); + virtual ~BufferView(); // Derived function virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onObjectRemove(const ewol::object::Shared& _object); diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp index d5c82a8..f46f73b 100644 --- a/sources/appl/Gui/MainWindows.cpp +++ b/sources/appl/Gui/MainWindows.cpp @@ -165,7 +165,7 @@ MainWindows::MainWindows() { mySizerVert2->subWidgetAdd(myTextView); */ // search area : - ewol::object::Shared mySearch = ewol::object::makeShared(new Search()); + ewol::object::Shared mySearch = ewol::object::makeShared(new appl::widget::Search()); mySizerVert2->subWidgetAdd(mySearch); mySizerHori = ewol::object::makeShared(new ewol::widget::Sizer(ewol::widget::Sizer::modeHori)); diff --git a/sources/appl/Gui/MainWindows.h b/sources/appl/Gui/MainWindows.h index e7bedd9..fa1a5e8 100644 --- a/sources/appl/Gui/MainWindows.h +++ b/sources/appl/Gui/MainWindows.h @@ -23,7 +23,7 @@ class MainWindows : public ewol::widget::Windows { public: // Constructeur MainWindows(); - ~MainWindows(); + virtual ~MainWindows(); private: ewol::object::Shared m_bufferManager; //!< handle on the buffer manager /** diff --git a/sources/appl/Gui/Search.cpp b/sources/appl/Gui/Search.cpp index 8ab85a0..a4d9fbe 100644 --- a/sources/appl/Gui/Search.cpp +++ b/sources/appl/Gui/Search.cpp @@ -28,7 +28,7 @@ const char* const l_eventWrapCb = "appl-wrap-CheckBox"; const char* const l_eventForwardCb = "appl-forward-CheckBox"; const char* const l_eventHideBt = "appl-hide-button"; -Search::Search() : +appl::widget::Search::Search() : ewol::widget::Composer(ewol::widget::Composer::file, "DATA:GUI-Search.xml"), m_viewerManager(NULL), m_forward(true), @@ -36,8 +36,8 @@ Search::Search() : m_wrap(true), m_searchEntry(NULL), m_replaceEntry(NULL) { - addObjectType("appl::Search"); - // load buffer manager: + addObjectType("appl::widget::Search"); + // load buffer manager:onObjectRemove m_viewerManager = appl::ViewerManager::keep(); // link event registerOnEventNameWidget(this, "SEARCH:close", "pressed", l_eventHideBt); @@ -63,11 +63,11 @@ Search::Search() : hide(); } -Search::~Search() { +appl::widget::Search::~Search() { } -void Search::find() { +void appl::widget::Search::find() { if (m_viewerManager == NULL) { APPL_WARNING("No viewer manager selected!!!"); return; @@ -103,7 +103,7 @@ void Search::find() { } } -void Search::replace() { +void appl::widget::Search::replace() { if (m_viewerManager == NULL) { APPL_WARNING("No viewer manager selected!!!"); return; @@ -121,7 +121,7 @@ void Search::replace() { } -void Search::onReceiveMessage(const ewol::object::Message& _msg) { +void appl::widget::Search::onReceiveMessage(const ewol::object::Message& _msg) { ewol::widget::Composer::onReceiveMessage(_msg); APPL_INFO("Search receive message : " << _msg); if ( _msg.getMessage() == l_eventSearchEntry) { @@ -162,7 +162,7 @@ void Search::onReceiveMessage(const ewol::object::Message& _msg) { } } -void Search::onObjectRemove(const ewol::object::Shared _object) { +void appl::widget::Search::onObjectRemove(const ewol::object::Shared& _object) { ewol::widget::Composer::onObjectRemove(_object); if (_object == m_searchEntry) { m_searchEntry.reset(); diff --git a/sources/appl/Gui/Search.h b/sources/appl/Gui/Search.h index c535d3a..52b8204 100644 --- a/sources/appl/Gui/Search.h +++ b/sources/appl/Gui/Search.h @@ -14,35 +14,37 @@ #include #include #include - -class Search : public ewol::widget::Composer { - private: - ewol::object::Shared m_viewerManager; //!< handle on the buffer manager - bool m_forward; - bool m_caseSensitive; - bool m_wrap; - ewol::object::Shared m_searchEntry; - ewol::object::Shared m_replaceEntry; - std::u32string m_searchData; - std::u32string m_replaceData; - public: - // Constructeur - Search(); - ~Search(); - private: - /** - * @brief Find the next element that corespond at the search - */ - void find(); - /** - * @brief Replace the current selected text. - */ - void replace(); - public: // derived function - virtual void onReceiveMessage(const ewol::object::Message& _msg); - virtual void onObjectRemove(const ewol::object::Shared _removeObject); +namespace appl { + namespace widget { + class Search : public ewol::widget::Composer { + private: + ewol::object::Shared m_viewerManager; //!< handle on the buffer manager + bool m_forward; + bool m_caseSensitive; + bool m_wrap; + ewol::object::Shared m_searchEntry; + ewol::object::Shared m_replaceEntry; + std::u32string m_searchData; + std::u32string m_replaceData; + public: + // Constructeur + Search(); + virtual ~Search(); + private: + /** + * @brief Find the next element that corespond at the search + */ + void find(); + /** + * @brief Replace the current selected text. + */ + void replace(); + public: // derived function + virtual void onReceiveMessage(const ewol::object::Message& _msg); + virtual void onObjectRemove(const ewol::object::Shared& _object); + }; + }; }; - #endif diff --git a/sources/appl/Gui/TagFileList.h b/sources/appl/Gui/TagFileList.h index a13f07b..3827990 100644 --- a/sources/appl/Gui/TagFileList.h +++ b/sources/appl/Gui/TagFileList.h @@ -28,7 +28,7 @@ namespace appl { fileLine(_line) { }; - ~TagListElement() { + virtual ~TagListElement() { }; }; @@ -44,7 +44,7 @@ namespace appl { int32_t m_colorIdBackgroundSelected; //!< Color of line selected. public: TagFileList(); - ~TagFileList(); + virtual ~TagFileList(); // display API : virtual etk::Color<> getBasicBG(); uint32_t getNuberOfColomn(); diff --git a/sources/appl/Gui/TextViewer.cpp b/sources/appl/Gui/TextViewer.cpp index 52e5e0f..ffbe683 100644 --- a/sources/appl/Gui/TextViewer.cpp +++ b/sources/appl/Gui/TextViewer.cpp @@ -623,7 +623,7 @@ void appl::TextViewer::onReceiveMessage(const ewol::object::Message& _msg) { ewol::widget::WidgetScrolled::onReceiveMessage(_msg); APPL_VERBOSE("receive msg: " << _msg); // First call plugin - if (appl::textPluginManager::onReceiveMessage(*this, _msg) == true) { + if (appl::textPluginManager::onReceiveMessageViewer(*this, _msg) == true) { markToRedraw(); return; } diff --git a/sources/appl/Gui/ViewerManager.h b/sources/appl/Gui/ViewerManager.h index 9b2445b..42c5e4e 100644 --- a/sources/appl/Gui/ViewerManager.h +++ b/sources/appl/Gui/ViewerManager.h @@ -21,7 +21,7 @@ namespace appl { protected: ViewerManager(); public: - ~ViewerManager(); + virtual ~ViewerManager(); private: ewol::object::Shared m_bufferManager; //!< handle on the buffer manager ewol::object::Shared m_viewer; diff --git a/sources/appl/Highlight.cpp b/sources/appl/Highlight.cpp index 18b9607..bcf53ec 100644 --- a/sources/appl/Highlight.cpp +++ b/sources/appl/Highlight.cpp @@ -25,14 +25,14 @@ #define HL2_DEBUG APPL_VERBOSE void appl::Highlight::parseRules(exml::Element* _child, - std::vector& _mListPatern, + std::vector>& _mListPatern, int32_t _level) { // Create the patern ... HighlightPattern *myPattern = new HighlightPattern(m_paintingProperties); // parse under Element myPattern->parseRules(_child, _level); // add element in the list - _mListPatern.push_back(myPattern); + _mListPatern.push_back(std::unique_ptr(myPattern)); } appl::Highlight::Highlight(const std::string& _xmlFilename, const std::string& _colorFile) : @@ -101,16 +101,11 @@ appl::Highlight::Highlight(const std::string& _xmlFilename, const std::string& _ } appl::Highlight::~Highlight() { - // clean all Element - for (int32_t iii = 0; iii < m_listHighlightPass1.size(); ++iii) { - if (m_listHighlightPass1[iii] != NULL) { - delete(m_listHighlightPass1[iii]); - m_listHighlightPass1[iii] = NULL; - } - } // clear the compleate list m_listHighlightPass1.clear(); // clear the compleate list + m_listHighlightPass2.clear(); + // clear the compleate list m_listExtentions.clear(); } diff --git a/sources/appl/Highlight.h b/sources/appl/Highlight.h index baeec0d..a481694 100644 --- a/sources/appl/Highlight.h +++ b/sources/appl/Highlight.h @@ -25,6 +25,7 @@ namespace appl { }; }; +#include #include #include #include @@ -39,7 +40,7 @@ namespace appl { // Constructeur Highlight(const std::string& _xmlFilename, const std::string& _colorFile); public: - ~Highlight(); + virtual ~Highlight(); private: std::string m_typeName; //!< descriptive string type like "C/C++" public: @@ -61,12 +62,12 @@ namespace appl { etk::Buffer &_buffer); private: void parseRules(exml::Element* _child, - std::vector &_mListPatern, + std::vector> &_mListPatern, int32_t _level); std::string m_styleName; //!< curent style name (like "c++" or "c" or "script Bash") std::vector m_listExtentions; //!< List of possible extention for this high-light, like : ".c", ".cpp", ".h" - std::vector m_listHighlightPass1; //!< List of ALL hightlight modules (pass 1 == > when we load and wride data on the buffer) - std::vector m_listHighlightPass2; //!< List of ALL hightlight modules (pass 2 == > When we display the buffer( only the display area (100 lines)) ) + std::vector> m_listHighlightPass1; //!< List of ALL hightlight modules (pass 1 == > when we load and wride data on the buffer) + std::vector> m_listHighlightPass2; //!< List of ALL hightlight modules (pass 2 == > When we display the buffer( only the display area (100 lines)) ) public: /** * @brief keep the resource pointer. diff --git a/sources/appl/HighlightPattern.cpp b/sources/appl/HighlightPattern.cpp index c5bcb9b..cf50768 100644 --- a/sources/appl/HighlightPattern.cpp +++ b/sources/appl/HighlightPattern.cpp @@ -16,24 +16,17 @@ appl::HighlightPattern::HighlightPattern(const ewol::object::Shared& _glyphPainting) : m_glyphPainting(_glyphPainting), m_paternName(""), - m_regExpStart(NULL), - m_regExpStop(NULL), + m_regExpStart(nullptr), + m_regExpStop(nullptr), m_colorName(""), m_escapeChar(u32char::Null), m_multiline(false), m_level(0) { - m_regExpStart = new etk::RegExp(); + m_regExpStart = std::unique_ptr>(new etk::RegExp()); } appl::HighlightPattern::~HighlightPattern() { - if (m_regExpStart != NULL) { - delete(m_regExpStart); - m_regExpStart = NULL; - } - if (m_regExpStop != NULL) { - delete(m_regExpStop); - m_regExpStop = NULL; - } + } void appl::HighlightPattern::setPaternStart(std::string& _regExp) { @@ -44,12 +37,9 @@ void appl::HighlightPattern::setPaternStart(std::string& _regExp) { } void appl::HighlightPattern::setPaternStop(std::string& _regExp) { - if (m_regExpStop != NULL) { - delete(m_regExpStop); - m_regExpStop = NULL; - } + m_regExpStop.reset(); if (_regExp.size() != 0) { - m_regExpStop = new etk::RegExp(); + m_regExpStop = std::unique_ptr>(new etk::RegExp()); if (m_regExpStop != NULL) { m_regExpStop->compile(_regExp); } else { diff --git a/sources/appl/HighlightPattern.h b/sources/appl/HighlightPattern.h index 6f8bdf4..4611254 100644 --- a/sources/appl/HighlightPattern.h +++ b/sources/appl/HighlightPattern.h @@ -33,7 +33,7 @@ namespace appl { public: // Constructeur HighlightPattern(const ewol::object::Shared& _glyphPainting); - ~HighlightPattern(); + virtual ~HighlightPattern(); private: std::string m_paternName; //!< Current style name (like "c++" or "c" or "script Bash") public: @@ -44,11 +44,11 @@ namespace appl { return m_paternName; }; private: - etk::RegExp* m_regExpStart; //!< Start of Regular expression + std::unique_ptr> m_regExpStart; //!< Start of Regular expression public: void setPaternStart(std::string& _regExp); private: - etk::RegExp* m_regExpStop; //!< Stop of Regular Expression + std::unique_ptr> m_regExpStop; //!< Stop of Regular Expression public: void setPaternStop(std::string& _regExp); private: diff --git a/sources/appl/TextPlugin.h b/sources/appl/TextPlugin.h index a3627b2..98461a7 100644 --- a/sources/appl/TextPlugin.h +++ b/sources/appl/TextPlugin.h @@ -186,8 +186,8 @@ namespace appl { * @param[in] _msg Generic message. * @return true if the event might not propagate anymore */ - virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg) { + virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg) { return false; } protected: diff --git a/sources/appl/TextPluginAutoIndent.h b/sources/appl/TextPluginAutoIndent.h index c95f632..df7d6e5 100644 --- a/sources/appl/TextPluginAutoIndent.h +++ b/sources/appl/TextPluginAutoIndent.h @@ -19,7 +19,7 @@ namespace appl { class TextPluginAutoIndent : public appl::TextViewerPlugin { public: TextPluginAutoIndent(); - ~TextPluginAutoIndent() { + virtual ~TextPluginAutoIndent() { // nothing to do ... }; public: diff --git a/sources/appl/TextPluginCopy.cpp b/sources/appl/TextPluginCopy.cpp index b4cd9ba..a5b1641 100644 --- a/sources/appl/TextPluginCopy.cpp +++ b/sources/appl/TextPluginCopy.cpp @@ -34,8 +34,8 @@ void appl::TextPluginCopy::onPluginDisable(appl::TextViewer& _textDrawer) { // TODO : unknow function ... } -bool appl::TextPluginCopy::onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg) { +bool appl::TextPluginCopy::onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg) { if (isEnable() == false) { return false; } diff --git a/sources/appl/TextPluginCopy.h b/sources/appl/TextPluginCopy.h index 3a88432..03ef08f 100644 --- a/sources/appl/TextPluginCopy.h +++ b/sources/appl/TextPluginCopy.h @@ -19,13 +19,13 @@ namespace appl { class TextPluginCopy : public appl::TextViewerPlugin { public: TextPluginCopy(); - ~TextPluginCopy() { + virtual ~TextPluginCopy() { // nothing to do ... }; public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer); - virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg); + virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg); }; }; diff --git a/sources/appl/TextPluginCtags.cpp b/sources/appl/TextPluginCtags.cpp index f595b95..32867e4 100644 --- a/sources/appl/TextPluginCtags.cpp +++ b/sources/appl/TextPluginCtags.cpp @@ -168,8 +168,8 @@ void appl::TextPluginCtags::onReceiveMessage(const ewol::object::Message& _msg) jumpFile(tmp, lineID - 1); } } -bool appl::TextPluginCtags::onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg) { +bool appl::TextPluginCtags::onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg) { if (isEnable() == false) { return false; } diff --git a/sources/appl/TextPluginCtags.h b/sources/appl/TextPluginCtags.h index 85a1fb2..ba7eafb 100644 --- a/sources/appl/TextPluginCtags.h +++ b/sources/appl/TextPluginCtags.h @@ -36,12 +36,12 @@ namespace appl { ewol::object::Shared m_bufferManager; //!< handle on the buffer manager public: TextPluginCtags(); - ~TextPluginCtags(); + virtual ~TextPluginCtags(); public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer); - virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg); + virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg); // internal message : virtual void onReceiveMessage(const ewol::object::Message& _msg); }; diff --git a/sources/appl/TextPluginData.h b/sources/appl/TextPluginData.h index 54692bd..ca83194 100644 --- a/sources/appl/TextPluginData.h +++ b/sources/appl/TextPluginData.h @@ -50,13 +50,13 @@ namespace appl { return data; } protected: // Wrap all element with their internal data: (do not use theses function) - bool onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg) { + bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg) { TYPE* data = getDataRef(_textDrawer); if (data == NULL) { return false; } - return onReceiveMessage(_textDrawer, _msg, *data); + return onReceiveMessageViewer(_textDrawer, _msg, *data); } bool onWrite(appl::TextViewer& _textDrawer, const appl::Buffer::Iterator& _pos, @@ -88,9 +88,9 @@ namespace appl { } public: - virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg, - TYPE& _data) { + virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg, + TYPE& _data) { return false; } virtual bool onWrite(appl::TextViewer& _textDrawer, diff --git a/sources/appl/TextPluginHistory.cpp b/sources/appl/TextPluginHistory.cpp index 96734d9..69e1869 100644 --- a/sources/appl/TextPluginHistory.cpp +++ b/sources/appl/TextPluginHistory.cpp @@ -35,9 +35,9 @@ void appl::TextPluginHistory::onPluginDisable(appl::TextViewer& _textDrawer) { // TODO : unknow function ... } -bool appl::TextPluginHistory::onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg, - appl::PluginHistoryData& _data) { +bool appl::TextPluginHistory::onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg, + appl::PluginHistoryData& _data) { if (isEnable() == false) { return false; } diff --git a/sources/appl/TextPluginHistory.h b/sources/appl/TextPluginHistory.h index ff99d5c..e77d400 100644 --- a/sources/appl/TextPluginHistory.h +++ b/sources/appl/TextPluginHistory.h @@ -43,9 +43,9 @@ namespace appl { public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer); - virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg, - appl::PluginHistoryData& _data); + virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg, + appl::PluginHistoryData& _data); virtual bool onWrite(appl::TextViewer& _textDrawer, const appl::Buffer::Iterator& _pos, const std::string& _strData, diff --git a/sources/appl/TextPluginManager.cpp b/sources/appl/TextPluginManager.cpp index 30a5839..042f61d 100644 --- a/sources/appl/TextPluginManager.cpp +++ b/sources/appl/TextPluginManager.cpp @@ -43,7 +43,7 @@ static std::vector>& getListOnRemov static std::vector> s_list; return s_list; } -static std::vector>& getListOnReceiveMessage() { +static std::vector>& getListonReceiveMessageViewer() { static std::vector> s_list; return s_list; } @@ -63,7 +63,7 @@ void appl::textPluginManager::unInit() { getListOnWrite().clear(); getListOnReplace().clear(); getListOnRemove().clear(); - getListOnReceiveMessage().clear(); + getListonReceiveMessageViewer().clear(); getListOnCursorMove().clear(); getList().clear(); } @@ -99,7 +99,7 @@ void appl::textPluginManager::addPlugin(const ewol::object::SharedisAvaillableOnReceiveMessage() == true) { - getListOnReceiveMessage().push_back(_plugin); + getListonReceiveMessageViewer().push_back(_plugin); } if (_plugin->isAvaillableOnCursorMove() == true) { getListOnCursorMove().push_back(_plugin); @@ -193,13 +193,13 @@ bool appl::textPluginManager::onRemove(appl::TextViewer& _textDrawer, return false; } -bool appl::textPluginManager::onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg) { - for (auto &it : getListOnReceiveMessage()) { +bool appl::textPluginManager::onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg) { + for (auto &it : getListonReceiveMessageViewer()) { if (it == NULL) { continue; } - if (it->onReceiveMessage(_textDrawer, _msg) == true ) { + if (it->onReceiveMessageViewer(_textDrawer, _msg) == true ) { return true; } } diff --git a/sources/appl/TextPluginManager.h b/sources/appl/TextPluginManager.h index 512fbbc..85393a9 100644 --- a/sources/appl/TextPluginManager.h +++ b/sources/appl/TextPluginManager.h @@ -98,8 +98,8 @@ namespace appl { * @param[in] _msg Generic message. * @return true if the event might not propagate anymore */ - bool onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg); + bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg); /** * @brief Called when Cursor move of position. * @param[in] _widget Reference on the widget caller. diff --git a/sources/appl/TextPluginMultiLineTab.h b/sources/appl/TextPluginMultiLineTab.h index 692ce16..b849b54 100644 --- a/sources/appl/TextPluginMultiLineTab.h +++ b/sources/appl/TextPluginMultiLineTab.h @@ -19,7 +19,7 @@ namespace appl { class TextPluginMultiLineTab : public appl::TextViewerPlugin { public: TextPluginMultiLineTab(); - ~TextPluginMultiLineTab() { + virtual ~TextPluginMultiLineTab() { // nothing to do ... }; public: diff --git a/sources/appl/TextPluginRmLine.cpp b/sources/appl/TextPluginRmLine.cpp index aa36344..deb6de7 100644 --- a/sources/appl/TextPluginRmLine.cpp +++ b/sources/appl/TextPluginRmLine.cpp @@ -30,8 +30,8 @@ void appl::TextPluginRmLine::onPluginDisable(appl::TextViewer& _textDrawer) { // TODO : unknow function ... } -bool appl::TextPluginRmLine::onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg) { +bool appl::TextPluginRmLine::onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg) { if (isEnable() == false) { return false; } diff --git a/sources/appl/TextPluginRmLine.h b/sources/appl/TextPluginRmLine.h index ce31ac8..634d6bb 100644 --- a/sources/appl/TextPluginRmLine.h +++ b/sources/appl/TextPluginRmLine.h @@ -19,13 +19,13 @@ namespace appl { class TextPluginRmLine : public appl::TextViewerPlugin { public: TextPluginRmLine(); - ~TextPluginRmLine() { + virtual ~TextPluginRmLine() { // nothing to do ... }; public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer); - virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg); + virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg); }; }; diff --git a/sources/appl/TextPluginSelectAll.cpp b/sources/appl/TextPluginSelectAll.cpp index 4045dca..a59bc55 100644 --- a/sources/appl/TextPluginSelectAll.cpp +++ b/sources/appl/TextPluginSelectAll.cpp @@ -32,8 +32,8 @@ void appl::TextPluginSelectAll::onPluginDisable(appl::TextViewer& _textDrawer) { // TODO : unknow function ... } -bool appl::TextPluginSelectAll::onReceiveMessage(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg) { +bool appl::TextPluginSelectAll::onReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg) { if (isEnable() == false) { return false; } diff --git a/sources/appl/TextPluginSelectAll.h b/sources/appl/TextPluginSelectAll.h index 8278af0..9ad156b 100644 --- a/sources/appl/TextPluginSelectAll.h +++ b/sources/appl/TextPluginSelectAll.h @@ -19,13 +19,13 @@ namespace appl { class TextPluginSelectAll : public appl::TextViewerPlugin { public: TextPluginSelectAll(); - ~TextPluginSelectAll() { + virtual ~TextPluginSelectAll() { // nothing to do ... }; public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer); - virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg); + virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg); }; }; diff --git a/sources/appl/global.h b/sources/appl/global.h index 536e234..c36085e 100644 --- a/sources/appl/global.h +++ b/sources/appl/global.h @@ -39,7 +39,7 @@ namespace globals class ParameterGlobalsGui : public ewol::widget::Sizer { public : ParameterGlobalsGui(); - ~ParameterGlobalsGui(); + virtual ~ParameterGlobalsGui(); // herited function virtual void onReceiveMessage(const ewol::object::Message& _msg); }; diff --git a/sources/lutin_edn.py b/sources/lutin_edn.py index 3113b6b..33c41ed 100755 --- a/sources/lutin_edn.py +++ b/sources/lutin_edn.py @@ -12,6 +12,7 @@ def create(target): # module name is 'edn' and type binary. myModule = module.Module(__file__, 'edn', 'PACKAGE') + myModule.add_extra_compile_flags() # add the file to compile: myModule.add_src_file([ 'appl/ctags/readtags.cpp'])