Use correct "tr" call for translating dive mode names

Correctly use gettextFromC::instance()->tr(); instead of a simple
tr(); to translate the dive mode names.
This goes on top of 0bc9edf855caf95e2d58ccaf704ceeda079e06f1
and finally makes the whole thing work.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>

6 files changed, 14 insertions, 9 deletions

diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index f8c6f3418..ad48ba3d4 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -5,6 +5,7 @@
 #include "core/planner.h"
 #include "core/qthelper.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
+#include "core/gettextfromc.h"
 
 #include "qt-models/cylindermodel.h"
 #include "qt-models/models.h"
@@ -448,7 +449,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
 
 	// should be the same order as in dive_comp_type!
 	for (int i=0; i < FREEDIVE; i++)
-		rebreather_modes.append(QString(tr(divemode_text_ui[i])));
+		rebreather_modes.append(gettextFromC::instance()->tr(divemode_text_ui[i]));
 	ui.rebreathermode->insertItems(0, rebreather_modes);
 
 	modeMapper = new QSignalMapper(this);
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index fcd116a81..95fbb23c0 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -24,6 +24,7 @@
 #include "qt-models/filtermodels.h"
 #include "core/divesite.h"
 #include "core/subsurface-string.h"
+#include "core/gettextfromc.h"
 #include "desktop-widgets/locationinformation.h"
 
 #include "TabDiveExtraInfo.h"
@@ -111,7 +112,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
 	// This needs to be the same order as enum dive_comp_type in dive.h!
 	QStringList types = QStringList();
 	for (int i = 0; i < NUM_DIVEMODE; i++)
-		types.append(QString(tr(divemode_text_ui[i])));
+		types.append(gettextFromC::instance()->tr(divemode_text_ui[i]));
 	ui.DiveType->insertItems(0, types);
 	connect(ui.DiveType, SIGNAL(currentIndexChanged(int)), this, SLOT(divetype_Changed(int)));
 
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp
index 45b9da363..e106a3c26 100644
--- a/profile-widget/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
@@ -194,7 +194,7 @@ void DiveEventItem::setupToolTipString(struct gasmix *lastgasmix)
 		}
 		*lastgasmix = *mix;
 	} else if (same_string(internalEvent->name, "modechange")) {
-		name += QString(": %1").arg(tr(divemode_text_ui[internalEvent->value]));
+		name += QString(": %1").arg(gettextFromC::instance()->tr(divemode_text_ui[internalEvent->value]));
 	} else if (value) {
 		if (type == SAMPLE_EVENT_PO2 && same_string(internalEvent->name, "SP change")) {
 			name += QString(": %1bar").arg((double)value / 1000, 0, 'f', 1);
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 708b7a4fc..a296c25da 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -22,6 +22,7 @@
 #include "desktop-widgets/simplewidgets.h"
 #include "desktop-widgets/divepicturewidget.h"
 #include "core/qthelper.h"
+#include "core/gettextfromc.h"
 #endif
 
 #include <libdivecomputer/parser.h>
@@ -1436,21 +1437,21 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event)
 	QMenu *changeMode = m.addMenu(tr("Change divemode"));
 	if (divemode != OC) {
 		QAction *action = new QAction(&m);
-		action->setText(tr(divemode_text_ui[OC]));
+		action->setText(gettextFromC::instance()->tr(divemode_text_ui[OC]));
 		connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch()));
 		action->setData(event->globalPos());
 		changeMode->addAction(action);
 	}
 	if (divemode != CCR) {
 		QAction *action = new QAction(&m);
-		action->setText(tr(divemode_text_ui[CCR]));
+		action->setText(gettextFromC::instance()->tr(divemode_text_ui[CCR]));
 		connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch()));
 		action->setData(event->globalPos());
 		changeMode->addAction(action);
 	}
 	if (divemode != PSCR) {
 		QAction *action = new QAction(&m);
-		action->setText(tr(divemode_text_ui[PSCR]));
+		action->setText(gettextFromC::instance()->tr(divemode_text_ui[PSCR]));
 		connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch()));
 		action->setData(event->globalPos());
 		changeMode->addAction(action);
@@ -1622,7 +1623,7 @@ void ProfileWidget2::addDivemodeSwitch()
 	QAction *action = qobject_cast<QAction *>(sender());
 	QPointF scenePos = mapToScene(mapFromGlobal(action->data().toPoint()));
 	for (i = 0; i < UNDEF_COMP_TYPE; i++)
-		if (QString(tr(divemode_text_ui[i])) == action->text())
+		if (gettextFromC::instance()->tr(divemode_text_ui[i]) == action->text())
 			add_event(current_dc, lrint(timeAxis->valueAt(scenePos)), 8, 0, i,
 				QT_TRANSLATE_NOOP("gettextFromC", "modechange"));
 	invalidate_dive_cache(current_dive);
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 601b76cc0..1b24a816e 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -7,6 +7,7 @@
 #include "core/device.h"
 #include "core/qthelper.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
+#include "core/gettextfromc.h"
 #include <QApplication>
 #include <QTextDocument>
 #include <QtConcurrent>
@@ -252,7 +253,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const
 			else
 				return p.time / 60;
 		case DIVEMODE:
-			return QString(tr(divemode_text_ui[p.divemode]));
+			return gettextFromC::instance()->tr(divemode_text_ui[p.divemode]);
 		case GAS:
 			/* Check if we have the same gasmix two or more times
 			 * If yes return more verbose string */
diff --git a/qt-models/models.cpp b/qt-models/models.cpp
index 5d96d4da4..87dfe0cd5 100644
--- a/qt-models/models.cpp
+++ b/qt-models/models.cpp
@@ -7,6 +7,7 @@
  */
 #include "qt-models/models.h"
 #include "core/qthelper.h"
+#include "core/gettextfromc.h"
 
 #include <QLocale>
 
@@ -83,7 +84,7 @@ void DiveTypeSelectionModel::repopulate()
 {
 	QStringList modes = QStringList();
 	for (int i = 0; i < FREEDIVE; i++)
-		modes.append(QString(tr(divemode_text_ui[i])));
+		modes.append(gettextFromC::instance()->tr(divemode_text_ui[i]));
 	setStringList(modes);
 }