FCL/sf/mw/hb: comparison src/hbcore/inputfw/hbinputdef.h

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 Enumerates known keyboard types. Specific bits are reserved
 for keyboard classes. For example all, qwerty based
 keyboards have bit HbQwertyKeyboardMask set and all touch keypads have
 bit HbTouchInputMask set.
 */
-enum HbKeyboardTypeFlag
+enum HbKeyboardTypeFlag {
-{
+HbKeyboardNone                          = 0x00000000,
-HbKeyboardNone          				= 0x00000000,
+HbKeyboard12Key                         = 0x00000001,       /**< Deprecated, use HbKeyboardHardwarePortrait instead. */
-HbKeyboard12Key         				= 0x00000001,                                          /**< Conventional phone keypad */
+HbKeyboardHardwarePortrait                          = HbKeyboard12Key,  /**< Hardware keyboard for portrait orientation. */
+HbKeyboardQwerty                        = 0x00000001 | HbQwertyKeyboardMask,  /**< Deprecated, use HbKeyboardHardwareLandcape instead */
-HbKeyboardQwerty        				= 0x00000001 | HbQwertyKeyboardMask,                   /**< Qwerty keyboard */
+HbKeyboardHardwareLandcape                          = HbKeyboardQwerty, /**< Hardware keyboard for landscape mode. */
+HbKeyboardVirtual12Key                  = 0x00000001 | HbTouchInputMask,    /**< Deprecated, use HbKeyboardTouchPortrait instead. */
-HbKeyboardVirtual12Key  				= 0x00000001 | HbTouchInputMask,                       /**< Touchscreen version of conventional phone keypad */
+HbKeyboardTouchPortrait                             = HbKeyboardVirtual12Key,           /**< Touch keyboard for portrait mode. */
-HbKeyboardVirtualQwerty 				= 0x00000002 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */
+HbKeyboardVirtualQwerty                 = 0x00000002 | HbTouchInputMask | HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */
-HbKeyboardSctPortrait   				= 0x00000003 | HbTouchInputMask,                       /**< Special character selection keypad for portrait view */
+HbKeyboardTouchLandscape                            = HbKeyboardVirtualQwerty, /**< Touch keyboard for landscape mode. */
-HbKeyboardSctLandscape  				= 0x00000004 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */
+HbKeyboardSctPortrait                   = 0x00000003 | HbTouchInputMask,                       /**< Special character selection keypad for portrait view */
-HbKeyboardHwr           				= 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask,    /**< Hand writing recognition keypad */
+HbKeyboardSctLandscape                  = 0x00000004 | HbTouchInputMask | HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */
-HbKeyboardThaiStarSctPortrait   	                = 0x00000006 | HbTouchInputMask,                       /**< Special character selection keypad for star key in Thai portrait view */
+HbKeyboardHwr                           = 0x00000005 | HbTouchInputMask | HbHwrKeyboardMask,   /**< Hand writing recognition keypad */
-HbKeyboardThaiHashSctPortrait   	                = 0x00000007 | HbTouchInputMask                        /**< Special character selection keypad for hash key in Thai portrait view */
+HbKeyboardVirtual12KeyLabels            = 0x00000006 | HbTouchInputMask                        /**< Key labels for virtual 12 key keyboard */
 };
 Q_DECLARE_FLAGS(HbKeyboardType, HbKeyboardTypeFlag)
 /*!
 \enum HbInputModeType
 Enumerates known input modes. Specific bits are reserved
 for classifying different input mode types. For example, all Chinese modes
 have bit HbChineseModeMask set and all Japanese modes have
 bit HbJapaneseModeMask set. HbInputModeCustom is a special case.
 That input mode never appears in standard input mode set, but it must
 be activated separately from UI.
 */
-enum HbInputModeTypeFlag
+enum HbInputModeTypeFlag {
-{
 HbInputModeNone                    = 0x00000000,
 // Default mode
 HbInputModeDefault                 = 0x00000001,                      /**< Default input mode. This may mean diffierent things for different languages. */
 // Numeric input mode
 HbInputModeNumeric                 = 0x00000001 | HbNumericModeMask,  /**< Numeric input mode */
 // Special modes for all languages
 HbInputModeSpeechToText            = 0x00000500,                      /**< Speech-to-text input mode */
 // Chinese modes
 HbInputModePinyin                  = 0x00000001 | HbChineseModeMask,  /**< Chinese PinYin input */
 HbInputModeStroke                  = 0x00000002 | HbChineseModeMask,  /**< Chinese Stroke input */
 HbInputModeZhuyin                  = 0x00000003 | HbChineseModeMask,  /**< Chinese ZhuYin input */
 // Handwriting modes
 HbInputModeHwrLatin                = 0x00000001 | HbHwrModeMask,                       /**< Latin based hand writing recognition */
 HbInputModeHwrLatinFull            = 0x00000002 | HbHwrModeMask,                       /**< Latin based hand writing recognition, full screen */
 HbInputModeHwrChinese              = 0x00000003 | HbHwrModeMask | HbChineseModeMask,   /**< Chinese hand writing recognition */
 HbInputModeHwrChineseFull          = 0x00000004 | HbHwrModeMask | HbChineseModeMask,   /**< Chinese hand writing recognition, full screen */
 // Custom made mode that does not belong to any pre-existing category
 HbInputModeCustom                  = HbChineseModeMask - 1             /**< Custom input mode */
 };
 Q_DECLARE_FLAGS(HbInputModeType, HbInputModeTypeFlag)
 Enumerates supported key event modifiers. There are modifiers for
 shift, fn and chr keys. If a modifier bit is set, then the corresponding key
 is pressed.
 */
-enum HbModifier
+enum HbModifier {
-{
 HbModifierNone         = 0x00000000,
 HbModifierShiftPressed = 0x00000001,     /**< Shift-key is pressed */
 HbModifierChrPressed   = 0x00000002,     /**< Chr-key is pressed */
 HbModifierFnPressed    = 0x00000004      /**< Fn-key is pressed */
 };
 /*!
 \enum HbKeyboardSettingFlags
 Enumerates keyboard setting flags.
 */
-enum HbKeyboardSettingFlag
+enum HbKeyboardSettingFlag {
-{
 HbKeyboardSettingNone         = 0x00000000,
 HbKeyboardSetting12key        = 0x00000001,
 HbKeyboardSettingQwerty       = 0x00000010
 };
 Q_DECLARE_FLAGS(HbKeyboardSettingFlags, HbKeyboardSettingFlag)
 Enumerates supported text case states. HbTextCaseAutomatic is a state
 where the framework automatically tries to conclude when upper case
 state is needed.
 */
-enum HbTextCase
+enum HbTextCase {
-{
 HbTextCaseNone,
 HbTextCaseLower,             /**< Lower text case. */
 HbTextCaseUpper,             /**< Upper text case. */
 HbTextCaseAutomatic          /**< Automatic capital letters. */
 };
 /*!
 \enum HbFnState
 Enumerates possible states for Fn key.
 */
-enum HbFnState
+enum HbFnState {
-{
 HbFnOff,    /**< Fn key inactive. */
 HbFnNext,   /**< Fn key active for the next keypress. */
 HbFnOn      /**< Fn key locked as active. */
 };
 may declare a set of constraints that control its behaviour. Constraint
 bits are set through editor interface class.
 \sa HbEditorInterface
 */
-enum HbEditorConstraint
+enum HbEditorConstraint {
-{
 HbEditorConstraintNone                 = 0,
-HbEditorConstraintAutoCompletingField  = 0x01,   /**< This is auto-completing editor. It remebers what has been typed previously to same editor class. */
+HbEditorConstraintAutoCompletingField  = 0x01,   /**< This is auto-completing editor. It remembers what has been typed previously to same editor class. */
 HbEditorConstraintIgnoreFocus          = 0x02,   /**< Editor rejects input framework focus. */
 HbEditorConstraintFixedInputMode       = 0x04,   /**< Editor doesn't allow initial input mode to be changed. */
 HbEditorConstraintLatinAlphabetOnly    = 0x08    /**< Editor allows only languages and input modes that produce latin alphabets. */
 };
 Q_DECLARE_FLAGS(HbEditorConstraints, HbEditorConstraint)
+Q_DECLARE_OPERATORS_FOR_FLAGS(HbEditorConstraints)
 /*!
 \enum HbInputDigitType
 Enumerates known digit type settings.
 */
-enum HbInputDigitType
+enum HbInputDigitType {
-{
 HbDigitTypeNone = 0,
 HbDigitTypeLatin,          /**< Latin digits in use */
 HbDigitTypeArabicIndic,    /**< Arabic indic digits in use */
 HbDigitTypeEasternArabic,  /**< Eastern arabic digits in use */
 HbDigitTypeDevanagari      /**< Devanagari digits in use */
 };
 /*!
 Enumerates operation modes for touch keypad.
 */
-enum HbKeypadMode{
+enum HbKeypadMode {
 EModeAbc,        /**< Display aplhanumeric keypad */
 EModeNumeric     /**< Display number mode keypad */
 };
 /*!
 Enumerates known editor classes. If this value is set through
 HbEditorInterface, it will have an effect on some input functionality.
 */
 enum HbInputEditorClass {
 HbInputEditorClassUnknown = 0,
 HbInputEditorClassEmail,
 HbInputEditorClassUrl,
 HbInputEditorClassUsername,
 HbInputEditorClassPassword,
 HbInputEditorClassPhoneNumber,
 HbInputEditorClassStreetAddress,
 HbInputEditorClassZipCode,
 HbInputEditorClassSIPAddress,
 HbInputEditorClassFirstName,
 HbInputEditorClassLastName,
 HbInputEditorClassFullName,
 HbInputEditorClassFaxNumber,
 HbInputEditorClassTitle,
 HbInputEditorClassProfession,
 HbInputEditorClassCity,
 HbInputEditorClassDestination,
 HbInputEditorClassNetworkDomain,
 HbInputEditorClassNetworkName,
 HbInputEditorClassLastItem          // Keep this last, but never use.
 };
 /*!
 Enumerates primary candidate modes.
 */
-enum HbPrimaryCandidateMode{
+enum HbPrimaryCandidateMode {
 HbPrimaryCandidateModeBestPrediction,        /**< Display best prediction as the primary candidate */
 HbPrimaryCandidateModeExactTyping            /**< Display exact typing as the primary candidate */
 };
 /*!
 Enumerates typing correction levels.
 */
-enum HbTypingCorrectionLevel{
+enum HbTypingCorrectionLevel {
 HbTypingCorrectionLevelLow,
 HbTypingCorrectionLevelMedium,
 HbTypingCorrectionLevelHigh
 };

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 7	923ff622b8b9
child 21	4633027730f5
child 34	ed14f46c0e55