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
#include <QCoreApplication>
#include <QString>
#include "gettextfromc.h"
#include <QHash>
const char *gettextFromC::trGettext(const char *text)
{
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;
}
static QHash<QByteArray, QByteArray> translationCache;
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();
}