Correct compilation error

diff --git a/src/Config/Config_Translator.cpp b/src/Config/Config_Translator.cpp
index b6984f002c392ce619ed3093e9544382a7ae30b1..643681be20917c3e2225c807f683f2429abce1a0 100644 (file)
--- a/src/Config/Config_Translator.cpp
+++ b/src/Config/Config_Translator.cpp
@@ -94,7 +94,7 @@ bool Config_Translator::load(const std::string& theFileName)
 std::string Config_Translator::translate(std::shared_ptr<Events_InfoMessage> theInfo)
 {
   std::string aContext = theInfo->context();
-  std::string aMessage = theInfo->message();
+  std::string aMessage = theInfo->messageString();
   std::list<std::string> aParameters = theInfo->parameters();
   return translate(aContext, aMessage, aParameters);
 }

diff --git a/src/Events/Events_InfoMessage.h b/src/Events/Events_InfoMessage.h
index e441219553e9c1d838d35c9ba5370eee7bb2abb6..5a12a6bb4b07cffc2f1b1ea49fc9f9340ee5fa76 100644 (file)
--- a/src/Events/Events_InfoMessage.h
+++ b/src/Events/Events_InfoMessage.h
@@ -46,10 +46,10 @@ public:
 
   /// Set message string for translation
   /// \param theMsg the string of message
-  void setMessage(const std::string& theMsg) { myMessage = theMsg; } 
+  void setMessageString(const std::string& theMsg) { myMessage = theMsg; } 
 
   /// Returns message
-  std::string message() const { return myMessage; }
+  std::string messageString() const { return myMessage; }
 
   /// Add parameter for message string of string type
   /// \param theParam the parameter

diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index 3e3924954c2e6fab50a4bb4492bc0f487f404b04..d4d4dfc3e7e1f3c25a31dfba94b424967f4b34a0 100644 (file)
--- a/src/SketchPlugin/CMakeLists.txt
+++ b/src/SketchPlugin/CMakeLists.txt
@@ -112,7 +112,7 @@ INCLUDE_DIRECTORIES(
 INSTALL(TARGETS SketchPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Sketch)
-INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
+INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 
 ADD_UNIT_TESTS(TestSketchPointLine.py
                TestSketchArcCircle.py