diff --git a/src/Gui/SoFCColorBar.cpp b/src/Gui/SoFCColorBar.cpp index 830313e04b..71e9c19497 100644 --- a/src/Gui/SoFCColorBar.cpp +++ b/src/Gui/SoFCColorBar.cpp @@ -319,7 +319,7 @@ void SoFCColorBar::handleEvent (SoHandleEventAction *action) QMenu menu; int i=0; for (std::vector::const_iterator it = _colorBars.begin(); it != _colorBars.end(); ++it) { - QAction* item = menu.addAction(QLatin1String((*it)->getColorBarName())); + QAction* item = menu.addAction(QObject::tr((*it)->getColorBarName())); item->setCheckable(true); item->setChecked((*it) == current); item->setData(QVariant(i++)); diff --git a/src/Gui/SoFCColorGradient.cpp b/src/Gui/SoFCColorGradient.cpp index 369060bdd5..e32553acbe 100644 --- a/src/Gui/SoFCColorGradient.cpp +++ b/src/Gui/SoFCColorGradient.cpp @@ -24,6 +24,7 @@ #ifndef _PreComp_ # include +# include # include # include # include @@ -83,6 +84,11 @@ void SoFCColorGradient::finish() atexit_cleanup(); } +const char* SoFCColorGradient::getColorBarName() const +{ + return QT_TRANSLATE_NOOP("QObject", "Color Gradient"); +} + void SoFCColorGradient::setMarkerLabel(const SoMFString& label) { coinRemoveAllChildren(labels); diff --git a/src/Gui/SoFCColorGradient.h b/src/Gui/SoFCColorGradient.h index 12f7d54b12..7fd6b42815 100644 --- a/src/Gui/SoFCColorGradient.h +++ b/src/Gui/SoFCColorGradient.h @@ -27,8 +27,6 @@ #include #include -#include // For translation functions - #include "SoFCColorBar.h" @@ -42,7 +40,6 @@ class GuiExport SoFCColorGradient : public SoFCColorBarBase { using inherited = SoFCColorBarBase; SO_NODE_HEADER(Gui::SoFCColorGradient); - Q_DECLARE_TR_FUNCTIONS(SoFCColorGradient); public: static void initClass(); @@ -74,7 +71,7 @@ public: */ void customize(SoFCColorBarBase*) override; /** Returns the name of the color bar. */ - const char* getColorBarName() const override { return tr("Color Gradient").toStdString().c_str(); } + const char* getColorBarName() const override; protected: /** diff --git a/src/Gui/SoFCColorLegend.cpp b/src/Gui/SoFCColorLegend.cpp index 621aae0e17..a94b0062ec 100644 --- a/src/Gui/SoFCColorLegend.cpp +++ b/src/Gui/SoFCColorLegend.cpp @@ -24,6 +24,7 @@ #ifndef _PreComp_ # include +# include # include # include # include @@ -81,6 +82,11 @@ void SoFCColorLegend::finish() atexit_cleanup(); } +const char* SoFCColorLegend::getColorBarName() const +{ + return QT_TRANSLATE_NOOP("QObject", "Color Legend"); +} + namespace { std::vector getLabelPositions(int num, const SbBox2f& bbox) { diff --git a/src/Gui/SoFCColorLegend.h b/src/Gui/SoFCColorLegend.h index 96980e6f9c..8353829243 100644 --- a/src/Gui/SoFCColorLegend.h +++ b/src/Gui/SoFCColorLegend.h @@ -26,8 +26,6 @@ #include #include -#include // For translation functions - #include "SoFCColorBar.h" @@ -41,7 +39,6 @@ class GuiExport SoFCColorLegend : public SoFCColorBarBase { using inherited = SoFCColorBarBase; SO_NODE_HEADER(Gui::SoFCColorLegend); - Q_DECLARE_TR_FUNCTIONS(SoFCColorLegend); public: static void initClass(); @@ -69,7 +66,7 @@ public: std::size_t countColors () const { return _currentLegend.hasNumberOfFields(); } void customize(SoFCColorBarBase*) override { } - const char* getColorBarName() const override { return tr("Color Legend").toStdString().c_str(); } + const char* getColorBarName() const override; // virtual void handleEvent(SoHandleEventAction * action); // virtual void GLRenderBelowPath(SoGLRenderAction * action);