Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.

5 files changed, 34 insertions, 34 deletions

diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp
index df04bfa6..51d5c8d5 100644
--- a/kpercentage/kpercentage/kanswer.cpp
+++ b/kpercentage/kpercentage/kanswer.cpp
@@ -26,7 +26,7 @@
 // TQt includes
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 // KDE includes
 #include <kdebug.h>
@@ -63,7 +63,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE )
     TextLabelAnswer->setBackgroundOrigin( TQLabel::ParentOrigin );
     TextLabelAnswer->setBackgroundPixmap( bgp );
 
-    canvas->setBackgroundPixmap( bgp );
+    canvas->tqsetBackgroundPixmap( bgp );
     canvas_view->setBackgroundOrigin( TQCanvasView::ParentOrigin );
     canvas_view->setBackgroundPixmap( bgp );
 
diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp
index e3523675..f9608601 100644
--- a/kpercentage/kpercentage/kpercentage.cpp
+++ b/kpercentage/kpercentage/kpercentage.cpp
@@ -24,7 +24,7 @@
 
 // TQt includes
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -60,7 +60,7 @@ KPercentage::KPercentage( const char *name ) :
     // prepare exercise window, that will use the fontsize above!
     percent_main = new KPercentMain( this, "KPercentage" );
 
-    // fixed geometry bacause of background pixmap
+    // fixed tqgeometry bacause of background pixmap
     setFixedSize( TQSize( 548, 248 ) );
 
     /** load and set background pixmap */
diff --git a/kpercentage/kpercentage/kpercentage.docbook b/kpercentage/kpercentage/kpercentage.docbook
index 809ccb85..58742c91 100644
--- a/kpercentage/kpercentage/kpercentage.docbook
+++ b/kpercentage/kpercentage/kpercentage.docbook
@@ -243,7 +243,7 @@ Programming &kpercentage; plugins is a joy to behold. Just read through the next
 should consult the docbook reference for further details. The example below was
 taken from that reference and shortened a bit for readability. -->
 
-<refentry id="re-1007-unmanagechildren-1">
+<refentry id="re-1007-unmanagetqchildren-1">
 <refmeta>
 <refentrytitle>XtUnmanageChildren</refentrytitle>
 <refmiscinfo>Xt - Geometry Management</refmiscinfo>
@@ -251,26 +251,26 @@ taken from that reference and shortened a bit for readability. -->
 <refnamediv>
 <refname>XtUnmanageChildren
 </refname>
-<refpurpose>remove a list of children from a parent widget's managed list.
+<refpurpose>remove a list of tqchildren from a parent widget's managed list.
 </refpurpose>
-<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
-<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm>
+<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
+<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm>
 </refnamediv>
 <refsynopsisdiv>
 <refsynopsisdivinfo>
 <date>4 March 1996</date>
 </refsynopsisdivinfo>
 <synopsis>
-void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>)
-    WidgetList <replaceable class="parameter">children</replaceable>;
-    Cardinal <replaceable class="parameter">num_children</replaceable>;
+void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>)
+    WidgetList <replaceable class="parameter">tqchildren</replaceable>;
+    Cardinal <replaceable class="parameter">num_tqchildren</replaceable>;
 </synopsis>
 
-<refsect2 id="r2-1007-unmanagechildren-1">
+<refsect2 id="r2-1007-unmanagetqchildren-1">
 <title>Inputs</title>
 <variablelist>
 <varlistentry>
-<term><replaceable class="parameter">children</replaceable>
+<term><replaceable class="parameter">tqchildren</replaceable>
 </term>
 <listitem>
 <para>Specifies an array of child widgets. Each child must be of
@@ -279,26 +279,26 @@ class RectObj or any subclass thereof.
 </listitem>
 </varlistentry>
 <varlistentry>
-<term><replaceable class="parameter">num_children</replaceable>
+<term><replaceable class="parameter">num_tqchildren</replaceable>
 </term>
 <listitem>
-<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
+<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>.
 </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </refsect2></refsynopsisdiv>
 
-<refsect1 id="r1-1007-unmanagechildren-1">
+<refsect1 id="r1-1007-unmanagetqchildren-1">
 <title>Description
 </title>
 <para><function>XtUnmanageChildren()</function> unmaps the specified widgets
-and removes them from their parent's geometry management.
+and removes them from their parent's tqgeometry management.
 The widgets will disappear from the screen, and (depending
 on its parent) may no longer have screen space allocated for
 them.
 </para>
-<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have
+<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have
 the same parent.
 </para>
 <para>See the &ldquo;Algorithm&rdquo; section below for full details of the
@@ -306,13 +306,13 @@ widget unmanagement procedure.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagechildren-2">
+<refsect1 id="r1-1007-unmanagetqchildren-2">
 <title>Usage</title>
 <para>Unmanaging widgets is the usual method for temporarily
 making them invisible.  They can be re-managed with
 <function>XtManageChildren()</function>.
 </para>
-<para>You can unmap a widget, but leave it under geometry
+<para>You can unmap a widget, but leave it under tqgeometry
 management by calling <function>XtUnmapWidget()</function>.  You can
 destroy a widget's window without destroying the widget by
 calling <function>XtUnrealizeWidget()</function>.  You can destroy a
@@ -329,7 +329,7 @@ method once.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagechildren-3">
+<refsect1 id="r1-1007-unmanagetqchildren-3">
 <title>Algorithm
 </title>
 <para><function>XtUnmanageChildren()</function> performs the following:
@@ -358,11 +358,11 @@ by unmapping it.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagechildren-4">
+<refsect1 id="r1-1007-unmanagetqchildren-4">
 <title>Structures</title>
 <para>The <type>WidgetList</type> type is simply an array of widgets:
 </para>
-<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
+<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList;
 </screen>
 </refsect1>
 </refentry>
diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp
index 12d359fb..d02b57fd 100644
--- a/kpercentage/kpercentage/kpercentmain.cpp
+++ b/kpercentage/kpercentage/kpercentmain.cpp
@@ -24,7 +24,7 @@
 #include <time.h>
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqprogressbar.h>
 #include <tqpushbutton.h>
@@ -55,15 +55,15 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) :
     KIntValidator *validLine = new KIntValidator( this );
 
     line_edit_percentage = new TQLineEdit( this, "line_edit_percentage" );
-    line_edit_percentage->setAlignment( int( TQLineEdit::AlignHCenter ) );
+    line_edit_percentage->tqsetAlignment( int( TQLineEdit::AlignHCenter ) );
     line_edit_percentage->setValidator( validLine );
 
     line_edit_basevalue = new TQLineEdit( this, "line_edit_basevalue" );
-    line_edit_basevalue->setAlignment( int( TQLineEdit::AlignHCenter ) );
+    line_edit_basevalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) );
     line_edit_basevalue->setValidator( validLine );
 
     line_edit_percentvalue = new TQLineEdit( this, "line_edit_percentvalue" );
-    line_edit_percentvalue->setAlignment( int( TQLineEdit::AlignHCenter ) );
+    line_edit_percentvalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) );
     line_edit_percentvalue->setValidator( validLine );
 
     progress_bar_count = new TQProgressBar( this, "progress_bar_count" );
@@ -202,12 +202,12 @@ void KPercentMain::newTask()
     line_edit_percentvalue->setFocusPolicy( TQ_NoFocus );
 
     // set the number of managed tasks into a label
-    label_count->setText( TQString( i18n("You got %1 of %2 exercises.").arg(count).arg(number) ) ); // update Label for the Progress
+    label_count->setText( TQString( i18n("You got %1 of %2 exercises.").tqarg(count).tqarg(number) ) ); // update Label for the Progress
 
 //    progress_bar_count->setProgress( count*100 ); // updating Progrssbar
     startTimer( 10 );
     // set string which task is just workin on (Task x of y)
-    TQString taskNumber( i18n( "Exercise no. %1:" ).arg(count+1) );
+    TQString taskNumber( i18n( "Exercise no. %1:" ).tqarg(count+1) );
 
     label_number->setText( taskNumber );
     //    label_number->adjustSize();
@@ -292,8 +292,8 @@ void KPercentMain::slotApplyInput()
             total_answers++;
             progress_bar_right_wrong->setTotalSteps( total_answers );
             progress_bar_right_wrong->setProgress( right_answers );
-            label_right->setText( i18n( "%1%\nright" ).arg( (100*right_answers)/total_answers ) );
-            label_wrong->setText( i18n( "%1%\nwrong" ).arg( 100-(100*right_answers)/total_answers ) );
+            label_right->setText( i18n( "%1%\nright" ).tqarg( (100*right_answers)/total_answers ) );
+            label_wrong->setText( i18n( "%1%\nwrong" ).tqarg( 100-(100*right_answers)/total_answers ) );
 
             newTask(); // next task, perhaps
         }
@@ -304,8 +304,8 @@ void KPercentMain::slotApplyInput()
             total_answers++;
             progress_bar_right_wrong->setTotalSteps( total_answers );
             progress_bar_right_wrong->setProgress( right_answers );
-            label_right->setText( i18n( "%1%\nright" ).arg( (100*right_answers)/total_answers ) );
-            label_wrong->setText( i18n( "%1%\nwrong" ).arg( 100-(100*right_answers)/total_answers ) );
+            label_right->setText( i18n( "%1%\nright" ).tqarg( (100*right_answers)/total_answers ) );
+            label_wrong->setText( i18n( "%1%\nwrong" ).tqarg( 100-(100*right_answers)/total_answers ) );
         }
     }
 }
diff --git a/kpercentage/kpercentage/ksplashscreen.cpp b/kpercentage/kpercentage/ksplashscreen.cpp
index 07c5b0d7..226fa881 100644
--- a/kpercentage/kpercentage/ksplashscreen.cpp
+++ b/kpercentage/kpercentage/ksplashscreen.cpp
@@ -42,7 +42,7 @@ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) :
     TQCanvas *canvas = new TQCanvas( TQT_TQOBJECT(this) );
     canvas->resize( 400, 300 );
     /* set the background pixmap */
-    canvas->setBackgroundPixmap( bgp );
+    canvas->tqsetBackgroundPixmap( bgp );
     //remove version number from splash annma 14/02/2005
     //TQCanvasText *t = new TQCanvasText( KPERCENTAGE_VERSION, canvas );
     //t->move( 330.0, 260.0 );