From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:34:45 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kaddressbook/printing/kabentrypainter.cpp | 12 ++++++------
 kaddressbook/printing/mikesstyle.cpp      |  2 +-
 kaddressbook/printing/printprogress.cpp   |  2 +-
 kaddressbook/printing/selectionpage.cpp   |  2 +-
 kaddressbook/printing/stylepage.cpp       |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kaddressbook/printing')

diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index 91bf9f342..427dd9de1 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
           line1 = i18n( "Preferred Address" );
       }
 
-      line1 += TQString::tqfromLatin1( ":" );
+      line1 += TQString::fromLatin1( ":" );
       text = TQString();
 
       if ( !address.extended().isEmpty() )
         text = address.extended().stripWhiteSpace();
 
       if ( !text.isEmpty() ) {
-        line1 = line1 + TQString::tqfromLatin1( " (" ) + text +
-        TQString::tqfromLatin1( ")" );
+        line1 = line1 + TQString::fromLatin1( " (" ) + text +
+        TQString::fromLatin1( ")" );
       }
 
       line1 = line1.stripWhiteSpace();
       line2 = address.street();
       if ( !address.postOfficeBox().isEmpty() )
-        line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox();
+        line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox();
 
       // print address in american style, this will need localisation:
       line3 = address.locality() + ( address.region().isEmpty() ?
-              TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) +
+              TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) +
               address.region() ) + ( address.postalCode().isEmpty()
-              ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " )
+              ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " )
               + address.postalCode() );
       line4 = address.country();
 
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 746677ec8..a3fea0f67 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -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)" )
-                 .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
+                 .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
 
   p.setPen( TQt::black );
   p.drawText( 0, fm.height(), text );
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 3a9c00d19..64442056e 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name )
   mProgressBar->setProgress( 0 );
   topLayout->addWidget( mProgressBar, 1, 0 );
 
-  resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) );
+  resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) );
 }
 
 PrintProgress::~PrintProgress()
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index e71c27891..4e52b57db 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -56,7 +56,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
   mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
   TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
-  groupLayout->tqsetAlignment( TQt::AlignTop );
+  groupLayout->setAlignment( 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 b1c29b464..e157f1820 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -124,7 +124,7 @@ void StylePage::initGUI()
   group->setColumnLayout( 0, Qt::Vertical );
   TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->tqsetAlignment( TQt::AlignTop );
+  sortLayout->setAlignment( TQt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), group );
   sortLayout->addWidget( label, 0, 0 );
@@ -153,7 +153,7 @@ void StylePage::initGUI()
   font.setPointSize( 20 );
   mPreview->setFont( font );
   mPreview->setScaledContents( true );
-  mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
+  mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
   styleLayout->addWidget( mPreview );
 
   topLayout->addWidget( group, 1, 1 );
-- 
cgit v1.2.1