diff --git a/sources/appl/TextPlugin.cpp b/sources/appl/TextPlugin.cpp index 6a9089a..ea4b751 100644 --- a/sources/appl/TextPlugin.cpp +++ b/sources/appl/TextPlugin.cpp @@ -35,7 +35,7 @@ appl::TextViewerPlugin::~TextViewerPlugin() { return; } m_isEnable = false; - onPluginDisable(); + onPluginGlobalDisable(); } void appl::TextViewerPlugin::setEnableStatus(bool _status) { @@ -44,9 +44,9 @@ void appl::TextViewerPlugin::setEnableStatus(bool _status) { } m_isEnable = _status; if (m_isEnable == true) { - onPluginEnable(); + onPluginGlobalEnable(); } else { - onPluginDisable(); + onPluginGlobalDisable(); } } diff --git a/sources/appl/TextPlugin.h b/sources/appl/TextPlugin.h index 1cc3bf9..e8584f1 100644 --- a/sources/appl/TextPlugin.h +++ b/sources/appl/TextPlugin.h @@ -42,13 +42,13 @@ namespace appl { /** * @brief On plugin global enable. */ - virtual void onPluginEnable() { + virtual void onPluginGlobalEnable() { // nothing to do here ... }; /** * @brief On plugin global disable. */ - virtual void onPluginDisable() { + virtual void onPluginGlobalDisable() { // nothing to do here ... }; /** diff --git a/sources/appl/TextPluginData.h b/sources/appl/TextPluginData.h index 389c0e9..9081d12 100644 --- a/sources/appl/TextPluginData.h +++ b/sources/appl/TextPluginData.h @@ -61,7 +61,7 @@ namespace appl { if (data == nullptr) { return false; } - return onReceiveMessageViewer(_textDrawer, _msg, *data); + return onDataReceiveMessageViewer(_textDrawer, _msg, *data); } bool onWrite(appl::TextViewer& _textDrawer, const appl::Buffer::Iterator& _pos, @@ -70,7 +70,7 @@ namespace appl { if (data == nullptr) { return false; } - return onWrite(_textDrawer, _pos, _data, *data); + return onDataWrite(_textDrawer, _pos, _data, *data); } bool onReplace(appl::TextViewer& _textDrawer, const appl::Buffer::Iterator& _pos, @@ -80,7 +80,7 @@ namespace appl { if (data == nullptr) { return false; } - return onReplace(_textDrawer, _pos, _data, _posEnd, *data); + return onDataReplace(_textDrawer, _pos, _data, _posEnd, *data); } bool onRemove(appl::TextViewer& _textDrawer, const appl::Buffer::Iterator& _pos, @@ -89,32 +89,32 @@ namespace appl { if (data == nullptr) { return false; } - return onRemove(_textDrawer, _pos, _posEnd, *data); + return onDataRemove(_textDrawer, _pos, _posEnd, *data); } public: - virtual bool onReceiveMessageViewer(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg, - TYPE& _data) { + virtual bool onDataReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg, + TYPE& _data) { return false; } - virtual bool onWrite(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const std::string& _strData, - TYPE& _data) { + virtual bool onDataWrite(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const std::string& _strData, + TYPE& _data) { return false; } - virtual bool onReplace(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const std::string& _strData, - const appl::Buffer::Iterator& _posEnd, - TYPE& _data) { + virtual bool onDataReplace(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const std::string& _strData, + const appl::Buffer::Iterator& _posEnd, + TYPE& _data) { return false; } - virtual bool onRemove(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const appl::Buffer::Iterator& _posEnd, - TYPE& _data) { + virtual bool onDataRemove(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const appl::Buffer::Iterator& _posEnd, + TYPE& _data) { return false; } virtual void remove(TYPE& _data) { diff --git a/sources/appl/TextPluginHistory.cpp b/sources/appl/TextPluginHistory.cpp index 46f4a9b..0793f8b 100644 --- a/sources/appl/TextPluginHistory.cpp +++ b/sources/appl/TextPluginHistory.cpp @@ -40,9 +40,9 @@ void appl::TextPluginHistory::onPluginDisable(appl::TextViewer& _textDrawer) { // TODO : unknow function ... } -bool appl::TextPluginHistory::onReceiveMessageViewer(appl::TextViewer& _textDrawer, - const ewol::object::Message& _msg, - appl::PluginHistoryData& _data) { +bool appl::TextPluginHistory::onDataReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg, + appl::PluginHistoryData& _data) { if (isEnable() == false) { return false; } @@ -111,10 +111,10 @@ void appl::TextPluginHistory::clearUndo(appl::PluginHistoryData& _data) { } -bool appl::TextPluginHistory::onWrite(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const std::string& _strData, - appl::PluginHistoryData& _data) { +bool appl::TextPluginHistory::onDataWrite(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const std::string& _strData, + appl::PluginHistoryData& _data) { if (isEnable() == false) { return false; } @@ -134,11 +134,11 @@ bool appl::TextPluginHistory::onWrite(appl::TextViewer& _textDrawer, return true; } -bool appl::TextPluginHistory::onReplace(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const std::string& _strData, - const appl::Buffer::Iterator& _posEnd, - appl::PluginHistoryData& _data) { +bool appl::TextPluginHistory::onDataReplace(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const std::string& _strData, + const appl::Buffer::Iterator& _posEnd, + appl::PluginHistoryData& _data) { if (isEnable() == false) { return false; } @@ -159,10 +159,10 @@ bool appl::TextPluginHistory::onReplace(appl::TextViewer& _textDrawer, return true; } -bool appl::TextPluginHistory::onRemove(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const appl::Buffer::Iterator& _posEnd, - appl::PluginHistoryData& _data) { +bool appl::TextPluginHistory::onDataRemove(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const appl::Buffer::Iterator& _posEnd, + appl::PluginHistoryData& _data) { if (isEnable() == false) { return false; } diff --git a/sources/appl/TextPluginHistory.h b/sources/appl/TextPluginHistory.h index 787d916..3d66d86 100644 --- a/sources/appl/TextPluginHistory.h +++ b/sources/appl/TextPluginHistory.h @@ -46,22 +46,22 @@ namespace appl { public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer); - 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, - appl::PluginHistoryData& _data); - virtual bool onReplace(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const std::string& _strData, - const appl::Buffer::Iterator& _posEnd, - appl::PluginHistoryData& _data); - virtual bool onRemove(appl::TextViewer& _textDrawer, - const appl::Buffer::Iterator& _pos, - const appl::Buffer::Iterator& _posEnd, - appl::PluginHistoryData& _data); + virtual bool onDataReceiveMessageViewer(appl::TextViewer& _textDrawer, + const ewol::object::Message& _msg, + appl::PluginHistoryData& _data); + virtual bool onDataWrite(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const std::string& _strData, + appl::PluginHistoryData& _data); + virtual bool onDataReplace(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const std::string& _strData, + const appl::Buffer::Iterator& _posEnd, + appl::PluginHistoryData& _data); + virtual bool onDataRemove(appl::TextViewer& _textDrawer, + const appl::Buffer::Iterator& _pos, + const appl::Buffer::Iterator& _posEnd, + appl::PluginHistoryData& _data); virtual void remove(appl::PluginHistoryData& _data) { clearRedo(_data); clearUndo(_data);