From db5492dd0ee02cfff7abd5710332f43483968bfa Mon Sep 17 00:00:00 2001 From: Sergey Belash Date: Mon, 31 Mar 2014 14:18:03 +0400 Subject: [PATCH] Refactoring: Config_Message --> Config_FeatureMessage, field names changed according to the code style (m_ --> my) --- src/Config/CMakeLists.txt | 4 +- ..._Message.cpp => Config_FeatureMessage.cpp} | 68 +++++++------------ ...nfig_Message.h => Config_FeatureMessage.h} | 23 +++---- src/Config/Config_XMLReader.h | 2 +- src/Model/Model_PluginManager.cxx | 2 +- src/XGUI/XGUI_Workshop.cpp | 2 +- 6 files changed, 38 insertions(+), 63 deletions(-) rename src/Config/{Config_Message.cpp => Config_FeatureMessage.cpp} (55%) rename src/Config/{Config_Message.h => Config_FeatureMessage.h} (69%) diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt index 01be1d384..e971c39a0 100644 --- a/src/Config/CMakeLists.txt +++ b/src/Config/CMakeLists.txt @@ -7,14 +7,14 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event) SET(PROJECT_HEADERS Config.h - Config_Message.h + Config_FeatureMessage.h Config_XMLReader.h Config_ModuleReader.h Config_FeatureReader.h ) SET(PROJECT_SOURCES - Config_Message.cpp + Config_FeatureMessage.cpp Config_XMLReader.cpp Config_ModuleReader.cpp Config_FeatureReader.cpp diff --git a/src/Config/Config_Message.cpp b/src/Config/Config_FeatureMessage.cpp similarity index 55% rename from src/Config/Config_Message.cpp rename to src/Config/Config_FeatureMessage.cpp index 8dd2b4131..896f62a13 100644 --- a/src/Config/Config_Message.cpp +++ b/src/Config/Config_FeatureMessage.cpp @@ -1,110 +1,88 @@ /* * */ -#include "Config_Message.h" +#include "Config_FeatureMessage.h" Config_FeatureMessage::Config_FeatureMessage(const Event_ID theId, const void* theParent) : Event_Message(theId, theParent) { - m_id = ""; - m_text = ""; - m_tooltip = ""; - m_icon = ""; - m_keysequence = ""; - - m_groupId = ""; - m_groupText = ""; - m_workbenchId = ""; - m_workbenchText = ""; + myId = ""; + myText = ""; + myTooltip = ""; + myIcon = ""; + myKeysequence = ""; + + myGroupId = ""; + myWorkbenchId = ""; } const std::string& Config_FeatureMessage::icon() const { - return m_icon; + return myIcon; } void Config_FeatureMessage::setIcon(const std::string& icon) { - m_icon = icon; + myIcon = icon; } const std::string& Config_FeatureMessage::id() const { - return m_id; + return myId; } void Config_FeatureMessage::setId(const std::string& id) { - m_id = id; + myId = id; } const std::string& Config_FeatureMessage::keysequence() const { - return m_keysequence; + return myKeysequence; } void Config_FeatureMessage::setKeysequence(const std::string& keysequence) { - m_keysequence = keysequence; + myKeysequence = keysequence; } const std::string& Config_FeatureMessage::text() const { - return m_text; + return myText; } void Config_FeatureMessage::setText(const std::string& text) { - m_text = text; + myText = text; } const std::string& Config_FeatureMessage::tooltip() const { - return m_tooltip; + return myTooltip; } const std::string& Config_FeatureMessage::groupId() const { - return m_groupId; + return myGroupId; } void Config_FeatureMessage::setGroupId(const std::string& groupId) { - m_groupId = groupId; -} - -const std::string& Config_FeatureMessage::groupText() const -{ - return m_groupText; -} - -void Config_FeatureMessage::setGroupText(const std::string& groupText) -{ - m_groupText = groupText; + myGroupId = groupId; } const std::string& Config_FeatureMessage::workbenchId() const { - return m_workbenchId; + return myWorkbenchId; } void Config_FeatureMessage::setWorkbenchId(const std::string& workbenchId) { - m_workbenchId = workbenchId; -} - -const std::string& Config_FeatureMessage::workbenchText() const -{ - return m_workbenchText; -} - -void Config_FeatureMessage::setWorkbenchText(const std::string& workbenchText) -{ - m_workbenchText = workbenchText; + myWorkbenchId = workbenchId; } void Config_FeatureMessage::setTooltip(const std::string& tooltip) { - m_tooltip = tooltip; + myTooltip = tooltip; } diff --git a/src/Config/Config_Message.h b/src/Config/Config_FeatureMessage.h similarity index 69% rename from src/Config/Config_Message.h rename to src/Config/Config_FeatureMessage.h index 5f39cbc01..ff14c46ae 100644 --- a/src/Config/Config_Message.h +++ b/src/Config/Config_FeatureMessage.h @@ -8,16 +8,15 @@ class CONFIG_EXPORT Config_FeatureMessage : public Event_Message { - std::string m_id; - std::string m_text; - std::string m_tooltip; - std::string m_icon; - std::string m_keysequence; - std::string m_groupId; - std::string m_groupText; - std::string m_workbenchId; - std::string m_workbenchText; + std::string myId; + std::string myText; + std::string myTooltip; + std::string myIcon; + std::string myKeysequence; + + std::string myGroupId; + std::string myWorkbenchId; public: //const Event_ID theID, const void* theSender = 0 @@ -29,20 +28,18 @@ public: const std::string& keysequence() const; const std::string& text() const; const std::string& tooltip() const; + const std::string& groupId() const; - const std::string& groupText() const; const std::string& workbenchId() const; - const std::string& workbenchText() const; void setIcon(const std::string& icon); void setId(const std::string& id); void setKeysequence(const std::string& keysequence); void setText(const std::string& text); void setTooltip(const std::string& tooltip); + void setGroupId(const std::string& groupId); - void setGroupText(const std::string& groupText); void setWorkbenchId(const std::string& workbenchId); - void setWorkbenchText(const std::string& workbenchText); }; #endif // CONFIG_MESSAGE_H diff --git a/src/Config/Config_XMLReader.h b/src/Config/Config_XMLReader.h index 7a42fcb09..798a975d2 100644 --- a/src/Config/Config_XMLReader.h +++ b/src/Config/Config_XMLReader.h @@ -9,7 +9,7 @@ #define CONFIG_XMLREADER_H_ #include "Config.h" -#include "Config_Message.h" +#include "Config_FeatureMessage.h" #include #include diff --git a/src/Model/Model_PluginManager.cxx b/src/Model/Model_PluginManager.cxx index bf7a06fcd..da03f3150 100644 --- a/src/Model/Model_PluginManager.cxx +++ b/src/Model/Model_PluginManager.cxx @@ -6,7 +6,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 44620ea9f..48bc0c087 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -8,7 +8,7 @@ #include "XGUI_Workshop.h" #include "XGUI_Viewer.h" -#include +#include #include #include -- 2.39.2