From 798aa75abfe79ef25c9b4d3be4d48244ecb2fa7c Mon Sep 17 00:00:00 2001 From: vsv Date: Tue, 7 Jun 2016 18:25:19 +0300 Subject: [PATCH] Correct compilation error --- src/Config/Config_Translator.cpp | 2 +- src/Events/Events_InfoMessage.h | 4 ++-- src/SketchPlugin/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Config/Config_Translator.cpp b/src/Config/Config_Translator.cpp index b6984f002..643681be2 100644 --- 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 theInfo) { std::string aContext = theInfo->context(); - std::string aMessage = theInfo->message(); + std::string aMessage = theInfo->messageString(); std::list aParameters = theInfo->parameters(); return translate(aContext, aMessage, aParameters); } diff --git a/src/Events/Events_InfoMessage.h b/src/Events/Events_InfoMessage.h index e44121955..5a12a6bb4 100644 --- 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 3e3924954..d4d4dfc3e 100644 --- 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 -- 2.39.2