| mimpluginmanager.h | mimpluginmanager.h | |||
|---|---|---|---|---|
| skipping to change at line 26 | skipping to change at line 26 | |||
| #ifndef MIMPLUGINMANAGER_H | #ifndef MIMPLUGINMANAGER_H | |||
| #define MIMPLUGINMANAGER_H | #define MIMPLUGINMANAGER_H | |||
| #include <QObject> | #include <QObject> | |||
| #include <QMap> | #include <QMap> | |||
| #include <QList> | #include <QList> | |||
| #include "minputmethodnamespace.h" | #include "minputmethodnamespace.h" | |||
| #include "mimplugindescription.h" | #include "mimplugindescription.h" | |||
| #include "mattributeextensionid.h" | ||||
| class QRegion; | class QRegion; | |||
| class MIMPluginManagerPrivate; | class MIMPluginManagerPrivate; | |||
| class MAttributeExtensionId; | class MAttributeExtensionId; | |||
| class MAbstractInputMethod; | class MAbstractInputMethod; | |||
| class MImRemoteWindow; | class MImRemoteWindow; | |||
| class MImRotationAnimation; | class MImRotationAnimation; | |||
| //! Note: this class is not considered stable API | //! Note: this class is not considered stable API | |||
| class MIMPluginManager: public QObject | class MIMPluginManager: public QObject | |||
| skipping to change at line 117 | skipping to change at line 118 | |||
| void updateRegion(const QRegion ®ion); | void updateRegion(const QRegion ®ion); | |||
| private slots: | private slots: | |||
| //! Update and activate input source. | //! Update and activate input source. | |||
| void updateInputSource(); | void updateInputSource(); | |||
| //! Set toolbar to active plugin with given \a id | //! Set toolbar to active plugin with given \a id | |||
| void setToolbar(const MAttributeExtensionId &id); | void setToolbar(const MAttributeExtensionId &id); | |||
| //! Update the key overrides for active plugin. | //! Update the key overrides for active plugin. | |||
| void updateKeyOverrides(); | void updateKeyOverrides(const MAttributeExtensionId &id); | |||
| protected: | protected: | |||
| MIMPluginManagerPrivate *const d_ptr; | MIMPluginManagerPrivate *const d_ptr; | |||
| private: | private: | |||
| Q_DISABLE_COPY(MIMPluginManager) | Q_DISABLE_COPY(MIMPluginManager) | |||
| Q_DECLARE_PRIVATE(MIMPluginManager) | Q_DECLARE_PRIVATE(MIMPluginManager) | |||
| Q_PRIVATE_SLOT(d_func(), void _q_syncHandlerMap(int)); | Q_PRIVATE_SLOT(d_func(), void _q_syncHandlerMap(int)); | |||
| Q_PRIVATE_SLOT(d_func(), void _q_setActiveSubView(const QString &, MInp utMethod::HandlerState)); | Q_PRIVATE_SLOT(d_func(), void _q_setActiveSubView(const QString &, MInp utMethod::HandlerState)); | |||
| Q_PRIVATE_SLOT(d_func(), void _q_ensureEmptyRegionWhenHidden()); | Q_PRIVATE_SLOT(d_func(), void _q_ensureEmptyRegionWhenHidden()); | |||
| End of changes. 2 change blocks. | ||||
| 1 lines changed or deleted | 2 lines changed or added | |||
| minputmethodplugin.h | minputmethodplugin.h | |||
|---|---|---|---|---|
| skipping to change at line 70 | skipping to change at line 70 | |||
| /*! | /*! | |||
| * \brief Returns set of states which could be handled by this plugin. | * \brief Returns set of states which could be handled by this plugin. | |||
| * | * | |||
| * WARNING: If result is empty then this plugin will not be loaded | * WARNING: If result is empty then this plugin will not be loaded | |||
| * during startup. | * during startup. | |||
| */ | */ | |||
| virtual QSet<MInputMethod::HandlerState> supportedStates() const = 0; | virtual QSet<MInputMethod::HandlerState> supportedStates() const = 0; | |||
| }; | }; | |||
| #ifdef HAVE_MEEGOTOUCH | ||||
| Q_DECLARE_INTERFACE(MInputMethodPlugin, | Q_DECLARE_INTERFACE(MInputMethodPlugin, | |||
| "com.meego.meegoimframework.MInputMethodPlugin/1.1") | "com.meego.meegoimframework.MInputMethodPlugin/1.1") | |||
| #else | ||||
| Q_DECLARE_INTERFACE(MInputMethodPlugin, | ||||
| "org.maliit.maliit-plugins.MInputMethodPlugin/0.80") | ||||
| #endif // HAVE_MEEGOTOUCH | ||||
| #endif | #endif | |||
| End of changes. 2 change blocks. | ||||
| 5 lines changed or deleted | 0 lines changed or added | |||
| minputmethodquickplugin.h | minputmethodquickplugin.h | |||
|---|---|---|---|---|
| skipping to change at line 64 | skipping to change at line 64 | |||
| //! Which QML file to load. | //! Which QML file to load. | |||
| virtual QString qmlFileName() const = 0; | virtual QString qmlFileName() const = 0; | |||
| private: | private: | |||
| Q_DISABLE_COPY(MInputMethodQuickPlugin); | Q_DISABLE_COPY(MInputMethodQuickPlugin); | |||
| Q_DECLARE_PRIVATE(MInputMethodQuickPlugin); | Q_DECLARE_PRIVATE(MInputMethodQuickPlugin); | |||
| MInputMethodQuickPluginPrivate *const d_ptr; | MInputMethodQuickPluginPrivate *const d_ptr; | |||
| }; | }; | |||
| #ifdef HAVE_MEEGOTOUCH | ||||
| Q_DECLARE_INTERFACE(MInputMethodQuickPlugin, | Q_DECLARE_INTERFACE(MInputMethodQuickPlugin, | |||
| "com.meego.meegoimframework.MInputMethodQuickPlugin/1.1 ") | "com.meego.meegoimframework.MInputMethodQuickPlugin/1.1 ") | |||
| #else | ||||
| Q_DECLARE_INTERFACE(MInputMethodQuickPlugin, | ||||
| "org.maliit.maliit-plugins-quick.MInputMethodQuickPlugi | ||||
| n/0.80") | ||||
| #endif // HAVE_MEEGOTOUCH | ||||
| #endif // M_INPUT_METHOD_QUICK_PLUGIN | #endif // M_INPUT_METHOD_QUICK_PLUGIN | |||
| End of changes. 2 change blocks. | ||||
| 6 lines changed or deleted | 0 lines changed or added | |||