minputmethodnamespace.h   minputmethodnamespace.h 
skipping to change at line 20 skipping to change at line 20
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License version 2.1 as published by the Free Software Foundation * License version 2.1 as published by the Free Software Foundation
* and appearing in the file LICENSE.LGPL included in the packaging * and appearing in the file LICENSE.LGPL included in the packaging
* of this file. * of this file.
*/ */
#ifndef MINPUTMETHODNAMESPACE_H #ifndef MINPUTMETHODNAMESPACE_H
#define MINPUTMETHODNAMESPACE_H #define MINPUTMETHODNAMESPACE_H
#include <QSharedPointer>
#include <QMetaType> #include <QMetaType>
#include <QSharedPointer>
/* This namespace is deprecated. The Maliit:: namespace is the new equivale
nt.
* New interfaces should use Maliit instead. */
namespace MInputMethod { namespace MInputMethod {
/*! /*!
* This enum contains values of the orientation angle of windows in the application. * This enum contains values of the orientation angle of windows in the application.
* *
* \sa Orientation * \sa Orientation
*/ */
enum OrientationAngle { enum OrientationAngle {
Angle0 = 0, Angle0 = 0,
Angle90 = 90, Angle90 = 90,
Angle180 = 180, Angle180 = 180,
Angle270 = 270 Angle270 = 270
skipping to change at line 76 skipping to change at line 80
//! Type of toolbar widget //! Type of toolbar widget
enum ItemType { enum ItemType {
//! Undefined item type //! Undefined item type
ItemUndefined, ItemUndefined,
//! Item should be visualized as button //! Item should be visualized as button
ItemButton, ItemButton,
//! Item should be visualized as label //! Item should be visualized as label
ItemLabel, ItemLabel
}; };
//! Type of visible premiss for toolbar button //! Type of visible premiss for toolbar button
enum VisibleType { enum VisibleType {
//! Item's visibility will not be changed automatically //! Item's visibility will not be changed automatically
VisibleUndefined, VisibleUndefined,
//! Item's visibility depends on text selection //! Item's visibility depends on text selection
VisibleWhenSelectingText, VisibleWhenSelectingText,
//! Item is always visible //! Item is always visible
VisibleAlways, VisibleAlways
}; };
//! Type of action //! Type of action
enum ActionType { enum ActionType {
//! Do nothing //! Do nothing
ActionUndefined, ActionUndefined,
//! Send key sequence like Ctrl+D //! Send key sequence like Ctrl+D
ActionSendKeySequence, ActionSendKeySequence,
skipping to change at line 121 skipping to change at line 125
//! Show some group of items //! Show some group of items
ActionShowGroup, ActionShowGroup,
//! Hide some group of items //! Hide some group of items
ActionHideGroup, ActionHideGroup,
//! Close virtual keyboard //! Close virtual keyboard
ActionClose, ActionClose,
//! Standard copy/paste button //! Standard copy/paste button
ActionCopyPaste, ActionCopyPaste
}; };
/*! /*!
* \brief State of Copy/Paste button. * \brief State of Copy/Paste button.
*/ */
enum CopyPasteState { enum CopyPasteState {
//! Copy/Paste button is hidden //! Copy/Paste button is hidden
InputMethodNoCopyPaste, InputMethodNoCopyPaste,
//! Copy button is accessible //! Copy button is accessible
 End of changes. 6 change blocks. 
4 lines changed or deleted 9 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,
"com.meego.meegoimframework.MInputMethodPlugin/1.1")
#else
Q_DECLARE_INTERFACE(MInputMethodPlugin, Q_DECLARE_INTERFACE(MInputMethodPlugin,
"org.maliit.maliit-plugins.MInputMethodPlugin/0.80") "org.maliit.maliit-plugins.MInputMethodPlugin/0.80")
#endif // HAVE_MEEGOTOUCH
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 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,
"com.meego.meegoimframework.MInputMethodQuickPlugin/1.1
")
#else
Q_DECLARE_INTERFACE(MInputMethodQuickPlugin, Q_DECLARE_INTERFACE(MInputMethodQuickPlugin,
"org.maliit.maliit-plugins-quick.MInputMethodQuickPlugi n/0.80") "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. 
0 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/