Rename obsolete tq methods to standard names

(cherry picked from commit ba6b21419810544e0c8666969d21d72161d9084c)

19 files changed, 80 insertions, 80 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
index 98a2cfff..e19951b2 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
@@ -32,7 +32,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 2eb3a124..f3568543 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -689,7 +689,7 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char
   connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&)));
   connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&)));
   connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&)));
-  connect(d_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
+  connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
 
   // Load the languages first, then the countries and create the
   // menus for the languages last, so they will have flags
@@ -768,13 +768,13 @@ void LanguageOptions::slotDeleteClicked()
   enableLangWidgets();
 
   // doesn't work yet
-  if (d_shortName->count() != 0 && d_kbtqlayout->isEnabled())
+  if (d_shortName->count() != 0 && d_kblayout->isEnabled())
   {
-    for (int i = 0; i < d_kbtqlayout->count(); i++)
+    for (int i = 0; i < d_kblayout->count(); i++)
     {
-      if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
+      if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
       {
-        d_kbtqlayout->setCurrentItem(i);
+        d_kblayout->setCurrentItem(i);
         break;
       }
     }
@@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked()
 }
 
 
-void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout)
+void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout)
 {
-  m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem());
+  m_langSet.setKeyboardLayout(layout, d_shortName->currentItem());
   emit widgetModified();
   m_hasChanged = true;
 }
@@ -818,16 +818,16 @@ void LanguageOptions::enableLangWidgets()
         TQDataStream stream(replyData, IO_ReadOnly);
         stream >> layouts;
         layouts.prepend(TQString());
-        d_kbtqlayout->clear();
-        d_kbtqlayout->insertStringList(layouts);
+        d_kblayout->clear();
+        d_kblayout->insertStringList(layouts);
       }
     }
   }
   else
   {
     //kdDebug() << "kxkb not enabled" << endl;
-    d_kbtqlayout->clear();
-    d_kbtqlayout->setEnabled(false);
+    d_kblayout->clear();
+    d_kblayout->setEnabled(false);
   }
 }
 
@@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id)
      else
        b_langPixmap->setText (i18n("No Picture Selected"));
 
-     TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem());
+     TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem());
 
-     //kdDebug() << "tqlayout to select " << tqlayout << endl;
+     //kdDebug() << "layout to select " << layout << endl;
 
-     for (int i = 0; i < d_kbtqlayout->count(); i++)
+     for (int i = 0; i < d_kblayout->count(); i++)
      {
-      if (d_kbtqlayout->text(i) == tqlayout)
+      if (d_kblayout->text(i) == layout)
        {
-        d_kbtqlayout->setCurrentItem(i);
+        d_kblayout->setCurrentItem(i);
         break;
        }
      }
      // not found
-     if (d_kbtqlayout->currentText() != tqlayout)
+     if (d_kblayout->currentText() != layout)
      {
-       d_kbtqlayout->setCurrentItem(0);
+       d_kblayout->setCurrentItem(0);
      }
    }
 }
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
index 724f4700..23057407 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
@@ -93,7 +93,7 @@
                 </widget>
                 <widget class="KComboBox" row="4" column="1">
                     <property name="name">
-                        <cstring>d_kbtqlayout</cstring>
+                        <cstring>d_kblayout</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Select a language or use the Add New Language Code to add one.</string>
@@ -205,7 +205,7 @@
                 </widget>
                 <widget class="TQLabel" row="4" column="0">
                     <property name="name">
-                        <cstring>label_kbtqlayout</cstring>
+                        <cstring>label_kblayout</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -216,10 +216,10 @@
                         </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>Keyboard tqlayout:</string>
+                        <string>Keyboard layout:</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>d_kbtqlayout</cstring>
+                        <cstring>d_kblayout</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>You can assign a language to each column</string>
@@ -337,7 +337,7 @@
     <tabstop>e_shortName2</tabstop>
     <tabstop>e_langLong</tabstop>
     <tabstop>b_langPixmap</tabstop>
-    <tabstop>d_kbtqlayout</tabstop>
+    <tabstop>d_kblayout</tabstop>
     <tabstop>b_langDel</tabstop>
     <tabstop>e_newName</tabstop>
     <tabstop>b_langNew</tabstop>
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
index 6eee844b..73da961e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
@@ -390,7 +390,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
index 1997b61b..f653d9e1 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
@@ -145,7 +145,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 05d33f86..78554297 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -43,11 +43,11 @@
 
 struct KV_Unicode_Ref {
   wchar_t     code;
-  const char *tqunicodename;
+  const char *unicodename;
   const char *audible;
 };
 
-KV_Unicode_Ref kv_tqunicode_ref[] = {
+KV_Unicode_Ref kv_unicode_ref[] = {
 
    {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")},
    {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")},
@@ -171,18 +171,18 @@ KV_Unicode_Ref kv_tqunicode_ref[] = {
 void PhoneticButton::slotClicked()
 {
   if (text().length() != 0)
-    emit page->charSelected(text()[0].tqunicode());
+    emit page->charSelected(text()[0].unicode());
 }
 
 
 PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal)
 {
-  int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]);
+  int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]);
   TQFrame * phoneticbox = plainPage();
   TQGridLayout *gbox = new TQGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1);
 
-  KV_Unicode_Ref *uni_ref = kv_tqunicode_ref;
+  KV_Unicode_Ref *uni_ref = kv_unicode_ref;
   int vert = 0;
   int horiz = 0;
   while (uni_ref->code != 0) {
@@ -191,7 +191,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
     PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this);
     connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) );
     TQString tip = i18n("Unicode name: ");
-    tip += TQString::fromLatin1(uni_ref->tqunicodename);
+    tip += TQString::fromLatin1(uni_ref->unicodename);
     tip += "\n";
     tip += i18n("Describing the sound of the character", "Sound: ");
     tip += i18n(uni_ref->audible);
@@ -217,7 +217,7 @@ void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e )
   if ((e->state() & (ControlButton | AltButton)) == 0) {
     TQString s = e->text();
     for (unsigned i = 0; i < s.length(); ++i) {
-      emit charSelected(s[i].tqunicode());
+      emit charSelected(s[i].unicode());
     }
     e->accept();
   }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
index 6da8f42a..c3ea92a6 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
@@ -44,7 +44,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -307,7 +307,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index 9d272a4e..d441cc2e 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -38,7 +38,7 @@ using namespace std;
 void kvoctrainApp::slotSmartSearchClip()
 {
   TQString s;
-  TQString entries = TQApplication::tqclipboard()->text();
+  TQString entries = TQApplication::clipboard()->text();
 
   if (!entries.isEmpty()) {
     int pos = entries.find ('\n'); // search for a line end
@@ -148,11 +148,11 @@ void kvoctrainApp::slotEditCopy()
   }
   if (!exp.isEmpty()) {
 #if defined(_WS_X11_)
-//    disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),this,0);
+//    disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0);
 #endif
-    TQApplication::tqclipboard()->setText(exp);
+    TQApplication::clipboard()->setText(exp);
 #if defined(_WS_X11_)
-//    connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
+//    connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
 #endif
   }
 
@@ -167,7 +167,7 @@ void kvoctrainApp::slotEditPaste()
 
   TQApplication::setOverrideCursor( waitCursor );
   TQString s;
-  TQString entries = TQApplication::tqclipboard()->text();
+  TQString entries = TQApplication::clipboard()->text();
 
   vector <int> csv_order = getCsvOrder(doc);
 
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index e5259f31..e8fad704 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -424,7 +424,7 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c
   }
 
   TQPen pen( p->pen() );
-  int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this );
+  int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this );
   if (gridColor != -1) {
     const TQPalette &pal = palette();
     if (cg != colorGroup()
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index 0db70701..6684b834 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -138,42 +138,42 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
     // autodetect utf8
     if (!utf8_mode) {
       for (int i = 0; !utf8_mode && i < (int) s.length(); ++i) {
-        ushort trigger = s[i].tqunicode();
+        ushort trigger = s[i].unicode();
         if (trigger >= 0x80) {
           int remain = s.length() - i;
           if ((trigger & 0xE0) == 0xC0){         // 110x xxxx
             if (   (remain > 1)
-                && (s[i+1].tqunicode() & 0xC0) == 0x80)
+                && (s[i+1].unicode() & 0xC0) == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xF0) == 0xE0) {  // 1110 xxxx
             if (   remain > 2
-                && s[i+1].tqunicode() & 0xC0 == 0x80
-                && s[i+2].tqunicode() & 0xC0 == 0x80)
+                && s[i+1].unicode() & 0xC0 == 0x80
+                && s[i+2].unicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xF8) == 0xF0) {   // 1111 0xxx
             if (   remain > 3
-                && s[i+1].tqunicode() & 0xC0 == 0x80
-                && s[i+2].tqunicode() & 0xC0 == 0x80
-                && s[i+3].tqunicode() & 0xC0 == 0x80)
+                && s[i+1].unicode() & 0xC0 == 0x80
+                && s[i+2].unicode() & 0xC0 == 0x80
+                && s[i+3].unicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xFC) == 0xF8) {   // 1111 10xx
             if (   remain > 4
-                && s[i+1].tqunicode() & 0xC0 == 0x80
-                && s[i+2].tqunicode() & 0xC0 == 0x80
-                && s[i+3].tqunicode() & 0xC0 == 0x80
-                && s[i+4].tqunicode() & 0xC0 == 0x80)
+                && s[i+1].unicode() & 0xC0 == 0x80
+                && s[i+2].unicode() & 0xC0 == 0x80
+                && s[i+3].unicode() & 0xC0 == 0x80
+                && s[i+4].unicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xFE) == 0xFC) {   // 1111 110x
             if (   remain > 5
-                && s[i+1].tqunicode() & 0xC0 == 0x80
-                && s[i+2].tqunicode() & 0xC0 == 0x80
-                && s[i+3].tqunicode() & 0xC0 == 0x80
-                && s[i+4].tqunicode() & 0xC0 == 0x80
-                && s[i+5].tqunicode() & 0xC0 == 0x80)
+                && s[i+1].unicode() & 0xC0 == 0x80
+                && s[i+2].unicode() & 0xC0 == 0x80
+                && s[i+3].unicode() & 0xC0 == 0x80
+                && s[i+4].unicode() & 0xC0 == 0x80
+                && s[i+5].unicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
         }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
index c427b4f2..d5ab8f91 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
@@ -32,8 +32,8 @@ class KOXML_OSTREAM;
  *
  *  xml.startTag ("head"); // writes &lt;head&gt;
  *
- *  // write &lt;tqlayout format="a4" orientation="landscape"&gt;
- *  xml.startTag ("tqlayout", false);
+ *  // write &lt;layout format="a4" orientation="landscape"&gt;
+ *  xml.startTag ("layout", false);
  *  xml.addAttribute ("format", "a4");
  *  xml.addAttribute ("orientation", "landscape");
  *  xml.closeTag (true);
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp
index a9ed5dcb..77d03fb0 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp
@@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index)
     langs[index].PixMapFile = s;
 }
 
-void LangSet::setKeyboardLayout(const TQString& tqlayout, int index)
+void LangSet::setKeyboardLayout(const TQString& layout, int index)
 {
   if (index < (int) langs.size()) {
-    langs[index].keyboardLayout = tqlayout;
+    langs[index].keyboardLayout = layout;
   }
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h
index cfcc7f3b..ac4e8ace 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.h
+++ b/kvoctrain/kvoctrain/kvt-core/langset.h
@@ -70,7 +70,7 @@ class LangSet
    void setShortId2 (const TQString & shortId2, int index);
    void setLongId (const TQString & longId, int index);
    void setPixMapFile (const TQString & PixMapFile, int index);
-   void setKeyboardLayout(const TQString & tqlayout, int index);
+   void setKeyboardLayout(const TQString & layout, int index);
 
    TQString findShortId (const TQString & longId)  const;
    TQString findLongId  (const TQString & shortId) const;
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
index 2bcb18e5..d6197ea0 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
@@ -131,7 +131,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -158,7 +158,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
index 42653ef9..def5f384 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
@@ -120,7 +120,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -229,7 +229,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
index 0398580c..4a46ac77 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
@@ -221,7 +221,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout14</cstring>
+                <cstring>layout14</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -229,7 +229,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
index b28cc0b6..7b35a6c2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
@@ -199,7 +199,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -229,7 +229,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
index 6185f2ba..c20cd142 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -115,7 +115,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout17</cstring>
+                <cstring>layout17</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -240,7 +240,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout16</cstring>
+                        <cstring>layout16</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
index 4c0832cc..7e28115d 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout20</cstring>
+                <cstring>layout20</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout30</cstring>
+                <cstring>layout30</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -73,7 +73,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout29</cstring>
+                        <cstring>layout29</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -163,7 +163,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout27</cstring>
+                        <cstring>layout27</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -269,7 +269,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -309,7 +309,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout32</cstring>
+                <cstring>layout32</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -317,7 +317,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout31</cstring>
+                        <cstring>layout31</cstring>
                     </property>
                     <grid>
                         <property name="name">