diff --git a/kerry/src/hitwidget_layout.ui b/kerry/src/hitwidget_layout.ui
index 2b27782..517874f 100644
--- a/kerry/src/hitwidget_layout.ui
+++ b/kerry/src/hitwidget_layout.ui
@@ -188,7 +188,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="2">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -229,7 +229,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout27</cstring>
+                        <cstring>layout27</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kerry/src/kcm/beagle.cpp b/kerry/src/kcm/beagle.cpp
index d3211f6..ceb1184 100644
--- a/kerry/src/kcm/beagle.cpp
+++ b/kerry/src/kcm/beagle.cpp
@@ -36,18 +36,18 @@ KCMBeagle::KCMBeagle(TQWidget *parent, const char *name)
 {
   setButtons(Default+Apply);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   m_tab = new TQTabWidget(this);
-  tqlayout->addWidget(m_tab);
+  layout->addWidget(m_tab);
 
   m_indexing = new KCMBeagleIndexing( m_tab, name );
-  m_indexing->tqlayout()->setMargin( KDialog::marginHint() );
+  m_indexing->layout()->setMargin( KDialog::marginHint() );
 
   m_backends = new KCMBeagleBackends( m_tab, name );
-  m_backends->tqlayout()->setMargin( KDialog::marginHint() );
+  m_backends->layout()->setMargin( KDialog::marginHint() );
 
   m_status = new KCMBeagleStatus( m_tab, name );
-  m_status->tqlayout()->setMargin( KDialog::marginHint() );
+  m_status->layout()->setMargin( KDialog::marginHint() );
 
   m_tab->addTab(m_indexing, i18n("&Indexing"));
   m_tab->addTab(m_backends, i18n("&Backends"));
diff --git a/kerry/src/kcm/indexing.cpp b/kerry/src/kcm/indexing.cpp
index defb795..263261b 100644
--- a/kerry/src/kcm/indexing.cpp
+++ b/kerry/src/kcm/indexing.cpp
@@ -47,7 +47,7 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * )
     TQGroupBox* gb_general = new TQGroupBox(0, Qt::Vertical, i18n("General"), this);
     top_layout->addWidget(gb_general);
     gb_general->setFlat(true);
-    TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->layout(), KDialog::spacingHint() );
 
     startBeagle = new TQCheckBox(i18n("Start Beagle indexing service automatically"), gb_general);
     gb_general_layout->addWidget( startBeagle);
@@ -59,7 +59,7 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * )
     TQGroupBox* gb_index = new TQGroupBox(0, Qt::Vertical, i18n("Index"), this);
     top_layout->addWidget(gb_index);
     gb_index->setFlat(true);
-    TQVBoxLayout* gb_index_layout = new TQVBoxLayout( gb_index->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout* gb_index_layout = new TQVBoxLayout( gb_index->layout(), KDialog::spacingHint() );
 
     TQHBoxLayout* qh_index = new TQHBoxLayout(gb_index_layout);
     indexHome = new TQCheckBox(i18n("Index my home folder"), gb_index);
@@ -96,7 +96,7 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * )
     TQGroupBox* gb_privacy = new TQGroupBox(0, Qt::Vertical, i18n("Privacy"), this);
     top_layout->addWidget(gb_privacy);
     gb_privacy->setFlat(true);
-    TQVBoxLayout* gb_privacy_layout = new TQVBoxLayout( gb_privacy->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout* gb_privacy_layout = new TQVBoxLayout( gb_privacy->layout(), KDialog::spacingHint() );
 
     TQLabel* label_privacy = new TQLabel(i18n( "Specify any resource, such as folder or pattern, you wish to exclude from indexing." ), gb_privacy);
     gb_privacy_layout->addWidget(label_privacy);
diff --git a/kerry/src/kcm/kerry.cpp b/kerry/src/kcm/kerry.cpp
index 69cabdd..beb56d7 100644
--- a/kerry/src/kcm/kerry.cpp
+++ b/kerry/src/kcm/kerry.cpp
@@ -39,20 +39,20 @@ KCMKerry::KCMKerry(TQWidget *parent, const char *name)
 {
   setButtons(Default+Apply);
  
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   m_tab = new TQTabWidget(this);
-  tqlayout->addWidget(m_tab);
+  layout->addWidget(m_tab);
   m_search = new KCMKerrySearch( m_tab, name );
-  m_search->tqlayout()->setMargin( KDialog::marginHint() );
+  m_search->layout()->setMargin( KDialog::marginHint() );
 
   m_indexing = new KCMBeagleIndexing( m_tab, name );
-  m_indexing->tqlayout()->setMargin( KDialog::marginHint() );
+  m_indexing->layout()->setMargin( KDialog::marginHint() );
 
   m_backends = new KCMBeagleBackends( m_tab, name );
-  m_backends->tqlayout()->setMargin( KDialog::marginHint() );
+  m_backends->layout()->setMargin( KDialog::marginHint() );
 
   m_status = new KCMBeagleStatus( m_tab, name );
-  m_status->tqlayout()->setMargin( KDialog::marginHint() );
+  m_status->layout()->setMargin( KDialog::marginHint() );
 
   m_tab->addTab(m_search, i18n("&Search"));
   m_tab->addTab(m_indexing, i18n("&Indexing"));
diff --git a/kerry/src/kcm/search.cpp b/kerry/src/kcm/search.cpp
index e33563e..1f8e63d 100644
--- a/kerry/src/kcm/search.cpp
+++ b/kerry/src/kcm/search.cpp
@@ -32,7 +32,7 @@ KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * )
     TQGroupBox* gb_general = new TQGroupBox(0, Qt::Vertical, i18n("General"), this);
     gb_general->setFlat(true);
     top_layout->addWidget(gb_general);
-    TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->layout(), KDialog::spacingHint() );
 
     TQHBoxLayout* qh_layout = new TQHBoxLayout(gb_general_layout);
     TQLabel* label_order = new TQLabel(i18n("Default result sort order:"), gb_general);
@@ -60,7 +60,7 @@ KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * )
 
     // Global Shortcuts
     TQGroupBox* gb_keys = new TQGroupBox(0, Qt::Vertical, i18n("Global Shortcuts"), this);
-    TQVBoxLayout* gb_keys_layout = new TQVBoxLayout( gb_keys->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout* gb_keys_layout = new TQVBoxLayout( gb_keys->layout(), KDialog::spacingHint() );
     top_layout->addWidget(gb_keys);
     gb_keys->setFlat(true);
 
diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp
index 8b027c3..5e7999a 100644
--- a/kerry/src/kerryapp.cpp
+++ b/kerry/src/kerryapp.cpp
@@ -177,8 +177,8 @@ void KerryApplication::historySelected(int id)
 
 void KerryApplication::searchPrimarySelection()
 {
-  TQApplication::tqclipboard()->setSelectionMode( true );
-  TQString text = TQApplication::tqclipboard()->text();
+  TQApplication::clipboard()->setSelectionMode( true );
+  TQString text = TQApplication::clipboard()->text();
   if (!text.isEmpty() && hitListWindow)
     hitListWindow->search(text);
 }
diff --git a/kerry/src/searchdlg_layout.ui b/kerry/src/searchdlg_layout.ui
index ed21038..c034114 100644
--- a/kerry/src/searchdlg_layout.ui
+++ b/kerry/src/searchdlg_layout.ui
@@ -49,7 +49,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -168,7 +168,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -276,7 +276,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -706,7 +706,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">