From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kaddressbook/editors/imeditorwidget.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'kaddressbook/editors/imeditorwidget.cpp')

diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 0e7357ea0..533b7d4b7 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqlistview.h>
 #include <tqstringlist.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfont.h>
 #include <tqpainter.h>
 
@@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const
 }
 
 void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
-                              int column, int width, int alignment )
+                              int column, int width, int tqalignment )
 {
   if ( mPreferred ) {
     TQFont font = p->font();
@@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
     p->setFont( font );
   }
 
-  KListViewItem::paintCell( p, cg, column, width, alignment );
+  KListViewItem::paintCell( p, cg, column, width, tqalignment );
 }
 
 void IMAddressLVI::setAddress( const TQString &address )
@@ -85,7 +85,7 @@ void IMAddressLVI::setAddress( const TQString &address )
   else {
     TQString nickname = address.section( TQChar( 0xE120 ), 0, 0 );
     setText( 1, i18n( "<nickname> on <server>","%1 on %2" )
-           .arg( nickname ).arg( serverOrGroup ) );
+           .tqarg( nickname ).tqarg( serverOrGroup ) );
   }
 
   mAddress = address;
@@ -167,7 +167,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
   //mWidget->btnDown->setEnabled( false );
   mPreferred = preferredIM;
   mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
-  mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
+  mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );
 
   // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
   TQMap<TQString, KPluginInfo *> protocolMap;
@@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr )
     TQString app, name, value;
     splitField( *it, app, name, value );
 
-    if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) {
-      if ( name == TQString::fromLatin1( "All" ) ) {
+    if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) {
+      if ( name == TQString::tqfromLatin1( "All" ) ) {
         KPluginInfo *protocol = protocolFromString( app );
         if ( protocol ) {
           TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value );
@@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr )
 
     TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString();
     if ( !lst.isEmpty() )
-      addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
+      addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
     else
-      addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) );
+      addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) );
   }
 }
 
-- 
cgit v1.2.1