diff --git a/plugins/cvs/checkoutdialog.ui b/plugins/cvs/checkoutdialog.ui
index 404b795bc..4c29b0bbf 100644
--- a/plugins/cvs/checkoutdialog.ui
+++ b/plugins/cvs/checkoutdialog.ui
@@ -1,161 +1,156 @@
 <ui version="4.0" >
  <class>CheckoutDialogBase</class>
  <widget class="QDialog" name="CheckoutDialogBase" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>252</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Checkout</string>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel1" >
        <property name="text" >
         <string>&amp;Local destination directory:</string>
        </property>
        <property name="wordWrap" >
         <bool>false</bool>
        </property>
        <property name="buddy" >
         <cstring>localWorkingDir</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KUrlRequester" name="localWorkingDir" />
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel2" >
        <property name="sizePolicy" >
         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text" >
         <string>&amp;Server path (e.g. :pserver:username@cvs.example.com:/cvsroot):</string>
        </property>
        <property name="wordWrap" >
         <bool>false</bool>
        </property>
        <property name="buddy" >
         <cstring>serverPath</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="serverPath" />
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel3" >
        <property name="text" >
         <string>&amp;Module:</string>
        </property>
        <property name="buddy" >
         <cstring>module</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KComboBox" name="module" >
        <property name="editable" >
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel4" >
        <property name="text" >
         <string>Tag/Branch:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="tag" />
      </item>
     </layout>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>CheckoutDialogBase</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>248</x>
      <y>254</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>CheckoutDialogBase</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>316</x>
      <y>260</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/cvs/importmetadatawidget.ui b/plugins/cvs/importmetadatawidget.ui
index bae11c88b..3c1376b26 100644
--- a/plugins/cvs/importmetadatawidget.ui
+++ b/plugins/cvs/importmetadatawidget.ui
@@ -1,145 +1,140 @@
 <ui version="4.0" >
  <class>ImportMetadataWidget</class>
  <widget class="QWidget" name="ImportMetadataWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>581</width>
     <height>261</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Import</string>
   </property>
   <layout class="QFormLayout" >
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0" >
     <widget class="QLabel" name="labelUrl" >
      <property name="text" >
       <string>Source Directory:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1" >
     <widget class="KUrlRequester" name="sourceLoc" />
    </item>
    <item row="1" column="0" >
     <widget class="QLabel" name="repositoryLabel" >
      <property name="text" >
       <string>&amp;Repository:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>repository</cstring>
      </property>
     </widget>
    </item>
    <item row="1" column="1" >
     <widget class="QLineEdit" name="repository" />
    </item>
    <item row="2" column="0" >
     <widget class="QLabel" name="moduleLabel" >
      <property name="text" >
       <string>Mo&amp;dule:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>module</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1" >
     <widget class="QLineEdit" name="module" />
    </item>
    <item row="3" column="0" >
     <widget class="QLabel" name="vendorLabel" >
      <property name="text" >
       <string>&amp;Vendor tag:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>vendorTag</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1" >
     <widget class="QLineEdit" name="vendorTag" >
      <property name="text" >
       <string>vendor</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0" >
     <widget class="QLabel" name="releaseLabel" >
      <property name="text" >
       <string>Re&amp;lease tag:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>releaseTag</cstring>
      </property>
     </widget>
    </item>
    <item row="4" column="1" >
     <widget class="QLineEdit" name="releaseTag" >
      <property name="text" >
       <string>start</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0" >
     <widget class="QLabel" name="commentLabel" >
      <property name="text" >
       <string>Co&amp;mment:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>comment</cstring>
      </property>
     </widget>
    </item>
    <item row="5" column="1" >
     <widget class="KTextEdit" name="comment" />
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
    <header>ktextedit.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>repository</tabstop>
   <tabstop>module</tabstop>
   <tabstop>vendorTag</tabstop>
   <tabstop>releaseTag</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>