Change from gettextFromC::instance()->tr() to gettextFromC::tr();

Code cleanup.

Suggested-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>

2 files changed, 6 insertions, 6 deletions

diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp
index e106a3c26..13ab3770b 100644
--- a/profile-widget/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
@@ -168,7 +168,7 @@ void DiveEventItem::setupPixmap(struct gasmix *lastgasmix)
 void DiveEventItem::setupToolTipString(struct gasmix *lastgasmix)
 {
 	// we display the event on screen - so translate
-	QString name = gettextFromC::instance()->tr(internalEvent->name);
+	QString name = gettextFromC::tr(internalEvent->name);
 	int value = internalEvent->value;
 	int type = internalEvent->type;
 
@@ -194,7 +194,7 @@ void DiveEventItem::setupToolTipString(struct gasmix *lastgasmix)
 		}
 		*lastgasmix = *mix;
 	} else if (same_string(internalEvent->name, "modechange")) {
-		name += QString(": %1").arg(gettextFromC::instance()->tr(divemode_text_ui[internalEvent->value]));
+		name += QString(": %1").arg(gettextFromC::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 a296c25da..4f86760d1 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -1437,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(gettextFromC::instance()->tr(divemode_text_ui[OC]));
+		action->setText(gettextFromC::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(gettextFromC::instance()->tr(divemode_text_ui[CCR]));
+		action->setText(gettextFromC::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(gettextFromC::instance()->tr(divemode_text_ui[PSCR]));
+		action->setText(gettextFromC::tr(divemode_text_ui[PSCR]));
 		connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch()));
 		action->setData(event->globalPos());
 		changeMode->addAction(action);
@@ -1623,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 (gettextFromC::instance()->tr(divemode_text_ui[i]) == action->text())
+		if (gettextFromC::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);