Rename obsolete tq methods to standard names

10 files changed, 28 insertions, 28 deletions

diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui
index 04682cce..38edf095 100644
--- a/kwordquiz/src/dlglanguagebase.ui
+++ b/kwordquiz/src/dlglanguagebase.ui
@@ -35,7 +35,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -138,7 +138,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout2_2</cstring>
+                <cstring>layout2_2</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui
index f16c8e56..3fec70fd 100644
--- a/kwordquiz/src/dlgrcbase.ui
+++ b/kwordquiz/src/dlgrcbase.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -77,7 +77,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -124,7 +124,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui
index 28275fe8..59342257 100644
--- a/kwordquiz/src/dlgsortbase.ui
+++ b/kwordquiz/src/dlgsortbase.ui
@@ -35,7 +35,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp
index 26e9e5cb..79dd2da0 100644
--- a/kwordquiz/src/dlgspecchar.cpp
+++ b/kwordquiz/src/dlgspecchar.cpp
@@ -38,7 +38,7 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_
 
     grid = new TQGridLayout( page, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
-    int t = (_chr.tqunicode()/256);
+    int t = (_chr.unicode()/256);
     
     charSelect = new KCharSelect( page, "", _font, _chr, t);
     connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked()));
diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui
index 11a499e4..c0ce8e61 100644
--- a/kwordquiz/src/flashviewbase.ui
+++ b/kwordquiz/src/flashviewbase.ui
@@ -234,7 +234,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -259,7 +259,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index fd7328de..654c21e0 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -801,7 +801,7 @@ void KWordQuizApp::slotVocabFont()
 
 void KWordQuizApp::slotVocabKeyboard()
 {
-  slotStatusMsg(i18n("Changing the keyboard tqlayout..."));
+  slotStatusMsg(i18n("Changing the keyboard layout..."));
   KMessageBox::sorry(0, i18n("Not implemented yet"));
   slotStatusMsg(i18n("Ready"));
 }
@@ -1081,7 +1081,7 @@ void KWordQuizApp::updateSpecialCharIcons( )
 TQString KWordQuizApp::charIcon(const TQChar & c)
 {
   ///Create a name and path for the icon
-  TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png");
+  TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png");
 
   ///No need to redraw if it already exists
   if (KStandardDirs::exists(s))
diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui
index 045d2137..3d848b83 100644
--- a/kwordquiz/src/multipleviewbase.ui
+++ b/kwordquiz/src/multipleviewbase.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout58</cstring>
+                <cstring>layout58</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -137,7 +137,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout60</cstring>
+                <cstring>layout60</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -242,7 +242,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="6" column="0">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -267,7 +267,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -551,7 +551,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
-                <cstring>tqlayout61</cstring>
+                <cstring>layout61</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -656,7 +656,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout63</cstring>
+                <cstring>layout63</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -814,7 +814,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout59</cstring>
+                <cstring>layout59</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui
index 8301e2b7..da54220a 100644
--- a/kwordquiz/src/prefcharacterbase.ui
+++ b/kwordquiz/src/prefcharacterbase.ui
@@ -308,7 +308,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui
index fd8b7b5b..fcb743a4 100644
--- a/kwordquiz/src/qaviewbase.ui
+++ b/kwordquiz/src/qaviewbase.ui
@@ -32,7 +32,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="7" column="0">
             <property name="name">
-                <cstring>tqlayout23</cstring>
+                <cstring>layout23</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -282,7 +282,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout51</cstring>
+                <cstring>layout51</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -387,7 +387,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout52</cstring>
+                <cstring>layout52</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -492,7 +492,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
-                <cstring>tqlayout53</cstring>
+                <cstring>layout53</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -597,7 +597,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout54</cstring>
+                <cstring>layout54</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -738,7 +738,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout57</cstring>
+                <cstring>layout57</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp
index bedfc51c..997da802 100644
--- a/kwordquiz/src/wqprintdialogpage.cpp
+++ b/kwordquiz/src/wqprintdialogpage.cpp
@@ -34,9 +34,9 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name )
 
   g = new TQButtonGroup(i18n("Select Type of Printout"), this );
   g->setColumnLayout(0, Qt::Vertical );
-  g->tqlayout()->setSpacing( 6 );
-  g->tqlayout()->setMargin( 11 );
-  TQGridLayout * v = new TQGridLayout( g->tqlayout() );
+  g->layout()->setSpacing( 6 );
+  g->layout()->setMargin( 11 );
+  TQGridLayout * v = new TQGridLayout( g->layout() );
   v->setAlignment( TQt::AlignTop );
 
   rb0 = new TQRadioButton(i18n("Vocabulary &list"), g );