diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp
index 19a86749..c22bb4fc 100644
--- a/src/KeyBindingEditor.cpp
+++ b/src/KeyBindingEditor.cpp
@@ -1,232 +1,232 @@
 /*
     Copyright 2008 by Robert Knight <robertknight@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301  USA.
 */
 
 // Own
 #include "KeyBindingEditor.h"
 
 // Qt
 #include <QtGui/QKeyEvent>
 // KDE
 #include <KIcon>
 #include <KLocalizedString>
 
 // Konsole
 #include "ui_KeyBindingEditor.h"
 #include "KeyboardTranslator.h"
 
 using namespace Konsole;
 
 KeyBindingEditor::KeyBindingEditor(QWidget* parent)
     : QWidget(parent)
     , _translator(new KeyboardTranslator(QString()))
 {
     _ui = new Ui::KeyBindingEditor();
     _ui->setupUi(this);
 
     // description edit
     connect(_ui->descriptionEdit , SIGNAL(textChanged(QString)) ,
             this , SLOT(setTranslatorDescription(QString)));
 
     // key bindings table
     _ui->keyBindingTable->setColumnCount(2);
 
     QStringList labels;
     labels << i18n("Key Combination") << i18n("Output");
 
     _ui->keyBindingTable->setHorizontalHeaderLabels(labels);
     _ui->keyBindingTable->horizontalHeader()->setStretchLastSection(true);
     _ui->keyBindingTable->verticalHeader()->hide();
     _ui->keyBindingTable->setSelectionBehavior(QAbstractItemView::SelectRows);
 
     // add and remove buttons
     _ui->addEntryButton->setIcon(KIcon("list-add"));
     _ui->removeEntryButton->setIcon(KIcon("list-remove"));
 
     connect(_ui->removeEntryButton , SIGNAL(clicked()) , this , SLOT(removeSelectedEntry()));
     connect(_ui->addEntryButton , SIGNAL(clicked()) , this , SLOT(addNewEntry()));
 
     // test area
     _ui->testAreaInputEdit->installEventFilter(this);
 }
 
 KeyBindingEditor::~KeyBindingEditor()
 {
     delete _ui;
     delete _translator;
 }
 
 void KeyBindingEditor::removeSelectedEntry()
 {
     QList<QTableWidgetItem*> uniqueList;
 
     foreach(QTableWidgetItem* item, _ui->keyBindingTable->selectedItems()) {
         if (item->column() == 1) //Select item at the first column
             item = _ui->keyBindingTable->item(item->row(), 0);
 
         if (!uniqueList.contains(item))
             uniqueList.append(item);
     }
 
     foreach(QTableWidgetItem* item, uniqueList) {
         // get the first item in the row which has the entry
 
         KeyboardTranslator::Entry existing = item->data(Qt::UserRole).
                                              value<KeyboardTranslator::Entry>();
 
         _translator->removeEntry(existing);
 
         _ui->keyBindingTable->removeRow(item->row());
     }
 }
 
 void KeyBindingEditor::addNewEntry()
 {
     _ui->keyBindingTable->insertRow(_ui->keyBindingTable->rowCount());
 
     int newRowCount = _ui->keyBindingTable->rowCount();
 
     // block signals here to avoid triggering bindingTableItemChanged() slot call
     _ui->keyBindingTable->blockSignals(true);
 
     _ui->keyBindingTable->setItem(newRowCount - 1, 0, new QTableWidgetItem());
     _ui->keyBindingTable->setItem(newRowCount - 1, 1, new QTableWidgetItem());
 
     _ui->keyBindingTable->blockSignals(false);
 
     // make sure user can see new row
     _ui->keyBindingTable->scrollToItem(_ui->keyBindingTable->item(newRowCount - 1, 0));
 }
 
 bool KeyBindingEditor::eventFilter(QObject* watched , QEvent* event)
 {
     if (watched == _ui->testAreaInputEdit) {
         if (event->type() == QEvent::KeyPress) {
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
 
             // The state here is currently set to the state that a newly started
             // terminal in Konsole will be in ( which is also the same as the
             // state just after a reset ), this has 'ANSI' turned on and all other
             // states off.
             //
             // TODO: It may be useful to be able to specify the state in the 'test input'
             // area, but preferably not in a way which clutters the UI with lots of
             // checkboxes.
             //
             const KeyboardTranslator::States states = KeyboardTranslator::AnsiState;
 
             KeyboardTranslator::Entry entry = _translator->findEntry(keyEvent->key() ,
                                               keyEvent->modifiers(),
                                               states);
 
             if (!entry.isNull()) {
                 _ui->testAreaInputEdit->setText(entry.conditionToString());
                 _ui->testAreaOutputEdit->setText(entry.resultToString(true, keyEvent->modifiers()));
             } else {
                 _ui->testAreaInputEdit->setText(keyEvent->text());
                 _ui->testAreaOutputEdit->setText(keyEvent->text());
             }
 
             keyEvent->accept();
             return true;
         }
     }
     return false;
 }
 
 void KeyBindingEditor::setDescription(const QString& newDescription)
 {
     _ui->descriptionEdit->setText(newDescription);
 
     setTranslatorDescription(newDescription);
 }
 
 void KeyBindingEditor::setTranslatorDescription(const QString& newDescription)
 {
     if (_translator)
         _translator->setDescription(newDescription);
 }
 
 QString KeyBindingEditor::description() const
 {
     return _ui->descriptionEdit->text();
 }
 
 void KeyBindingEditor::setup(const KeyboardTranslator* translator)
 {
     delete _translator;
 
     _translator = new KeyboardTranslator(*translator);
 
     // setup description edit
-    _ui->descriptionEdit->setClearButtonShown(true);
+    _ui->descriptionEdit->setClearButtonEnabled(true);
     _ui->descriptionEdit->setText(translator->description());
 
     // setup key binding table
     setupKeyBindingTable(translator);
 }
 
 KeyboardTranslator* KeyBindingEditor::translator() const
 {
     return _translator;
 }
 
 void KeyBindingEditor::bindingTableItemChanged(QTableWidgetItem* item)
 {
     QTableWidgetItem* key = _ui->keyBindingTable->item(item->row() , 0);
     KeyboardTranslator::Entry existing = key->data(Qt::UserRole).value<KeyboardTranslator::Entry>();
 
     QString condition = key->text();
     QString result = _ui->keyBindingTable->item(item->row() , 1)->text();
 
     KeyboardTranslator::Entry entry = KeyboardTranslatorReader::createEntry(condition, result);
     _translator->replaceEntry(existing, entry);
 
     // block signals to prevent this slot from being called repeatedly
     _ui->keyBindingTable->blockSignals(true);
 
     key->setData(Qt::UserRole, QVariant::fromValue(entry));
 
     _ui->keyBindingTable->blockSignals(false);
 }
 
 void KeyBindingEditor::setupKeyBindingTable(const KeyboardTranslator* translator)
 {
     disconnect(_ui->keyBindingTable , SIGNAL(itemChanged(QTableWidgetItem*)) , this ,
                SLOT(bindingTableItemChanged(QTableWidgetItem*)));
 
     QList<KeyboardTranslator::Entry> entries = translator->entries();
     _ui->keyBindingTable->setRowCount(entries.count());
 
     for (int row = 0 ; row < entries.count() ; row++) {
         const KeyboardTranslator::Entry& entry = entries.at(row);
 
         QTableWidgetItem* keyItem = new QTableWidgetItem(entry.conditionToString());
         keyItem->setData(Qt::UserRole , QVariant::fromValue(entry));
 
         QTableWidgetItem* textItem = new QTableWidgetItem(QString(entry.resultToString()));
 
         _ui->keyBindingTable->setItem(row, 0, keyItem);
         _ui->keyBindingTable->setItem(row, 1, textItem);
     }
     _ui->keyBindingTable->sortItems(0);
 
     connect(_ui->keyBindingTable , SIGNAL(itemChanged(QTableWidgetItem*)) , this ,
             SLOT(bindingTableItemChanged(QTableWidgetItem*)));
 }
 
diff --git a/src/KeyBindingEditor.ui b/src/KeyBindingEditor.ui
index 142580ae..57281ddf 100644
--- a/src/KeyBindingEditor.ui
+++ b/src/KeyBindingEditor.ui
@@ -1,125 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KeyBindingEditor</class>
  <widget class="QWidget" name="KeyBindingEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>374</width>
     <height>530</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLabel" name="descriptionLabel">
        <property name="text">
         <string>Description:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="KLineEdit" name="descriptionEdit"/>
+      <widget class="QLineEdit" name="descriptionEdit"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QTableWidget" name="keyBindingTable">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="QPushButton" name="addEntryButton">
        <property name="text">
         <string>Add</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="removeEntryButton">
        <property name="text">
         <string>Remove</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string comment="Title of the area where you test your keys are properly configured">Test Area</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Input:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="KLineEdit" name="testAreaInputEdit"/>
+       <widget class="QLineEdit" name="testAreaInputEdit"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Output:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="KLineEdit" name="testAreaOutputEdit">
+       <widget class="QLineEdit" name="testAreaOutputEdit">
         <property name="readOnly">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>