From e827477d83f61ad2e8e93a2cce2196a3017c6429 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Sun, 2 Sep 2018 22:16:53 +0300 Subject: Prefix all the extension plugins classes with QtVirtualKeyboard For static plugin import, the import should look like: Q_IMPORT_PLUGIN(QtVirtualKeyboardHunspellPlugin) and not like: Q_IMPORT_PLUGIN(HunspellPlugin) Change-Id: I977cc116d6394c6ce81041a8c3df6077a55ad98d Reviewed-by: Jarkko Koivikko Reviewed-by: Mitch Curtis --- src/plugins/hangul/hangul.pro | 2 +- src/plugins/hangul/hangulplugin.cpp | 2 +- src/plugins/hangul/hangulplugin.h | 2 +- src/plugins/hunspell/plugin/hunspellplugin.cpp | 2 +- src/plugins/hunspell/plugin/hunspellplugin.h | 2 +- src/plugins/hunspell/plugin/plugin.pro | 2 +- src/plugins/lipi-toolkit/plugin/lipiplugin.cpp | 2 +- src/plugins/lipi-toolkit/plugin/lipiplugin.h | 2 +- src/plugins/lipi-toolkit/plugin/plugin.pro | 2 +- src/plugins/myscript/plugin/myscriptplugin.cpp | 2 +- src/plugins/myscript/plugin/myscriptplugin.h | 2 +- src/plugins/myscript/plugin/plugin.pro | 2 +- src/plugins/openwnn/plugin/openwnnplugin.cpp | 2 +- src/plugins/openwnn/plugin/openwnnplugin.h | 2 +- src/plugins/openwnn/plugin/plugin.pro | 2 +- src/plugins/pinyin/plugin/pinyinplugin.cpp | 2 +- src/plugins/pinyin/plugin/pinyinplugin.h | 2 +- src/plugins/pinyin/plugin/plugin.pro | 2 +- src/plugins/t9write/plugin/plugin.pro | 2 +- src/plugins/t9write/plugin/t9writeplugin.cpp | 2 +- src/plugins/t9write/plugin/t9writeplugin.h | 2 +- src/plugins/tcime/plugin/plugin.pro | 2 +- src/plugins/tcime/plugin/tcimeplugin.cpp | 2 +- src/plugins/tcime/plugin/tcimeplugin.h | 2 +- src/plugins/thai/plugin/plugin.pro | 2 +- src/plugins/thai/plugin/thaiplugin.cpp | 2 +- src/plugins/thai/plugin/thaiplugin.h | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/plugins/hangul/hangul.pro b/src/plugins/hangul/hangul.pro index d6d5a811..7c7532d0 100644 --- a/src/plugins/hangul/hangul.pro +++ b/src/plugins/hangul/hangul.pro @@ -35,5 +35,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = HangulPlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardHangulPlugin load(qt_plugin) diff --git a/src/plugins/hangul/hangulplugin.cpp b/src/plugins/hangul/hangulplugin.cpp index 29c5d2a8..a1438ed8 100644 --- a/src/plugins/hangul/hangulplugin.cpp +++ b/src/plugins/hangul/hangulplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void HangulPlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardHangulPlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 1, 3, "HangulInputMethod"); qmlRegisterType(uri, 2, 0, "HangulInputMethod"); diff --git a/src/plugins/hangul/hangulplugin.h b/src/plugins/hangul/hangulplugin.h index 9e476390..a4da52c2 100644 --- a/src/plugins/hangul/hangulplugin.h +++ b/src/plugins/hangul/hangulplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class HangulPlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardHangulPlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/hunspell/plugin/hunspellplugin.cpp b/src/plugins/hunspell/plugin/hunspellplugin.cpp index 89f5d7e8..0a952675 100644 --- a/src/plugins/hunspell/plugin/hunspellplugin.cpp +++ b/src/plugins/hunspell/plugin/hunspellplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void HunspellPlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardHunspellPlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 1, 0, "HunspellInputMethod"); qmlRegisterType(uri, 2, 0, "HunspellInputMethod"); diff --git a/src/plugins/hunspell/plugin/hunspellplugin.h b/src/plugins/hunspell/plugin/hunspellplugin.h index 142a76ef..6880f69c 100644 --- a/src/plugins/hunspell/plugin/hunspellplugin.h +++ b/src/plugins/hunspell/plugin/hunspellplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class HunspellPlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardHunspellPlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/hunspell/plugin/plugin.pro b/src/plugins/hunspell/plugin/plugin.pro index 5ebde9c5..99eab6c9 100644 --- a/src/plugins/hunspell/plugin/plugin.pro +++ b/src/plugins/hunspell/plugin/plugin.pro @@ -30,5 +30,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = HunspellPlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardHunspellPlugin load(qt_plugin) diff --git a/src/plugins/lipi-toolkit/plugin/lipiplugin.cpp b/src/plugins/lipi-toolkit/plugin/lipiplugin.cpp index d31baed3..8878f45a 100644 --- a/src/plugins/lipi-toolkit/plugin/lipiplugin.cpp +++ b/src/plugins/lipi-toolkit/plugin/lipiplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void LipiPlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardLipiPlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 2, 0, "HandwritingInputMethod"); } diff --git a/src/plugins/lipi-toolkit/plugin/lipiplugin.h b/src/plugins/lipi-toolkit/plugin/lipiplugin.h index 9888de2b..79e5b20d 100644 --- a/src/plugins/lipi-toolkit/plugin/lipiplugin.h +++ b/src/plugins/lipi-toolkit/plugin/lipiplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class LipiPlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardLipiPlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/lipi-toolkit/plugin/plugin.pro b/src/plugins/lipi-toolkit/plugin/plugin.pro index 3517fb19..3379da6c 100644 --- a/src/plugins/lipi-toolkit/plugin/plugin.pro +++ b/src/plugins/lipi-toolkit/plugin/plugin.pro @@ -58,5 +58,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = LipiPlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardLipiPlugin load(qt_plugin) diff --git a/src/plugins/myscript/plugin/myscriptplugin.cpp b/src/plugins/myscript/plugin/myscriptplugin.cpp index 1d7091ca..779a52d2 100644 --- a/src/plugins/myscript/plugin/myscriptplugin.cpp +++ b/src/plugins/myscript/plugin/myscriptplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void MyScriptPlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardMyScriptPlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 2, 0, "HandwritingInputMethod"); } diff --git a/src/plugins/myscript/plugin/myscriptplugin.h b/src/plugins/myscript/plugin/myscriptplugin.h index bf76807a..7b7873ca 100644 --- a/src/plugins/myscript/plugin/myscriptplugin.h +++ b/src/plugins/myscript/plugin/myscriptplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class MyScriptPlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardMyScriptPlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/myscript/plugin/plugin.pro b/src/plugins/myscript/plugin/plugin.pro index b4ee463e..04143e09 100644 --- a/src/plugins/myscript/plugin/plugin.pro +++ b/src/plugins/myscript/plugin/plugin.pro @@ -104,5 +104,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = MyScriptPlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardMyScriptPlugin load(qt_plugin) diff --git a/src/plugins/openwnn/plugin/openwnnplugin.cpp b/src/plugins/openwnn/plugin/openwnnplugin.cpp index 4b33fddf..a8490960 100644 --- a/src/plugins/openwnn/plugin/openwnnplugin.cpp +++ b/src/plugins/openwnn/plugin/openwnnplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void OpenWnnPlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardOpenWnnPlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 1, 3, "JapaneseInputMethod"); qmlRegisterType(uri, 2, 0, "JapaneseInputMethod"); diff --git a/src/plugins/openwnn/plugin/openwnnplugin.h b/src/plugins/openwnn/plugin/openwnnplugin.h index d2818192..16826cba 100644 --- a/src/plugins/openwnn/plugin/openwnnplugin.h +++ b/src/plugins/openwnn/plugin/openwnnplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class OpenWnnPlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardOpenWnnPlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/openwnn/plugin/plugin.pro b/src/plugins/openwnn/plugin/plugin.pro index 3adb47d0..1fde08a2 100644 --- a/src/plugins/openwnn/plugin/plugin.pro +++ b/src/plugins/openwnn/plugin/plugin.pro @@ -35,5 +35,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = OpenWnnPlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardOpenWnnPlugin load(qt_plugin) diff --git a/src/plugins/pinyin/plugin/pinyinplugin.cpp b/src/plugins/pinyin/plugin/pinyinplugin.cpp index dd71b7f8..6edef332 100644 --- a/src/plugins/pinyin/plugin/pinyinplugin.cpp +++ b/src/plugins/pinyin/plugin/pinyinplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void PinyinPlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardPinyinPlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 1, 1, "PinyinInputMethod"); qmlRegisterType(uri, 2, 0, "PinyinInputMethod"); diff --git a/src/plugins/pinyin/plugin/pinyinplugin.h b/src/plugins/pinyin/plugin/pinyinplugin.h index 8d691fba..21146b75 100644 --- a/src/plugins/pinyin/plugin/pinyinplugin.h +++ b/src/plugins/pinyin/plugin/pinyinplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class PinyinPlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardPinyinPlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/pinyin/plugin/plugin.pro b/src/plugins/pinyin/plugin/plugin.pro index 69bea13c..40d41a07 100644 --- a/src/plugins/pinyin/plugin/plugin.pro +++ b/src/plugins/pinyin/plugin/plugin.pro @@ -49,5 +49,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = PinyinPlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardPinyinPlugin load(qt_plugin) diff --git a/src/plugins/t9write/plugin/plugin.pro b/src/plugins/t9write/plugin/plugin.pro index 85fcc339..37b9d740 100644 --- a/src/plugins/t9write/plugin/plugin.pro +++ b/src/plugins/t9write/plugin/plugin.pro @@ -106,5 +106,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = T9WritePlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardT9WritePlugin load(qt_plugin) diff --git a/src/plugins/t9write/plugin/t9writeplugin.cpp b/src/plugins/t9write/plugin/t9writeplugin.cpp index 3e3ba42f..25c1366f 100644 --- a/src/plugins/t9write/plugin/t9writeplugin.cpp +++ b/src/plugins/t9write/plugin/t9writeplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void T9WritePlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardT9WritePlugin::registerTypes(const char *uri) const { Q_INIT_RESOURCE(qmake_t9write_db); qmlRegisterType(uri, 2, 0, "HandwritingInputMethod"); diff --git a/src/plugins/t9write/plugin/t9writeplugin.h b/src/plugins/t9write/plugin/t9writeplugin.h index 7c221a43..570aea46 100644 --- a/src/plugins/t9write/plugin/t9writeplugin.h +++ b/src/plugins/t9write/plugin/t9writeplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class T9WritePlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardT9WritePlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/tcime/plugin/plugin.pro b/src/plugins/tcime/plugin/plugin.pro index d92696f1..8a34f916 100644 --- a/src/plugins/tcime/plugin/plugin.pro +++ b/src/plugins/tcime/plugin/plugin.pro @@ -55,5 +55,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = TCImePlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardTCImePlugin load(qt_plugin) diff --git a/src/plugins/tcime/plugin/tcimeplugin.cpp b/src/plugins/tcime/plugin/tcimeplugin.cpp index a0b98908..a8ba9a4e 100644 --- a/src/plugins/tcime/plugin/tcimeplugin.cpp +++ b/src/plugins/tcime/plugin/tcimeplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void TCImePlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardTCImePlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 2, 0, "TCInputMethod"); } diff --git a/src/plugins/tcime/plugin/tcimeplugin.h b/src/plugins/tcime/plugin/tcimeplugin.h index c75d59bf..124c7db4 100644 --- a/src/plugins/tcime/plugin/tcimeplugin.h +++ b/src/plugins/tcime/plugin/tcimeplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class TCImePlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardTCImePlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) diff --git a/src/plugins/thai/plugin/plugin.pro b/src/plugins/thai/plugin/plugin.pro index 2ad1893f..82826d76 100644 --- a/src/plugins/thai/plugin/plugin.pro +++ b/src/plugins/thai/plugin/plugin.pro @@ -37,5 +37,5 @@ win32 { } PLUGIN_TYPE = virtualkeyboard -PLUGIN_CLASS_NAME = ThaiPlugin +PLUGIN_CLASS_NAME = QtVirtualKeyboardThaiPlugin load(qt_plugin) diff --git a/src/plugins/thai/plugin/thaiplugin.cpp b/src/plugins/thai/plugin/thaiplugin.cpp index 7267c668..1f9428fc 100644 --- a/src/plugins/thai/plugin/thaiplugin.cpp +++ b/src/plugins/thai/plugin/thaiplugin.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; -void ThaiPlugin::registerTypes(const char *uri) const +void QtVirtualKeyboardThaiPlugin::registerTypes(const char *uri) const { qmlRegisterType(uri, 2, 3, "ThaiInputMethod"); } diff --git a/src/plugins/thai/plugin/thaiplugin.h b/src/plugins/thai/plugin/thaiplugin.h index cd9a225a..d3ab2728 100644 --- a/src/plugins/thai/plugin/thaiplugin.h +++ b/src/plugins/thai/plugin/thaiplugin.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class ThaiPlugin : public QVirtualKeyboardExtensionPlugin +class QtVirtualKeyboardThaiPlugin : public QVirtualKeyboardExtensionPlugin { Q_OBJECT Q_INTERFACES(QVirtualKeyboardExtensionPlugin) -- cgit v1.2.3