summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/gettextfromc.cpp25
-rw-r--r--core/gettextfromc.h6
2 files changed, 5 insertions, 26 deletions
diff --git a/core/gettextfromc.cpp b/core/gettextfromc.cpp
index e668fec2e..fdb1e6d37 100644
--- a/core/gettextfromc.cpp
+++ b/core/gettextfromc.cpp
@@ -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)
+static QHash<QByteArray, QByteArray> translationCache;
+
+extern "C" const char *trGettext(const char *text)
{
QByteArray &result = translationCache[QByteArray(text)];
if (result.isEmpty())
- result = translationCache[QByteArray(text)] = trUtf8(text).toUtf8();
+ result = gettextFromC::tr(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)
-{
- return gettextFromC::instance()->trGettext(text);
-}
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