diff -r 627c4a0fd0e7 -r c3690ec91ef8 src/hbinput/inputwidgets/hbinputbutton.cpp
--- a/src/hbinput/inputwidgets/hbinputbutton.cpp	Fri Jun 11 13:58:22 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
@@ -51,8 +51,8 @@
 };
 
 HbInputButtonPrivate::HbInputButtonPrivate()
- : mType(HbInputButton::ButtonTypeNormal), mState(HbInputButton::ButtonStateReleased),
-   mPosition(0, 0), mSize(1, 1), mKeyCode(-1), mAutoRepeat(false)
+    : mType(HbInputButton::ButtonTypeNormal), mState(HbInputButton::ButtonStateReleased),
+      mPosition(0, 0), mSize(1, 1), mKeyCode(-1), mAutoRepeat(false)
 {
     for (int i = 0; i < HbInputButton::ButtonTextIndexCount; ++i) {
         mTexts.append("");
@@ -64,8 +64,8 @@
 }
 
 HbInputButtonPrivate::HbInputButtonPrivate(int keyCode, const QPoint &position, const QSize &size)
- : mType(HbInputButton::ButtonTypeNormal), mState(HbInputButton::ButtonStateReleased),
-   mPosition(position), mSize(size), mKeyCode(keyCode), mAutoRepeat(false)
+    : mType(HbInputButton::ButtonTypeNormal), mState(HbInputButton::ButtonStateReleased),
+      mPosition(position), mSize(size), mKeyCode(keyCode), mAutoRepeat(false)
 {
     for (int i = 0; i < HbInputButton::ButtonTextIndexCount; ++i) {
         mTexts.append("");
@@ -94,10 +94,10 @@
 }
 
 HbInputButtonPrivate::HbInputButtonPrivate(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state,
-                                           const QPoint &position, const QSize &size, int keyCode, bool autoRepeat,
-                                           const QList<QString> &texts, const QString &mappedCharacters, const QList<HbIcon> &icons)
- : mType(type), mState(state), mPosition(position), mSize(size), mKeyCode(keyCode), mAutoRepeat(autoRepeat),
-   mMappedCharacters(mappedCharacters)
+        const QPoint &position, const QSize &size, int keyCode, bool autoRepeat,
+        const QList<QString> &texts, const QString &mappedCharacters, const QList<HbIcon> &icons)
+    : mType(type), mState(state), mPosition(position), mSize(size), mKeyCode(keyCode), mAutoRepeat(autoRepeat),
+      mMappedCharacters(mappedCharacters)
 {
     for (int i = 0; i < HbInputButton::ButtonTextIndexCount; ++i) {
         if (i < texts.count()) {
@@ -150,7 +150,7 @@
 Constructor
 */
 HbInputButton::HbInputButton()
- : d_ptr(new HbInputButtonPrivate)
+    : d_ptr(new HbInputButtonPrivate)
 {
 }
 
@@ -163,7 +163,7 @@
 size is button's size in grid cell units.
 */
 HbInputButton::HbInputButton(int keyCode, const QPoint &position, const QSize &size)
- : d_ptr(new HbInputButtonPrivate(keyCode, position, size))
+    : d_ptr(new HbInputButtonPrivate(keyCode, position, size))
 {
 }
 
@@ -357,7 +357,7 @@
         if (i < texts.count()) {
             d->mTexts.replace(i, texts.at(i));
         } else {
-            d->mTexts.replace(i, QString());
+            d->mTexts[i].clear();
         }
     }
 }
@@ -434,7 +434,7 @@
 
 /*!
 Updates all button icons.
-Button can have three different icons. Icon position 
+Button can have three different icons. Icon position
 will depend of other buttons icons and texts. If list contains
 more icons, then the rest will be ignored. Icon with same index
 than text will override the text.