summaryrefslogtreecommitdiffstats
path: root/gettextfromc.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-08 22:44:38 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-08 23:11:28 -0700
commit2e43769108d4023c215451fa8116abdc991e0f19 (patch)
treefaece0f537183ca9d3a55e39207228d828f82e75 /gettextfromc.h
parent7813ac86bf5bfaeee3d4652b35dcfd8972775423 (diff)
downloadsubsurface-2e43769108d4023c215451fa8116abdc991e0f19.tar.gz
Avoid the memory leaks from translations
Instead use a hash to cache the translations (and allow for the ability to clear the hash so we can even switch translations at runtime...). Now Qt will keep track of the memory and release it for us when we are done with it. This avoids the memory leak introduced in commit 4ecb35bf5ff2 ("Make a copy of the translated text"). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'gettextfromc.h')
-rw-r--r--gettextfromc.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/gettextfromc.h b/gettextfromc.h
index 3852709c9..7d7bca142 100644
--- a/gettextfromc.h
+++ b/gettextfromc.h
@@ -1,6 +1,7 @@
-#ifndef GETTEXT_H
-#define GETTEXT_H
+#ifndef GETTEXTFROMC_H
+#define GETTEXTFROMC_H
+#include <QHash>
extern "C" const char *gettext(const char *text);
@@ -9,7 +10,9 @@ class gettextFromC
Q_DECLARE_TR_FUNCTIONS(gettextFromC)
public:
static gettextFromC *instance();
- char *gettext(const char *text);
+ const char *gettext(const char *text);
+ void reset(void);
+ QHash <const char *, QByteArray> translationCache;
};
-#endif // GETTEXT_H
+#endif // GETTEXTFROMC_H