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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 19 insertions, 19 deletions

diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index 3834e0dc..a394e0a8 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqvaluelist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
@@ -62,13 +62,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
     TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page );
-    grp1->layout()->setSpacing(KDialog::spacingHint());
-    grp1->layout()->setMargin(KDialog::marginHint());
+    grp1->tqlayout()->setSpacing(KDialog::spacingHint());
+    grp1->tqlayout()->setMargin(KDialog::marginHint());
     topLayout->addWidget(grp1);
-    TQGridLayout *upperRow = new TQGridLayout(grp1->layout(), 6, 4);
+    TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4);
 
     lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 );
-    lAppear->setAlignment( AlignVCenter );
+    lAppear->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lAppear, 0, 0);
 
     eAppearStep = new TQSpinBox( 0, 100, 1, grp1 );
@@ -79,7 +79,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     //( void )new TQWidget( grp1 );
 
     lEffect = new TQLabel( i18n( "Effect (appearing):" ), grp1 );
-    lEffect->setAlignment( AlignVCenter );
+    lEffect->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lEffect, 1, 0);
 
     cEffect = new TQComboBox( false, grp1, "cEffect" );
@@ -102,7 +102,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) );
 
     lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 );
-    lAppearSpeed->setAlignment( AlignVCenter );
+    lAppearSpeed->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lAppearSpeed, 2, 0);
 
     cAppearSpeed = new TQComboBox( false, grp1, "cEffect" );
@@ -114,7 +114,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     appearEffectChanged( cEffect->currentItem() );
 
     lEffect2 = new TQLabel( i18n( "Effect (object specific):" ), grp1 );
-    lEffect2->setAlignment( AlignVCenter );
+    lEffect2->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lEffect2, 3, 0);
 
     cEffect2 = new TQComboBox( false, grp1, "cEffect2" );
@@ -144,7 +144,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     }
 
     TQLabel *lTimerOfAppear = new TQLabel( i18n( "Timer of the object:" ), grp1 );
-    lTimerOfAppear->setAlignment( AlignVCenter );
+    lTimerOfAppear->tqsetAlignment( AlignVCenter );
     upperRow->addWidget( lTimerOfAppear, 4, 0 );
 
     timerOfAppear = new KIntNumInput( obj->getAppearTimer(), grp1 );
@@ -164,7 +164,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) );
 
     lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 );
-    lSoundEffect1->setAlignment( AlignVCenter );
+    lSoundEffect1->tqsetAlignment( AlignVCenter );
     upperRow->addWidget( lSoundEffect1, 6, 0 );
 
     requester1 = new KURLRequester( grp1 );
@@ -197,13 +197,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     topLayout->addWidget(disappear);
 
     TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page);
-    grp2->layout()->setSpacing(KDialog::spacingHint());
-    grp2->layout()->setMargin(KDialog::marginHint());
+    grp2->tqlayout()->setSpacing(KDialog::spacingHint());
+    grp2->tqlayout()->setMargin(KDialog::marginHint());
     topLayout->addWidget(grp2);
-    TQGridLayout *lowerRow = new TQGridLayout(grp2->layout(), 5, 4);
+    TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4);
 
     lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 );
-    lDisappear->setAlignment( AlignVCenter );
+    lDisappear->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDisappear, 0, 0);
 
     eDisappearStep = new TQSpinBox( 0, 100, 1, grp2 );
@@ -211,7 +211,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     lowerRow->addWidget(eDisappearStep, 0, 1);
 
     lDEffect = new TQLabel( i18n( "Effect (disappearing):" ), grp2 );
-    lDEffect->setAlignment( AlignVCenter );
+    lDEffect->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDEffect, 1, 0);
 
     cDisappear = new TQComboBox( false, grp2, "cDisappear" );
@@ -234,7 +234,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) );
 
     lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 );
-    lDisappearSpeed->setAlignment( AlignVCenter );
+    lDisappearSpeed->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDisappearSpeed, 2, 0);
 
     cDisappearSpeed = new TQComboBox( false, grp2, "cEffect" );
@@ -247,7 +247,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     //appearEffectChanged( cEffect->currentItem() );
 
     TQLabel *lTimerOfDisappear = new TQLabel( i18n( "Timer of the object:" ), grp2 );
-    lTimerOfDisappear->setAlignment( AlignVCenter );
+    lTimerOfDisappear->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget( lTimerOfDisappear, 3, 0 );
 
     timerOfDisappear = new KIntNumInput( obj->getDisappearTimer(), grp2 );
@@ -268,7 +268,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) );
 
     lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 );
-    lSoundEffect2->setAlignment( AlignVCenter );
+    lSoundEffect2->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget( lSoundEffect2, 5, 0 );
 
     requester2 = new KURLRequester( grp2 );
@@ -514,7 +514,7 @@ TQString KPrEffectDia::getSoundFileFilter() const
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }