diff -r 7516d6d86cf5 -r ed14f46c0e55 src/hbplugins/inputmethods/touchinput/virtualqwerty.h --- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Mon Oct 04 17:49:30 2010 +0300 +++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Mon Oct 18 18:23:13 2010 +0300 @@ -29,7 +29,6 @@ #include #include #include -#include #include class QTimer; @@ -65,8 +64,7 @@ bool filterEvent(const QEvent* event); public slots: - void orientationAboutToChange(); - void rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode); + void orientationAboutToChange(); // keypad related slots void keypadClosed(); void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod vkbCloseMethod); @@ -102,12 +100,13 @@ void closeExactWordPopup(); void launchExactWordPopup(QString exactWord); void closeAutoCompletionPopup(); + void closeCandidatePopup(); void launchAutoCompletionPopup(const QStringList &candidates); HbKeyboardType currentKeyboardType() const; private slots: - void candidatePopupCancelled(); - void primaryCandidateModeChanged(HbPrimaryCandidateMode mode); + void primaryCandidateModeChanged(HbPrimaryCandidateMode mode); + void restorePreviousState(); private: void initializePredictiveMode(); @@ -116,9 +115,10 @@ void launchCandidatePopup(); QPointF getCursorCoordinatePosition(); void loadKeymap(const HbInputLanguage &newLanguage); + void createSctKeypad(); private: - void openKeypad(HbInputVkbWidget * keypadToOpen, bool inMinimizedMode = false); + void openKeypad(HbInputVkbWidget *keypadToOpen); HbInputVkbWidget *constructKeyboard(HbKeypadMode currentInputType); private: @@ -140,7 +140,6 @@ HbExactWordPopup *mExactWordPopup; HbCandidateList *mCandidatePopup; - bool mOrientationAboutToChange; int mShiftKeyState; // mode handlers HbInputModeHandler *mActiveModeHandler;