--- a/src/hbinput/inputwidgets/hbinputvkbwidget.h	Wed Aug 18 10:05:37 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.h	Thu Sep 02 20:44:51 2010 +0300
@@ -29,7 +29,6 @@
 #include <hbdialog.h>
 #include <hbinputdef.h>
 #include <hbinputvirtualkeyboard.h>
-#include <hbinputvirtualrocker.h>
 
 const int HbRepeatTimeout = 1000;
 const int HbRepeatTimeoutShort = 150;
@@ -45,6 +44,7 @@
 class HbView;
 class HbKeymap;
 class HbPanGesture;
+class HbFrameDrawer;
 
 class HB_INPUT_EXPORT HbInputVkbWidget : public HbWidget, public HbVirtualKeyboard
 {
@@ -95,9 +95,6 @@
     virtual void setContentItem(QGraphicsLayoutItem *item);
     virtual QGraphicsLayoutItem *contentItem() const;
 
-    virtual void setRockerVisible(bool visible);
-    virtual bool isRockerVisible() const;
-
     virtual void setKeyboardDimmed(bool dimmed);
     virtual void setBackgroundDrawing(bool backgroundEnabled);
     virtual QList<HbKeyPressProbability> probableKeypresses();
@@ -117,15 +114,15 @@
 
 protected:
     // layout
-    QSizeF keypadButtonAreaSize();
-    virtual QPointF rockerPosition();
+    QSizeF keypadButtonAreaSize();    
+    HbFrameDrawer* iconDrawer();
 
 public slots:
     void showSettingList();
     void showSettingsView();
     void closeSettingsView();
     void executeMethodDialog();
-    void closeSettingList();
+    virtual void closeSettingList();
     void settingsClosed();
     void showSmileyPicker(int rows = 0, int columns = 0);
     void keypadLanguageChangeAnimationUpdate(qreal value);
@@ -139,7 +136,6 @@
 
 signals:
     void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod closeMethod);
-    void rockerDirection(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode);
     void flickEvent(HbInputVkbWidget::HbFlickDirection direction);
     void smileySelected(QString text);
     void mouseMovedOutOfButton();