summaryrefslogtreecommitdiffstats
path: root/core/gettextfromc.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-06-17 21:03:16 +0200
committerGravatar Tomaz Canabrava <tcanabrava@kde.org>2018-06-24 20:31:14 +0200
commit879cb73b8bda364f63cc97c0f9963cfddc581add (patch)
tree3f800beb71313141ad55b7131ef746a3083330b0 /core/gettextfromc.h
parent61b8add59078f3a55dc02dc63639173be03fdf41 (diff)
downloadsubsurface-879cb73b8bda364f63cc97c0f9963cfddc581add.tar.gz
Localization: remove gettextFromC::instance()
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>
Diffstat (limited to 'core/gettextfromc.h')
-rw-r--r--core/gettextfromc.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/gettextfromc.h b/core/gettextfromc.h
index 5f22d8647..647ea52a8 100644
--- a/core/gettextfromc.h
+++ b/core/gettextfromc.h
@@ -2,18 +2,12 @@
#ifndef GETTEXTFROMC_H
#define GETTEXTFROMC_H
-#include <QHash>
#include <QCoreApplication>
extern "C" const char *trGettext(const char *text);
class 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