mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Localization: remove gettextFromC::instance()

Browse source 
There were a handfull instances of the kind
1) gettextFromC::instance()->tr(...)
2) gettextFromC::instance()->trGettext(...)

1) is pointless, as tr is a static function.

All instances of 2) were likewise pointless, because trGettext()
returns a C-string, which was then immediately converted to a
QString.

Thus, replace both constructs by gettextFromC::tr(...).

After this change there was only one user of gettextFromC::instance()
left, viz. the C-interface funtion trGettext(). Therefore, remove
gettextFromC::instance() and do all the caching / translating
directly in the global trGettext().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-06-17 21:03:16 +02:00 • committed by Tomaz Canabrava
parent 61b8add590
commit 879cb73b8b
5 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/gettextfromc.cpp
View file

@ -1,28 +1,13 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <QCoreApplication>
#include <QString>
#include "gettextfromc.h" #include "gettextfromc.h"
#include <QHash>
const char *gettextFromC::trGettext(const char *text) static QHash<QByteArray, QByteArray> translationCache;
{
QByteArray &result = translationCache[QByteArray(text)];
if (result.isEmpty())
result = translationCache[QByteArray(text)] = trUtf8(text).toUtf8();
return result.constData();
}
void gettextFromC::reset(void)
{
translationCache.clear();
}
gettextFromC *gettextFromC::instance()
{
static gettextFromC self;
return &self;
}
extern "C" const char *trGettext(const char *text) extern "C" const char *trGettext(const char *text)
{ {
return gettextFromC::instance()->trGettext(text); QByteArray &result = translationCache[QByteArray(text)];
if (result.isEmpty())
result = gettextFromC::tr(text).toUtf8();
return result.constData();
} }

6
core/gettextfromc.h
View file

@ -2,18 +2,12 @@
#ifndef GETTEXTFROMC_H #ifndef GETTEXTFROMC_H
#define GETTEXTFROMC_H #define GETTEXTFROMC_H
#include <QHash>
#include <QCoreApplication> #include <QCoreApplication>
extern "C" const char *trGettext(const char *text); extern "C" const char *trGettext(const char *text);
class gettextFromC { class gettextFromC {
Q_DECLARE_TR_FUNCTIONS(gettextFromC) Q_DECLARE_TR_FUNCTIONS(gettextFromC)
public:
static gettextFromC *instance();
const char *trGettext(const char *text);
void reset(void);
QHash<QByteArray, QByteArray> translationCache;
}; };
#endif // GETTEXTFROMC_H #endif // GETTEXTFROMC_H

2
desktop-widgets/modeldelegates.cpp
View file

@ -301,7 +301,7 @@ QWidget *TankUseDelegate::createEditor(QWidget * parent, const QStyleOptionViewI
{ {
QComboBox *comboBox = new QComboBox(parent); QComboBox *comboBox = new QComboBox(parent);
for (int i = 0; i < NUM_GAS_USE; i++) for (int i = 0; i < NUM_GAS_USE; i++)
comboBox->addItem(gettextFromC::instance()->trGettext(cylinderuse_text[i])); comboBox->addItem(gettextFromC::tr(cylinderuse_text[i]));
return comboBox; return comboBox;
} }

2
qt-models/cylindermodel.cpp
View file

@ -222,7 +222,7 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
ret = get_depth_string(gas_mnd(&cyl->gasmix, prefs.bestmixend, &displayed_dive, M_OR_FT(1,1)), true); ret = get_depth_string(gas_mnd(&cyl->gasmix, prefs.bestmixend, &displayed_dive, M_OR_FT(1,1)), true);
break; break;
case USE: case USE:
ret = gettextFromC::instance()->trGettext(cylinderuse_text[cyl->cylinder_use]); ret = gettextFromC::tr(cylinderuse_text[cyl->cylinder_use]);
break; break;
} }
break; break;

2
qt-models/divelocationmodel.cpp
View file

@ -176,7 +176,7 @@ GeoReferencingOptionsModel::GeoReferencingOptionsModel(QObject *parent) : QStrin
QStringList list; QStringList list;
int i; int i;
for (i = 0; i < TC_NR_CATEGORIES; i++) for (i = 0; i < TC_NR_CATEGORIES; i++)
list << gettextFromC::instance()->trGettext(taxonomy_category_names[i]); list << gettextFromC::tr(taxonomy_category_names[i]);
setStringList(list); setStringList(list);
} }