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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

8 files changed, 40 insertions, 40 deletions

diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 1019d1c25..5d970b3b7 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -29,7 +29,7 @@
 #include <kdialog.h>
 #include <kfontcombo.h>
 #include <kglobalsettings.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <knuminput.h>
 #include <tqpaintdevicemetrics.h>
@@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
   mPageAppearance->kcbHeaderTextColor->setColor(
       config->readColorEntry( ContactHeaderForeColor, &TQt::white ) );
 
-  mPageAppearance->layout()->setMargin( KDialog::marginHint() );
-  mPageAppearance->layout()->setSpacing( KDialog::spacingHint() );
+  mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() );
+  mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() );
 }
 
 DetailledPrintStyle::~DetailledPrintStyle()
diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui
index 9dc64b9e6..989b360d8 100644
--- a/kaddressbook/printing/ds_appearance.ui
+++ b/kaddressbook/printing/ds_appearance.ui
@@ -68,7 +68,7 @@
             <property name="scaledContents">
                 <bool>false</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
         </widget>
@@ -138,7 +138,7 @@
                             <property name="text">
                                 <string>Details font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -149,7 +149,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -160,7 +160,7 @@
                             <property name="text">
                                 <string>Body font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -171,7 +171,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -182,7 +182,7 @@
                             <property name="text">
                                 <string>Fixed font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -203,7 +203,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -245,7 +245,7 @@
                             <property name="text">
                                 <string>Contact header font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -274,7 +274,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -285,7 +285,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -301,7 +301,7 @@
                             <property name="text">
                                 <string>Headlines:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -400,7 +400,7 @@
                             <property name="text">
                                 <string>Headline background color:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -411,7 +411,7 @@
                             <property name="text">
                                 <string>Headline text color:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index d7be5bd53..91bf9f342 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   KABC::Address address;
 
   // this is used to prepare some fields for printing and decide about
-  // the layout later:
+  // the tqlayout later:
   TQValueList<TQStringList> parts;
   TQValueList<TQRectList*> contents;
 
@@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
           line1 = i18n( "Preferred Address" );
       }
 
-      line1 += TQString::fromLatin1( ":" );
+      line1 += TQString::tqfromLatin1( ":" );
       text = TQString();
 
       if ( !address.extended().isEmpty() )
         text = address.extended().stripWhiteSpace();
 
       if ( !text.isEmpty() ) {
-        line1 = line1 + TQString::fromLatin1( " (" ) + text +
-        TQString::fromLatin1( ")" );
+        line1 = line1 + TQString::tqfromLatin1( " (" ) + text +
+        TQString::tqfromLatin1( ")" );
       }
 
       line1 = line1.stripWhiteSpace();
       line2 = address.street();
       if ( !address.postOfficeBox().isEmpty() )
-        line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox();
+        line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox();
 
       // print address in american style, this will need localisation:
       line3 = address.locality() + ( address.region().isEmpty() ?
-              TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) +
+              TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) +
               address.region() ) + ( address.postalCode().isEmpty()
-              ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " )
+              ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " )
               + address.postalCode() );
       line4 = address.country();
 
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 62f89d558..746677ec8 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr
   mBoldFont = p.font();
   mBoldFont.setBold( true );
   TQFontMetrics fm( mFont );
-  TQPaintDeviceMetrics metrics( p.device() );
+  TQPaintDeviceMetrics metrics( p.tqdevice() );
 
   int height = 0;
   KABC::Addressee::List::ConstIterator it;
@@ -141,7 +141,7 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr,
 {
   TQFontMetrics fm( font );
   TQFontMetrics bfm( bFont );
-  TQPaintDeviceMetrics metrics( painter.device() );
+  TQPaintDeviceMetrics metrics( painter.tqdevice() );
   int margin = 10;
   int width = metrics.width() - 10;
   int xPos = 5;
@@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font )
   TQFontMetrics fm( font );
 
   TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" )
-                 .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+                 .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
   p.setPen( TQt::black );
   p.drawText( 0, fm.height(), text );
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index fd6977919..1ea33d53b 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -25,7 +25,7 @@
 #include <tqcombobox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index da6d78fcf..3a9c00d19 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -21,9 +21,9 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqprogressbar.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name )
   mProgressBar->setProgress( 0 );
   topLayout->addWidget( mProgressBar, 1, 0 );
 
-  resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) );
+  resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) );
 }
 
 PrintProgress::~PrintProgress()
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index 3813f08fe..e71c27891 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -29,7 +29,7 @@
 #include <tqcombobox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -52,11 +52,11 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
   mButtonGroup = new TQButtonGroup( this );
   mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
-  mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
-  mButtonGroup->layout()->setMargin( KDialog::marginHint() );
+  mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() );
-  groupLayout->setAlignment( TQt::AlignTop );
+  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
+  groupLayout->tqsetAlignment( TQt::AlignTop );
 
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 4288919bf..b1c29b464 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -24,7 +24,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqradiobutton.h>
 
@@ -122,9 +122,9 @@ void StylePage::initGUI()
 
   TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
   group->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2,
+  TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->setAlignment( TQt::AlignTop );
+  sortLayout->tqsetAlignment( TQt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), group );
   sortLayout->addWidget( label, 0, 0 );
@@ -142,7 +142,7 @@ void StylePage::initGUI()
 
   group = new TQButtonGroup( i18n( "Print Style" ), this );
   group->setColumnLayout( 0, Qt::Vertical );
-  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(),
+  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(),
                                               KDialog::spacingHint() );
 
   mStyleCombo = new KComboBox( false, group );
@@ -153,7 +153,7 @@ void StylePage::initGUI()
   font.setPointSize( 20 );
   mPreview->setFont( font );
   mPreview->setScaledContents( true );
-  mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
+  mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
   styleLayout->addWidget( mPreview );
 
   topLayout->addWidget( group, 1, 1 );