--- a/src/hbplugins/inputmethods/touchinput/virtual12key.h Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.h Fri Jun 11 13:58:22 2010 +0300
@@ -36,7 +36,6 @@
class HbInputVkbWidget;
class Hb12KeyTouchKeyboard;
class HbSctKeyboard;
-class HbInputThaiSpecialPopup;
class HbCandidateList;
class HbPredictionEngine;
class HbAction;
@@ -46,8 +45,6 @@
class HbInputPrediction12KeyHandler;
class HbInputBasic12KeyHandler;
class HbInputNumeric12KeyHandler;
-class HbInputBasic12KeyThaiHandler;
-class HbInputPrediction12KeyThaiHandler;
class HbVirtual12Key : public HbInputAbstractMethod
{
@@ -92,9 +89,7 @@
void launchAutoCompletionPopup(const QStringList &candidates);
void closeAutoCompletionPopup();
void switchMode(int keyCode);
- void showThaiSpecialCharacters(uint buttonId);
void starKeySelected();
- uint previousChar();
HbKeyboardType currentKeyboardType() const;
private:
void openKeypad(HbInputVkbWidget * keypadToOpen,bool inMinimizedMode = false);
@@ -115,7 +110,7 @@
void mouseMovedOutOfButton();
void smileySelected(QString smiley);
void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
- void thaiSctCharacterSelected(QString sctChar);
+ void aboutToActivateCustomAction(HbAction *custAction);
private:
// mCurrentKeypad contains currently active keypad, we dont need to have
@@ -125,8 +120,6 @@
QPointer<Hb12KeyTouchKeyboard> mItutKeypad;
// contains sct keypad
QPointer<HbSctKeyboard> mSctKeypad;
- // contains Thai special characters
- QPointer<HbInputThaiSpecialPopup> mThaiSpecialChar;
//Owned by the keymap factory
const HbKeymap* mKeymap;
@@ -141,9 +134,7 @@
HbInputPrediction12KeyHandler *mPredictionModeHandler;
HbInputBasic12KeyHandler *mBasicModeHandler;
HbInputNumeric12KeyHandler *mNumericModeHandler;
- HbInputBasic12KeyThaiHandler *mBasic12keyThaiHandler;
- HbInputPrediction12KeyThaiHandler *mPrediction12keyThaiHandler;
-
+
QPointer<HbVkbHost> mVkbHost;
bool mKeyboardChangeAlreadyInprogress;
};