diff options
author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-22 14:25:22 +0300 |
---|---|---|
committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-27 12:43:21 +0000 |
commit | 907f11717df5523dce81270ef41e376c7660f407 (patch) | |
tree | c03d521bb1bfa2d44bde276bae9141fb9623e5ac | |
parent | ad6b6a653628ae52827b718d90c1a9df85f43d18 (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>
47 files changed, 95 insertions, 95 deletions
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index db2553ea..5addcf89 100644 --- a/src/plugin/plugin.cpp +++ b/src/plugin/plugin.cpp @@ -29,17 +29,17 @@ #include "plugin.h" #include "extensionloader.h" -#include <QtVirtualKeyboard/inputcontext.h> -#include <QtVirtualKeyboard/inputengine.h> -#include <QtVirtualKeyboard/private/inputcontext_p.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> #include <QtVirtualKeyboard/private/shifthandler_p.h> #include <QtVirtualKeyboard/private/plaininputmethod_p.h> #include <QtVirtualKeyboard/private/inputmethod_p.h> -#include <QtVirtualKeyboard/selectionlistmodel.h> +#include <QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h> #include <QtVirtualKeyboard/private/enterkeyaction_p.h> #include <QtVirtualKeyboard/private/enterkeyactionattachedtype_p.h> #include <QtVirtualKeyboard/private/virtualkeyboardsettings_p.h> -#include <QtVirtualKeyboard/trace.h> +#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h> #include <QtVirtualKeyboard/private/shadowinputcontext_p.h> #include <QLoggingCategory> #if defined(QT_STATICPLUGIN) 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 diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp index 510141ff..5b5e52d3 100644 --- a/src/virtualkeyboard/desktopinputpanel.cpp +++ b/src/virtualkeyboard/desktopinputpanel.cpp @@ -31,8 +31,8 @@ #include <QtVirtualKeyboard/private/appinputpanel_p_p.h> #include <QtVirtualKeyboard/private/inputview_p.h> #include <QtVirtualKeyboard/private/platforminputcontext_p.h> -#include <QtVirtualKeyboard/private/inputcontext_p.h> -#include <QtVirtualKeyboard/inputcontext.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> #include <QGuiApplication> #include <QQmlEngine> #include <QScreen> diff --git a/src/virtualkeyboard/desktopinputselectioncontrol.cpp b/src/virtualkeyboard/desktopinputselectioncontrol.cpp index f93a0dde..d5ec79d3 100644 --- a/src/virtualkeyboard/desktopinputselectioncontrol.cpp +++ b/src/virtualkeyboard/desktopinputselectioncontrol.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include <QtVirtualKeyboard/private/desktopinputselectioncontrol_p.h> -#include <QtVirtualKeyboard/inputcontext.h> -#include <QtVirtualKeyboard/private/inputcontext_p.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> #include <QtVirtualKeyboard/private/inputselectionhandle_p.h> #include <QtVirtualKeyboard/private/settings_p.h> #include <QtVirtualKeyboard/private/platforminputcontext_p.h> diff --git a/src/virtualkeyboard/fallbackinputmethod.cpp b/src/virtualkeyboard/fallbackinputmethod.cpp index c395f443..81703232 100644 --- a/src/virtualkeyboard/fallbackinputmethod.cpp +++ b/src/virtualkeyboard/fallbackinputmethod.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include <QtVirtualKeyboard/private/fallbackinputmethod_p.h> -#include <QtVirtualKeyboard/inputcontext.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { diff --git a/src/virtualkeyboard/fallbackinputmethod_p.h b/src/virtualkeyboard/fallbackinputmethod_p.h index 37b94660..f494079d 100644 --- a/src/virtualkeyboard/fallbackinputmethod_p.h +++ b/src/virtualkeyboard/fallbackinputmethod_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/virtualkeyboard/gesturerecognizer_p.h b/src/virtualkeyboard/gesturerecognizer_p.h index b27c006f..d7b14b20 100644 --- a/src/virtualkeyboard/gesturerecognizer_p.h +++ b/src/virtualkeyboard/gesturerecognizer_p.h @@ -43,7 +43,7 @@ #include <QObject> #include <QVariantMap> -#include <QtVirtualKeyboard/trace.h> +#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h> #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE diff --git a/src/virtualkeyboard/inputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp index 393ce603..3ef0e3d8 100644 --- a/src/virtualkeyboard/inputmethod.cpp +++ b/src/virtualkeyboard/inputmethod.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include <QtVirtualKeyboard/private/inputmethod_p.h> -#include <QtVirtualKeyboard/trace.h> +#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/virtualkeyboard/inputmethod_p.h b/src/virtualkeyboard/inputmethod_p.h index 1e718d5f..f97e68cd 100644 --- a/src/virtualkeyboard/inputmethod_p.h +++ b/src/virtualkeyboard/inputmethod_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/virtualkeyboard/plaininputmethod.cpp b/src/virtualkeyboard/plaininputmethod.cpp index 7700db6e..a2732940 100644 --- a/src/virtualkeyboard/plaininputmethod.cpp +++ b/src/virtualkeyboard/plaininputmethod.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include <QtVirtualKeyboard/private/plaininputmethod_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/virtualkeyboard/plaininputmethod_p.h b/src/virtualkeyboard/plaininputmethod_p.h index dd087897..c1bf54d6 100644 --- a/src/virtualkeyboard/plaininputmethod_p.h +++ b/src/virtualkeyboard/plaininputmethod_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/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp index da79a826..14a14649 100644 --- a/src/virtualkeyboard/platforminputcontext.cpp +++ b/src/virtualkeyboard/platforminputcontext.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include <QtVirtualKeyboard/private/platforminputcontext_p.h> -#include <QtVirtualKeyboard/inputcontext.h> -#include <QtVirtualKeyboard/private/inputcontext_p.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> #include <QtVirtualKeyboard/private/shadowinputcontext_p.h> #include <QtVirtualKeyboard/private/abstractinputpanel_p.h> #ifdef QT_VIRTUALKEYBOARD_DESKTOP diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp index f7e48336..1c23c618 100644 --- a/src/virtualkeyboard/abstractinputmethod.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include <QtVirtualKeyboard/abstractinputmethod.h> +#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h> #include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/virtualkeyboard/abstractinputmethod.h b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h index 8398c781..ce574d89 100644 --- a/src/virtualkeyboard/abstractinputmethod.h +++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h @@ -27,11 +27,11 @@ ** ****************************************************************************/ -#ifndef ABSTRACTINPUTMETHOD_H -#define ABSTRACTINPUTMETHOD_H +#ifndef QVIRTUALKEYBOARDABSTRACTINPUTMETHOD_H +#define QVIRTUALKEYBOARDABSTRACTINPUTMETHOD_H -#include <QtVirtualKeyboard/inputengine.h> -#include <QtVirtualKeyboard/selectionlistmodel.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h> +#include <QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h> QT_BEGIN_NAMESPACE diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp index 7010c75a..4161f909 100644 --- a/src/virtualkeyboard/inputcontext.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include <QtVirtualKeyboard/inputcontext.h> -#include <QtVirtualKeyboard/private/inputcontext_p.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> #include <QtVirtualKeyboard/private/shifthandler_p.h> #include <QtVirtualKeyboard/private/platforminputcontext_p.h> #include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h> diff --git a/src/virtualkeyboard/inputcontext.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h index 09f7456f..b5547c69 100644 --- a/src/virtualkeyboard/inputcontext.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef INPUTCONTEXT_H -#define INPUTCONTEXT_H +#ifndef QVIRTUALKEYBOARDINPUTCONTEXT_H +#define QVIRTUALKEYBOARDINPUTCONTEXT_H #include <QObject> #include <QRectF> diff --git a/src/virtualkeyboard/inputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp index c9312c1e..6afa47ba 100644 --- a/src/virtualkeyboard/inputcontext_p.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp @@ -27,13 +27,13 @@ ** ****************************************************************************/ -#include <QtVirtualKeyboard/private/inputcontext_p.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> #include <QtVirtualKeyboard/private/platforminputcontext_p.h> #include <QtVirtualKeyboard/private/settings_p.h> #include <QtVirtualKeyboard/private/shifthandler_p.h> #include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h> #include <QtVirtualKeyboard/private/enterkeyaction_p.h> -#include <QtVirtualKeyboard/inputengine.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h> #include <QGuiApplication> diff --git a/src/virtualkeyboard/inputcontext_p.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h index fdffee79..9b0032d4 100644 --- a/src/virtualkeyboard/inputcontext_p.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef INPUTCONTEXT_P_H -#define INPUTCONTEXT_P_H +#ifndef QVIRTUALKEYBOARDINPUTCONTEXT_P_H +#define QVIRTUALKEYBOARDINPUTCONTEXT_P_H // // W A R N I N G @@ -44,7 +44,7 @@ #include <QObject> #include <QRectF> #include <QInputMethodEvent> -#include <QtVirtualKeyboard/inputcontext.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> #include <QtVirtualKeyboard/private/shadowinputcontext_p.h> QT_BEGIN_NAMESPACE @@ -169,4 +169,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QVirtualKeyboardInputContextPrivate::StateFlags) QT_END_NAMESPACE -#endif // INPUTCONTEXT_P_H +#endif // QVIRTUALKEYBOARDINPUTCONTEXT_P_H diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp index cead3491..4bee3904 100644 --- a/src/virtualkeyboard/inputengine.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp @@ -27,12 +27,12 @@ ** ****************************************************************************/ -#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 <QtVirtualKeyboard/private/fallbackinputmethod_p.h> -#include <QtVirtualKeyboard/trace.h> +#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h> #include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h> #include <QTimerEvent> diff --git a/src/virtualkeyboard/inputengine.h b/src/virtualkeyboard/qvirtualkeyboardinputengine.h index a177051f..4201b59a 100644 --- a/src/virtualkeyboard/inputengine.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef INPUTENGINE_H -#define INPUTENGINE_H +#ifndef QVIRTUALKEYBOARDINPUTENGINE_H +#define QVIRTUALKEYBOARDINPUTENGINE_H #include <QObject> #include <QPointer> diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp index d88622fc..85ea90e1 100644 --- a/src/virtualkeyboard/selectionlistmodel.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include <QtVirtualKeyboard/selectionlistmodel.h> -#include <QtVirtualKeyboard/abstractinputmethod.h> +#include <QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h> +#include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h> #include <QtVirtualKeyboard/private/settings_p.h> #include <QtCore/private/qabstractitemmodel_p.h> #include <QtCore/qpointer.h> diff --git a/src/virtualkeyboard/selectionlistmodel.h b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h index 19347ddf..516d1177 100644 --- a/src/virtualkeyboard/selectionlistmodel.h +++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef SELECTIONLISTMODEL_H -#define SELECTIONLISTMODEL_H +#ifndef QVIRTUALKEYBOARDSELECTIONLISTMODEL_H +#define QVIRTUALKEYBOARDSELECTIONLISTMODEL_H #include <QAbstractListModel> #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> @@ -101,4 +101,4 @@ Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::Type) Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::Role) Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::DictionaryType) -#endif // SELECTIONLISTMODEL_H +#endif // QVIRTUALKEYBOARDSELECTIONLISTMODEL_H diff --git a/src/virtualkeyboard/trace.cpp b/src/virtualkeyboard/qvirtualkeyboardtrace.cpp index 7e24ef13..82d61464 100644 --- a/src/virtualkeyboard/trace.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardtrace.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include <QtVirtualKeyboard/trace.h> +#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h> #include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/virtualkeyboard/trace.h b/src/virtualkeyboard/qvirtualkeyboardtrace.h index a0c5ad81..55272ebe 100644 --- a/src/virtualkeyboard/trace.h +++ b/src/virtualkeyboard/qvirtualkeyboardtrace.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef TRACE_H -#define TRACE_H +#ifndef QVIRTUALKEYBOARDTRACE_H +#define QVIRTUALKEYBOARDTRACE_H #include <QObject> #include <QVariant> @@ -87,4 +87,4 @@ Q_SIGNALS: QT_END_NAMESPACE -#endif // TRACE_H +#endif // QVIRTUALKEYBOARDTRACE_H diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp index 7c63bb7a..29ac5dfb 100644 --- a/src/virtualkeyboard/shadowinputcontext.cpp +++ b/src/virtualkeyboard/shadowinputcontext.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include <QtVirtualKeyboard/private/shadowinputcontext_p.h> -#include <QtVirtualKeyboard/inputcontext.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> #include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h> #include <QtCore/private/qobject_p.h> diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index b7a0a715..836b8bf3 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -28,9 +28,9 @@ ****************************************************************************/ #include <QtVirtualKeyboard/private/shifthandler_p.h> -#include <QtVirtualKeyboard/private/inputcontext_p.h> -#include <QtVirtualKeyboard/inputcontext.h> -#include <QtVirtualKeyboard/inputengine.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> +#include <QtVirtualKeyboard/qvirtualkeyboardinputengine.h> #include <QtCore/private/qobject_p.h> #include <QSet> #include <QGuiApplication> diff --git a/src/virtualkeyboard/unipentrace_p.h b/src/virtualkeyboard/unipentrace_p.h index 0ba6d1fe..09441e59 100644 --- a/src/virtualkeyboard/unipentrace_p.h +++ b/src/virtualkeyboard/unipentrace_p.h @@ -42,7 +42,7 @@ // #include <QObject> -#include <QtVirtualKeyboard/trace.h> +#include <QtVirtualKeyboard/qvirtualkeyboardtrace.h> #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index c570389f..591e7ae2 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -14,15 +14,15 @@ include(../config.pri) SOURCES += \ platforminputcontext.cpp \ - inputcontext.cpp \ - inputcontext_p.cpp \ - abstractinputmethod.cpp \ + qvirtualkeyboardinputcontext.cpp \ + qvirtualkeyboardinputcontext_p.cpp \ + qvirtualkeyboardabstractinputmethod.cpp \ plaininputmethod.cpp \ - inputengine.cpp \ + qvirtualkeyboardinputengine.cpp \ shifthandler.cpp \ inputmethod.cpp \ inputselectionhandle.cpp \ - selectionlistmodel.cpp \ + qvirtualkeyboardselectionlistmodel.cpp \ fallbackinputmethod.cpp \ abstractinputpanel.cpp \ appinputpanel.cpp \ @@ -30,7 +30,7 @@ SOURCES += \ enterkeyactionattachedtype.cpp \ settings.cpp \ virtualkeyboardsettings.cpp \ - trace.cpp \ + qvirtualkeyboardtrace.cpp \ desktopinputselectioncontrol.cpp \ shadowinputcontext.cpp \ gesturerecognizer.cpp \ @@ -39,15 +39,15 @@ SOURCES += \ HEADERS += \ platforminputcontext_p.h \ - inputcontext.h \ - inputcontext_p.h \ - abstractinputmethod.h \ + qvirtualkeyboardinputcontext.h \ + qvirtualkeyboardinputcontext_p.h \ + qvirtualkeyboardabstractinputmethod.h \ plaininputmethod_p.h \ - inputengine.h \ + qvirtualkeyboardinputengine.h \ shifthandler_p.h \ inputmethod_p.h \ inputselectionhandle_p.h \ - selectionlistmodel.h \ + qvirtualkeyboardselectionlistmodel.h \ fallbackinputmethod_p.h \ abstractinputpanel_p.h \ appinputpanel_p.h \ @@ -57,7 +57,7 @@ HEADERS += \ enterkeyactionattachedtype_p.h \ settings_p.h \ virtualkeyboardsettings_p.h \ - trace.h \ + qvirtualkeyboardtrace.h \ desktopinputselectioncontrol_p.h \ shadowinputcontext_p.h \ gesturerecognizer_p.h \ |