aboutsummaryrefslogtreecommitdiffstats
path: root/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2017-07-05 00:33:18 +0300
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-07-25 10:06:27 +0000
commit27eb4f5683d9fe1426d3d3b51cb3c7f2b74082a6 (patch)
treecd29b4ce03946f435ddd1f6529a5216552b88042 /src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h
parent2f03202810f6c264509fb704511301d51f282292 (diff)
3rdparty/openwnn: Fix and optimize the engine due to QStringLiteral
QStringLiteral is broken in MSVC2015 onwards when used with \uXXXX encoded character literals. This was the reason Japanese tests were failing - the OpenWNN engine was actually broken and producing garbage. Not only this change eliminates QStringLiteral from openwnn, but also reduces runtime memory usage by replacing QMap<QString, QString>. The new solution is based on simple binary lookup table WnnLookupTable. WnnLookupTable data was converted from existing QMap structures using WnnLookupTable::create() method, which was left there for future reference. This change also removes the unnecessary QObjectPrivate definitions from Romkan* classes. [ChangeLog][OpenWNN] Fixed and optimized OpenWNN engine (as a workaround for QStringLiteral breakage) Task-number: QTBUG-62133 Change-Id: I50c9e2f5c363e1314f47d7023685da543ec9a7eb Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 0bf1c6ad9e0b5572b8ea99f5fc8945dade5675b7)
Diffstat (limited to 'src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h')
-rw-r--r--src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h b/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h
index a3fcccf0..9e9db9fc 100644
--- a/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h
+++ b/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/romkanfullkatakana.h
@@ -24,13 +24,10 @@
#include "romkan.h"
-class RomkanFullKatakanaPrivate;
-
class RomkanFullKatakana : public Romkan
{
Q_OBJECT
Q_DISABLE_COPY(RomkanFullKatakana)
- Q_DECLARE_PRIVATE(RomkanFullKatakana)
public:
explicit RomkanFullKatakana(QObject *parent = 0);
~RomkanFullKatakana();