From 00380b57c2d8d467566f944b006d2c26bea06e4f Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 2 Nov 2021 17:06:32 +0100 Subject: Migrate to autogenerated cpp exports Replace the hardcoded cpp exports with a generated one where it's applicable. Task-number: QTBUG-90492 Change-Id: I19c7b0b39aa2bd2acf58c67360f3ccb3c49fee1c Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor Reviewed-by: Jarkko Koivikko --- src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt | 2 ++ .../hunspell/hunspellinputmethod/hunspellinputmethod_p.h | 2 +- .../hunspellinputmethod/hunspellinputmethod_p_p.h | 2 +- .../hunspell/hunspellinputmethod/hunspellworker_p.h | 2 +- .../hunspellinputmethod/qhunspellinputmethod_global.h | 15 +-------------- src/virtualkeyboard/CMakeLists.txt | 2 ++ src/virtualkeyboard/abstractinputpanel_p.h | 2 +- src/virtualkeyboard/appinputpanel_p.h | 2 +- src/virtualkeyboard/appinputpanel_p_p.h | 2 +- src/virtualkeyboard/desktopinputpanel_p.h | 2 +- src/virtualkeyboard/desktopinputselectioncontrol_p.h | 2 +- src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf | 2 +- src/virtualkeyboard/enterkeyaction_p.h | 2 +- src/virtualkeyboard/enterkeyactionattachedtype_p.h | 2 +- src/virtualkeyboard/fallbackinputmethod_p.h | 2 +- src/virtualkeyboard/gesturerecognizer_p.h | 2 +- src/virtualkeyboard/handwritinggesturerecognizer_p.h | 2 +- src/virtualkeyboard/inputmethod_p.h | 2 +- src/virtualkeyboard/inputselectionhandle_p.h | 2 +- src/virtualkeyboard/inputview_p.h | 2 +- src/virtualkeyboard/plaininputmethod_p.h | 2 +- src/virtualkeyboard/platforminputcontext_p.h | 2 +- src/virtualkeyboard/qvirtualkeyboard_global.h | 15 +-------------- src/virtualkeyboard/qvirtualkeyboard_namespace.h | 2 +- src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h | 2 +- .../qvirtualkeyboardabstractinputmethod_p.h | 2 +- src/virtualkeyboard/qvirtualkeyboarddictionary.h | 2 +- src/virtualkeyboard/qvirtualkeyboarddictionarymanager.h | 2 +- src/virtualkeyboard/qvirtualkeyboardextensionplugin.h | 2 +- src/virtualkeyboard/qvirtualkeyboardinputcontext.h | 2 +- src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h | 2 +- src/virtualkeyboard/qvirtualkeyboardinputengine.h | 2 +- src/virtualkeyboard/qvirtualkeyboardobserver.h | 2 +- src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h | 2 +- src/virtualkeyboard/qvirtualkeyboardtrace.h | 2 +- src/virtualkeyboard/settings_p.h | 2 +- src/virtualkeyboard/shadowinputcontext_p.h | 2 +- src/virtualkeyboard/shifthandler_p.h | 2 +- src/virtualkeyboard/unipentrace_p.h | 2 +- src/virtualkeyboard/virtualkeyboard_p.h | 2 +- src/virtualkeyboard/virtualkeyboardattachedtype_p.h | 2 +- src/virtualkeyboard/virtualkeyboardsettings_p.h | 4 ++-- 42 files changed, 45 insertions(+), 67 deletions(-) (limited to 'src') diff --git a/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt b/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt index 70ca45fa..78d9e80c 100644 --- a/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt +++ b/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt @@ -21,6 +21,8 @@ qt_internal_add_module(HunspellInputMethodPrivate Qt::Core Qt::Gui Qt::VirtualKeyboardPrivate + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) #### Keys ignored in scope 1:.:.:hunspellinputmethod.pro:: diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h index a0f53710..6144536f 100644 --- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h +++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h @@ -50,7 +50,7 @@ namespace QtVirtualKeyboard { class HunspellInputMethodPrivate; class HunspellWordList; -class QHUNSPELLINPUTMETHOD_EXPORT HunspellInputMethod : public QVirtualKeyboardAbstractInputMethod +class Q_HUNSPELLINPUTMETHOD_EXPORT HunspellInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(HunspellInputMethod) diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p_p.h index 2e604350..763a8c43 100644 --- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p_p.h +++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QHUNSPELLINPUTMETHOD_EXPORT HunspellInputMethodPrivate +class Q_HUNSPELLINPUTMETHOD_EXPORT HunspellInputMethodPrivate { Q_DECLARE_PUBLIC(HunspellInputMethod) diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h index de43a035..187f9f70 100644 --- a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h +++ b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h @@ -59,7 +59,7 @@ namespace QtVirtualKeyboard { Q_DECLARE_LOGGING_CATEGORY(lcHunspell) -class QHUNSPELLINPUTMETHOD_EXPORT HunspellWordList +class Q_HUNSPELLINPUTMETHOD_EXPORT HunspellWordList { public: enum Flag diff --git a/src/plugins/hunspell/hunspellinputmethod/qhunspellinputmethod_global.h b/src/plugins/hunspell/hunspellinputmethod/qhunspellinputmethod_global.h index 9a548c92..08b20c0e 100644 --- a/src/plugins/hunspell/hunspellinputmethod/qhunspellinputmethod_global.h +++ b/src/plugins/hunspell/hunspellinputmethod/qhunspellinputmethod_global.h @@ -31,19 +31,6 @@ #define QHUNSPELLINPUTMETHOD_GLOBAL_H #include - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QHUNSPELLINPUTMETHOD_LIBRARY) -# define QHUNSPELLINPUTMETHOD_EXPORT Q_DECL_EXPORT -# else -# define QHUNSPELLINPUTMETHOD_EXPORT Q_DECL_IMPORT -# endif -#else -# define QHUNSPELLINPUTMETHOD_EXPORT -#endif - -QT_END_NAMESPACE +#include #endif diff --git a/src/virtualkeyboard/CMakeLists.txt b/src/virtualkeyboard/CMakeLists.txt index 17c74a93..eaaa3f1b 100644 --- a/src/virtualkeyboard/CMakeLists.txt +++ b/src/virtualkeyboard/CMakeLists.txt @@ -70,6 +70,8 @@ qt_internal_add_module(VirtualKeyboard PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) # Resources: diff --git a/src/virtualkeyboard/abstractinputpanel_p.h b/src/virtualkeyboard/abstractinputpanel_p.h index 08a19fc6..c1b71472 100644 --- a/src/virtualkeyboard/abstractinputpanel_p.h +++ b/src/virtualkeyboard/abstractinputpanel_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT AbstractInputPanel : public QObject +class Q_VIRTUALKEYBOARD_EXPORT AbstractInputPanel : public QObject { Q_OBJECT protected: diff --git a/src/virtualkeyboard/appinputpanel_p.h b/src/virtualkeyboard/appinputpanel_p.h index 8ff0e659..c80167ee 100644 --- a/src/virtualkeyboard/appinputpanel_p.h +++ b/src/virtualkeyboard/appinputpanel_p.h @@ -53,7 +53,7 @@ class AppInputPanelPrivate; \internal */ -class QVIRTUALKEYBOARD_EXPORT AppInputPanel : public AbstractInputPanel +class Q_VIRTUALKEYBOARD_EXPORT AppInputPanel : public AbstractInputPanel { Q_OBJECT Q_DECLARE_PRIVATE(AppInputPanel) diff --git a/src/virtualkeyboard/appinputpanel_p_p.h b/src/virtualkeyboard/appinputpanel_p_p.h index f41c9b72..d36d5cea 100644 --- a/src/virtualkeyboard/appinputpanel_p_p.h +++ b/src/virtualkeyboard/appinputpanel_p_p.h @@ -52,7 +52,7 @@ namespace QtVirtualKeyboard { \internal */ -class QVIRTUALKEYBOARD_EXPORT AppInputPanelPrivate : public QObjectPrivate +class Q_VIRTUALKEYBOARD_EXPORT AppInputPanelPrivate : public QObjectPrivate { public: AppInputPanelPrivate() : diff --git a/src/virtualkeyboard/desktopinputpanel_p.h b/src/virtualkeyboard/desktopinputpanel_p.h index 1a1b1d2f..cf80dfe9 100644 --- a/src/virtualkeyboard/desktopinputpanel_p.h +++ b/src/virtualkeyboard/desktopinputpanel_p.h @@ -51,7 +51,7 @@ namespace QtVirtualKeyboard { class DesktopInputPanelPrivate; -class QVIRTUALKEYBOARD_EXPORT DesktopInputPanel : public AppInputPanel +class Q_VIRTUALKEYBOARD_EXPORT DesktopInputPanel : public AppInputPanel { Q_OBJECT Q_DECLARE_PRIVATE(DesktopInputPanel) diff --git a/src/virtualkeyboard/desktopinputselectioncontrol_p.h b/src/virtualkeyboard/desktopinputselectioncontrol_p.h index 290d4e02..628211d8 100644 --- a/src/virtualkeyboard/desktopinputselectioncontrol_p.h +++ b/src/virtualkeyboard/desktopinputselectioncontrol_p.h @@ -55,7 +55,7 @@ namespace QtVirtualKeyboard { class InputSelectionHandle; -class QVIRTUALKEYBOARD_EXPORT DesktopInputSelectionControl : public QObject +class Q_VIRTUALKEYBOARD_EXPORT DesktopInputSelectionControl : public QObject { Q_OBJECT diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index 61daca8d..b13391f6 100644 --- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf +++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf @@ -16,7 +16,7 @@ exampledirs += ../../../examples/virtualkeyboard \ examplesinstallpath = virtualkeyboard Cpp.ignoretokens += \ - QVIRTUALKEYBOARD_EXPORT + Q_VIRTUALKEYBOARD_EXPORT Cpp.ignoredirectives += \ Q_DECLARE_LOGGING_CATEGORY \ VIRTUALKEYBOARD_DEBUG diff --git a/src/virtualkeyboard/enterkeyaction_p.h b/src/virtualkeyboard/enterkeyaction_p.h index 2de309ad..a6548bae 100644 --- a/src/virtualkeyboard/enterkeyaction_p.h +++ b/src/virtualkeyboard/enterkeyaction_p.h @@ -49,7 +49,7 @@ namespace QtVirtualKeyboard { class EnterKeyActionAttachedType; -class QVIRTUALKEYBOARD_EXPORT EnterKeyAction : public QObject +class Q_VIRTUALKEYBOARD_EXPORT EnterKeyAction : public QObject { Q_OBJECT diff --git a/src/virtualkeyboard/enterkeyactionattachedtype_p.h b/src/virtualkeyboard/enterkeyactionattachedtype_p.h index a7a7f4f8..d5c52b03 100644 --- a/src/virtualkeyboard/enterkeyactionattachedtype_p.h +++ b/src/virtualkeyboard/enterkeyactionattachedtype_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT EnterKeyActionAttachedType : public QObject +class Q_VIRTUALKEYBOARD_EXPORT EnterKeyActionAttachedType : public QObject { Q_OBJECT Q_PROPERTY(int actionId READ actionId WRITE setActionId NOTIFY actionIdChanged) diff --git a/src/virtualkeyboard/fallbackinputmethod_p.h b/src/virtualkeyboard/fallbackinputmethod_p.h index f3bbdb47..86563461 100644 --- a/src/virtualkeyboard/fallbackinputmethod_p.h +++ b/src/virtualkeyboard/fallbackinputmethod_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT FallbackInputMethod : public QVirtualKeyboardAbstractInputMethod +class Q_VIRTUALKEYBOARD_EXPORT FallbackInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT diff --git a/src/virtualkeyboard/gesturerecognizer_p.h b/src/virtualkeyboard/gesturerecognizer_p.h index d7b14b20..4a6869e9 100644 --- a/src/virtualkeyboard/gesturerecognizer_p.h +++ b/src/virtualkeyboard/gesturerecognizer_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT GestureRecognizer : public QObject +class Q_VIRTUALKEYBOARD_EXPORT GestureRecognizer : public QObject { Q_OBJECT public: diff --git a/src/virtualkeyboard/handwritinggesturerecognizer_p.h b/src/virtualkeyboard/handwritinggesturerecognizer_p.h index 69472bec..9f66c3f7 100644 --- a/src/virtualkeyboard/handwritinggesturerecognizer_p.h +++ b/src/virtualkeyboard/handwritinggesturerecognizer_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT HandwritingGestureRecognizer : public GestureRecognizer +class Q_VIRTUALKEYBOARD_EXPORT HandwritingGestureRecognizer : public GestureRecognizer { Q_OBJECT public: diff --git a/src/virtualkeyboard/inputmethod_p.h b/src/virtualkeyboard/inputmethod_p.h index 0c7900ff..e6a0aca1 100644 --- a/src/virtualkeyboard/inputmethod_p.h +++ b/src/virtualkeyboard/inputmethod_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT InputMethod : public QVirtualKeyboardAbstractInputMethod +class Q_VIRTUALKEYBOARD_EXPORT InputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_PROPERTY(QVirtualKeyboardInputContext *inputContext READ inputContext CONSTANT) diff --git a/src/virtualkeyboard/inputselectionhandle_p.h b/src/virtualkeyboard/inputselectionhandle_p.h index d62e4147..4dc7cda9 100644 --- a/src/virtualkeyboard/inputselectionhandle_p.h +++ b/src/virtualkeyboard/inputselectionhandle_p.h @@ -52,7 +52,7 @@ namespace QtVirtualKeyboard { class DesktopInputSelectionControl; -class QVIRTUALKEYBOARD_EXPORT InputSelectionHandle : public QRasterWindow +class Q_VIRTUALKEYBOARD_EXPORT InputSelectionHandle : public QRasterWindow { Q_OBJECT diff --git a/src/virtualkeyboard/inputview_p.h b/src/virtualkeyboard/inputview_p.h index 59d983a3..db682a9a 100644 --- a/src/virtualkeyboard/inputview_p.h +++ b/src/virtualkeyboard/inputview_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT InputView : public QQuickView +class Q_VIRTUALKEYBOARD_EXPORT InputView : public QQuickView { Q_OBJECT public: diff --git a/src/virtualkeyboard/plaininputmethod_p.h b/src/virtualkeyboard/plaininputmethod_p.h index c117358e..cace85ac 100644 --- a/src/virtualkeyboard/plaininputmethod_p.h +++ b/src/virtualkeyboard/plaininputmethod_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT PlainInputMethod : public QVirtualKeyboardAbstractInputMethod +class Q_VIRTUALKEYBOARD_EXPORT PlainInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT diff --git a/src/virtualkeyboard/platforminputcontext_p.h b/src/virtualkeyboard/platforminputcontext_p.h index efc3f08a..bb61a60f 100644 --- a/src/virtualkeyboard/platforminputcontext_p.h +++ b/src/virtualkeyboard/platforminputcontext_p.h @@ -57,7 +57,7 @@ namespace QtVirtualKeyboard { class AbstractInputPanel; -class QVIRTUALKEYBOARD_EXPORT PlatformInputContext : public QPlatformInputContext +class Q_VIRTUALKEYBOARD_EXPORT PlatformInputContext : public QPlatformInputContext { Q_OBJECT public: diff --git a/src/virtualkeyboard/qvirtualkeyboard_global.h b/src/virtualkeyboard/qvirtualkeyboard_global.h index b4719d3c..c72f7dcc 100644 --- a/src/virtualkeyboard/qvirtualkeyboard_global.h +++ b/src/virtualkeyboard/qvirtualkeyboard_global.h @@ -32,19 +32,6 @@ #include #include - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QVIRTUALKEYBOARD_LIBRARY) -# define QVIRTUALKEYBOARD_EXPORT Q_DECL_EXPORT -# else -# define QVIRTUALKEYBOARD_EXPORT Q_DECL_IMPORT -# endif -#else -# define QVIRTUALKEYBOARD_EXPORT -#endif - -QT_END_NAMESPACE +#include #endif diff --git a/src/virtualkeyboard/qvirtualkeyboard_namespace.h b/src/virtualkeyboard/qvirtualkeyboard_namespace.h index 449b0bb6..f04e3a38 100644 --- a/src/virtualkeyboard/qvirtualkeyboard_namespace.h +++ b/src/virtualkeyboard/qvirtualkeyboard_namespace.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -QVIRTUALKEYBOARD_EXPORT Q_NAMESPACE +Q_VIRTUALKEYBOARD_EXPORT Q_NAMESPACE enum class KeyType { BaseKey, diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h index 90ea4d68..321ef676 100644 --- a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h +++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QVirtualKeyboardAbstractInputMethodPrivate; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethod : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethod : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QVirtualKeyboardAbstractInputMethod) diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.h b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.h index f7a310ee..12f393c7 100644 --- a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.h +++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QVirtualKeyboardInputEngine; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethodPrivate : public QObjectPrivate +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethodPrivate : public QObjectPrivate { public: QVirtualKeyboardAbstractInputMethodPrivate(); diff --git a/src/virtualkeyboard/qvirtualkeyboarddictionary.h b/src/virtualkeyboard/qvirtualkeyboarddictionary.h index 350d8064..b3631688 100644 --- a/src/virtualkeyboard/qvirtualkeyboarddictionary.h +++ b/src/virtualkeyboard/qvirtualkeyboarddictionary.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardDictionary : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardDictionary : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name CONSTANT) diff --git a/src/virtualkeyboard/qvirtualkeyboarddictionarymanager.h b/src/virtualkeyboard/qvirtualkeyboarddictionarymanager.h index 09122583..cca381e0 100644 --- a/src/virtualkeyboard/qvirtualkeyboarddictionarymanager.h +++ b/src/virtualkeyboard/qvirtualkeyboarddictionarymanager.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QVirtualKeyboardDictionary; class QVirtualKeyboardDictionaryManagerPrivate; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardDictionaryManager : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardDictionaryManager : public QObject { Q_OBJECT Q_DISABLE_COPY(QVirtualKeyboardDictionaryManager) diff --git a/src/virtualkeyboard/qvirtualkeyboardextensionplugin.h b/src/virtualkeyboard/qvirtualkeyboardextensionplugin.h index 40e2192f..40db69da 100644 --- a/src/virtualkeyboard/qvirtualkeyboardextensionplugin.h +++ b/src/virtualkeyboard/qvirtualkeyboardextensionplugin.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE #define QVirtualKeyboardExtensionPluginFactoryInterface_iid "org.qt-project.qt.virtualkeyboard.plugin/5.12" -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardExtensionPlugin : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardExtensionPlugin : public QObject { Q_OBJECT public: diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h index 5fdc84c3..7cc86ada 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h @@ -46,7 +46,7 @@ class QVirtualKeyboardInputEngine; class QVirtualKeyboardInputContextPrivate; class QVirtualKeyboardObserver; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject { Q_OBJECT Q_DISABLE_COPY(QVirtualKeyboardInputContext) diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h index ab2698d5..90d2c93b 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h @@ -65,7 +65,7 @@ class ShiftHandler; class QVirtualKeyboardInputEngine; class QVirtualKeyboardInputContextPrivate; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContextPrivate : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContextPrivate : public QObject { Q_OBJECT Q_DECLARE_PUBLIC(QVirtualKeyboardInputContext) diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.h b/src/virtualkeyboard/qvirtualkeyboardinputengine.h index 7fea0bb0..9f2bbf2e 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputengine.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.h @@ -42,7 +42,7 @@ class QVirtualKeyboardAbstractInputMethod; class QVirtualKeyboardInputEnginePrivate; class QVirtualKeyboardTrace; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputEngine : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputEngine : public QObject { Q_OBJECT Q_DISABLE_COPY(QVirtualKeyboardInputEngine) diff --git a/src/virtualkeyboard/qvirtualkeyboardobserver.h b/src/virtualkeyboard/qvirtualkeyboardobserver.h index 3e97152b..aab1c463 100644 --- a/src/virtualkeyboard/qvirtualkeyboardobserver.h +++ b/src/virtualkeyboard/qvirtualkeyboardobserver.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QVirtualKeyboardObserverPrivate; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardObserver : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardObserver : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QVirtualKeyboardObserver) diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h index 12382860..40d07d7c 100644 --- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h +++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h @@ -39,7 +39,7 @@ class QVirtualKeyboardAbstractInputMethod; class QVirtualKeyboardInputEngine; class QVirtualKeyboardSelectionListModelPrivate; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardSelectionListModel : public QAbstractListModel +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardSelectionListModel : public QAbstractListModel { Q_OBJECT Q_DECLARE_PRIVATE(QVirtualKeyboardSelectionListModel) diff --git a/src/virtualkeyboard/qvirtualkeyboardtrace.h b/src/virtualkeyboard/qvirtualkeyboardtrace.h index 1e160702..ba582421 100644 --- a/src/virtualkeyboard/qvirtualkeyboardtrace.h +++ b/src/virtualkeyboard/qvirtualkeyboardtrace.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QVirtualKeyboardTracePrivate; -class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardTrace : public QObject +class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardTrace : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QVirtualKeyboardTrace) diff --git a/src/virtualkeyboard/settings_p.h b/src/virtualkeyboard/settings_p.h index ea184e42..4e6ae677 100644 --- a/src/virtualkeyboard/settings_p.h +++ b/src/virtualkeyboard/settings_p.h @@ -50,7 +50,7 @@ namespace QtVirtualKeyboard { class SettingsPrivate; -class QVIRTUALKEYBOARD_EXPORT Settings : public QObject +class Q_VIRTUALKEYBOARD_EXPORT Settings : public QObject { Q_OBJECT Q_DISABLE_COPY(Settings) diff --git a/src/virtualkeyboard/shadowinputcontext_p.h b/src/virtualkeyboard/shadowinputcontext_p.h index f77aba08..206e82b3 100644 --- a/src/virtualkeyboard/shadowinputcontext_p.h +++ b/src/virtualkeyboard/shadowinputcontext_p.h @@ -56,7 +56,7 @@ namespace QtVirtualKeyboard { class ShadowInputContextPrivate; -class QVIRTUALKEYBOARD_EXPORT ShadowInputContext : public QObject +class Q_VIRTUALKEYBOARD_EXPORT ShadowInputContext : public QObject { Q_OBJECT Q_DISABLE_COPY(ShadowInputContext) diff --git a/src/virtualkeyboard/shifthandler_p.h b/src/virtualkeyboard/shifthandler_p.h index 1dcce96c..8bd7e289 100644 --- a/src/virtualkeyboard/shifthandler_p.h +++ b/src/virtualkeyboard/shifthandler_p.h @@ -53,7 +53,7 @@ namespace QtVirtualKeyboard { class ShiftHandlerPrivate; -class QVIRTUALKEYBOARD_EXPORT ShiftHandler : public QObject +class Q_VIRTUALKEYBOARD_EXPORT ShiftHandler : public QObject { Q_OBJECT Q_DISABLE_COPY(ShiftHandler) diff --git a/src/virtualkeyboard/unipentrace_p.h b/src/virtualkeyboard/unipentrace_p.h index 09441e59..5be40253 100644 --- a/src/virtualkeyboard/unipentrace_p.h +++ b/src/virtualkeyboard/unipentrace_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT UnipenTrace : public QObject +class Q_VIRTUALKEYBOARD_EXPORT UnipenTrace : public QObject { Q_OBJECT public: diff --git a/src/virtualkeyboard/virtualkeyboard_p.h b/src/virtualkeyboard/virtualkeyboard_p.h index bf2e0082..ae3c08c7 100644 --- a/src/virtualkeyboard/virtualkeyboard_p.h +++ b/src/virtualkeyboard/virtualkeyboard_p.h @@ -49,7 +49,7 @@ namespace QtVirtualKeyboard { class VirtualKeyboardAttachedType; -class QVIRTUALKEYBOARD_EXPORT VirtualKeyboard : public QObject +class Q_VIRTUALKEYBOARD_EXPORT VirtualKeyboard : public QObject { Q_OBJECT diff --git a/src/virtualkeyboard/virtualkeyboardattachedtype_p.h b/src/virtualkeyboard/virtualkeyboardattachedtype_p.h index fa922d2c..5a776f87 100644 --- a/src/virtualkeyboard/virtualkeyboardattachedtype_p.h +++ b/src/virtualkeyboard/virtualkeyboardattachedtype_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT VirtualKeyboardAttachedType : public QObject +class Q_VIRTUALKEYBOARD_EXPORT VirtualKeyboardAttachedType : public QObject { Q_OBJECT Q_PROPERTY(QStringList extraDictionaries READ extraDictionaries WRITE setExtraDictionaries NOTIFY extraDictionariesChanged) diff --git a/src/virtualkeyboard/virtualkeyboardsettings_p.h b/src/virtualkeyboard/virtualkeyboardsettings_p.h index cee4a0db..f817e13e 100644 --- a/src/virtualkeyboard/virtualkeyboardsettings_p.h +++ b/src/virtualkeyboard/virtualkeyboardsettings_p.h @@ -50,7 +50,7 @@ namespace QtVirtualKeyboard { class WordCandidateListSettings; class VirtualKeyboardSettingsPrivate; -class QVIRTUALKEYBOARD_EXPORT VirtualKeyboardSettings : public QObject +class Q_VIRTUALKEYBOARD_EXPORT VirtualKeyboardSettings : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(VirtualKeyboardSettings) @@ -139,7 +139,7 @@ private: void resetLayoutPath(); }; -class QVIRTUALKEYBOARD_EXPORT WordCandidateListSettings : public QObject +class Q_VIRTUALKEYBOARD_EXPORT WordCandidateListSettings : public QObject { Q_OBJECT Q_PROPERTY(int autoHideDelay READ autoHideDelay WRITE setAutoHideDelay NOTIFY autoHideDelayChanged) -- cgit v1.2.3