aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2018-08-22 14:25:22 +0300
committerJarkko Koivikko <jarkko.koivikko@code-q.fi>2018-08-27 12:43:21 +0000
commit907f11717df5523dce81270ef41e376c7660f407 (patch)
treec03d521bb1bfa2d44bde276bae9141fb9623e5ac /src/plugins
parentad6b6a653628ae52827b718d90c1a9df85f43d18 (diff)
Prefix non-namespaced header file names with qvirtualkeyboard
Change-Id: Idf2447736ef72fa0fb4dfeacc3386ed7b4fe41c9 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/hangul/hangulinputmethod.cpp2
-rw-r--r--src/plugins/hangul/hangulinputmethod_p.h2
-rw-r--r--src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp2
-rw-r--r--src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp2
-rw-r--r--src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h2
-rw-r--r--src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp8
-rw-r--r--src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h2
-rw-r--r--src/plugins/myscript/plugin/myscriptinputmethod.cpp6
-rw-r--r--src/plugins/myscript/plugin/myscriptinputmethod_p.h2
-rw-r--r--src/plugins/openwnn/plugin/openwnninputmethod.cpp2
-rw-r--r--src/plugins/openwnn/plugin/openwnninputmethod_p.h2
-rw-r--r--src/plugins/pinyin/plugin/pinyininputmethod.cpp2
-rw-r--r--src/plugins/pinyin/plugin/pinyininputmethod_p.h2
-rw-r--r--src/plugins/t9write/plugin/t9writeinputmethod.cpp6
-rw-r--r--src/plugins/t9write/plugin/t9writeinputmethod_p.h2
-rw-r--r--src/plugins/t9write/plugin/t9writeworker_p.h2
-rw-r--r--src/plugins/tcime/plugin/tcinputmethod.cpp4
-rw-r--r--src/plugins/tcime/plugin/tcinputmethod_p.h2
-rw-r--r--src/plugins/thai/plugin/thaiinputmethod.cpp4
-rw-r--r--src/plugins/thai/plugin/thaiinputmethod_p.h2
20 files changed, 29 insertions, 29 deletions
diff --git a/src/plugins/hangul/hangulinputmethod.cpp b/src/plugins/hangul/hangulinputmethod.cpp
index 07a3408e..23caf8ca 100644
--- a/src/plugins/hangul/hangulinputmethod.cpp
+++ b/src/plugins/hangul/hangulinputmethod.cpp
@@ -29,7 +29,7 @@
#include "hangulinputmethod_p.h"
#include "hangul_p.h"
-#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/hangul/hangulinputmethod_p.h b/src/plugins/hangul/hangulinputmethod_p.h
index 80dd723a..f53e0712 100644
--- a/src/plugins/hangul/hangulinputmethod_p.h
+++ b/src/plugins/hangul/hangulinputmethod_p.h
@@ -41,7 +41,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp
index 2e81882f..ac2763fb 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp
@@ -28,7 +28,7 @@
****************************************************************************/
#include <QtHunspellInputMethod/private/hunspellinputmethod_p_p.h>
-#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
#include <QLoggingCategory>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp
index 99c1137b..9109ac09 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp
@@ -28,7 +28,7 @@
****************************************************************************/
#include <QtHunspellInputMethod/private/hunspellinputmethod_p_p.h>
-#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
#include <hunspell/hunspell.h>
#include <QStringList>
#include <QDir>
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
index 3b851964..c4682d0f 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
@@ -41,7 +41,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
index 3ebd3bf5..98edb403 100644
--- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
+++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
@@ -29,12 +29,12 @@
#include "lipiinputmethod_p.h"
#include "lipisharedrecognizer_p.h"
-#include <QtVirtualKeyboard/inputengine.h>
-#include <QtVirtualKeyboard/inputcontext.h>
-#include <QtVirtualKeyboard/private/inputcontext_p.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
+#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h>
#include <QtVirtualKeyboard/private/shifthandler_p.h>
#include <QLoggingCategory>
-#include <QtVirtualKeyboard/trace.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h>
#include <QtVirtualKeyboard/private/handwritinggesturerecognizer_p.h>
#ifdef HAVE_HUNSPELL
diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
index bc2981e0..418a6cff 100644
--- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
+++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
@@ -45,7 +45,7 @@
#include <QtHunspellInputMethod/private/hunspellinputmethod_p.h>
#define LipiInputMethodBase HunspellInputMethod
#else
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
#define LipiInputMethodBase QVirtualKeyboardAbstractInputMethod
#endif
diff --git a/src/plugins/myscript/plugin/myscriptinputmethod.cpp b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
index d994272c..c5dd764e 100644
--- a/src/plugins/myscript/plugin/myscriptinputmethod.cpp
+++ b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
@@ -32,9 +32,9 @@
#include "myscriptinputmethod_p.h"
#include "myscriptinputmethod_p_p.h"
-#include <QtVirtualKeyboard/inputengine.h>
-#include <QtVirtualKeyboard/inputcontext.h>
-#include <QtVirtualKeyboard/trace.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h>
#include <QLoggingCategory>
diff --git a/src/plugins/myscript/plugin/myscriptinputmethod_p.h b/src/plugins/myscript/plugin/myscriptinputmethod_p.h
index aae9f188..91e27f8c 100644
--- a/src/plugins/myscript/plugin/myscriptinputmethod_p.h
+++ b/src/plugins/myscript/plugin/myscriptinputmethod_p.h
@@ -43,7 +43,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod.cpp b/src/plugins/openwnn/plugin/openwnninputmethod.cpp
index 4ec43134..9d5d521d 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod.cpp
+++ b/src/plugins/openwnn/plugin/openwnninputmethod.cpp
@@ -28,7 +28,7 @@
****************************************************************************/
#include "openwnninputmethod_p.h"
-#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
#include <QLoggingCategory>
#include <openwnnenginejajp.h>
#include <composingtext.h>
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod_p.h b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
index c7b2938c..a80b38be 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod_p.h
+++ b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
@@ -41,7 +41,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod.cpp b/src/plugins/pinyin/plugin/pinyininputmethod.cpp
index f7aaf991..eb45da7a 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod.cpp
+++ b/src/plugins/pinyin/plugin/pinyininputmethod.cpp
@@ -29,7 +29,7 @@
#include "pinyininputmethod_p.h"
#include "pinyindecoderservice_p.h"
-#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
#include <QLoggingCategory>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod_p.h b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
index 0875e679..e5cf6926 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod_p.h
+++ b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
@@ -41,7 +41,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
index 5f1b055b..4b1f6fba 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
@@ -28,9 +28,9 @@
****************************************************************************/
#include "t9writeinputmethod_p.h"
-#include <QtVirtualKeyboard/inputengine.h>
-#include <QtVirtualKeyboard/inputcontext.h>
-#include <QtVirtualKeyboard/trace.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h>
#include "t9writeworker_p.h"
#include <QLoggingCategory>
#include <QDirIterator>
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod_p.h b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
index c1b570a2..ecfb3ec4 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod_p.h
+++ b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
@@ -41,7 +41,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
#include <QSharedPointer>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/t9write/plugin/t9writeworker_p.h b/src/plugins/t9write/plugin/t9writeworker_p.h
index 52e3d7cd..5657ebb4 100644
--- a/src/plugins/t9write/plugin/t9writeworker_p.h
+++ b/src/plugins/t9write/plugin/t9writeworker_p.h
@@ -41,7 +41,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/trace.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h>
#include <QThread>
#include <QSemaphore>
diff --git a/src/plugins/tcime/plugin/tcinputmethod.cpp b/src/plugins/tcime/plugin/tcinputmethod.cpp
index 2285284e..74f17597 100644
--- a/src/plugins/tcime/plugin/tcinputmethod.cpp
+++ b/src/plugins/tcime/plugin/tcinputmethod.cpp
@@ -28,8 +28,8 @@
****************************************************************************/
#include "tcinputmethod_p.h"
-#include <QtVirtualKeyboard/inputengine.h>
-#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
#if defined(HAVE_TCIME_CANGJIE)
#include "cangjiedictionary.h"
#include "cangjietable.h"
diff --git a/src/plugins/tcime/plugin/tcinputmethod_p.h b/src/plugins/tcime/plugin/tcinputmethod_p.h
index 68e46a2a..10a962e5 100644
--- a/src/plugins/tcime/plugin/tcinputmethod_p.h
+++ b/src/plugins/tcime/plugin/tcinputmethod_p.h
@@ -41,7 +41,7 @@
// We mean it.
//
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/thai/plugin/thaiinputmethod.cpp b/src/plugins/thai/plugin/thaiinputmethod.cpp
index 4a862542..7d1561e0 100644
--- a/src/plugins/thai/plugin/thaiinputmethod.cpp
+++ b/src/plugins/thai/plugin/thaiinputmethod.cpp
@@ -28,8 +28,8 @@
****************************************************************************/
#include "thaiinputmethod_p.h"
-#include <QtVirtualKeyboard/inputengine.h>
-#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h>
QT_BEGIN_NAMESPACE
namespace QtVirtualKeyboard {
diff --git a/src/plugins/thai/plugin/thaiinputmethod_p.h b/src/plugins/thai/plugin/thaiinputmethod_p.h
index 4d126d5c..bcafd71a 100644
--- a/src/plugins/thai/plugin/thaiinputmethod_p.h
+++ b/src/plugins/thai/plugin/thaiinputmethod_p.h
@@ -34,7 +34,7 @@
#include <QtHunspellInputMethod/private/hunspellinputmethod_p.h>
#define ThaiInputMethodBase HunspellInputMethod
#else
-#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
#define ThaiInputMethodBase QVirtualKeyboardAbstractInputMethod
#endif