Rename old tq methods that no longer need a unique name

20 files changed, 69 insertions, 69 deletions

diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp
index 3a9b94ff..345e9ab4 100644
--- a/kopete/libkopete/ui/accountselector.cpp
+++ b/kopete/libkopete/ui/accountselector.cpp
@@ -95,7 +95,7 @@ void AccountSelector::initUI()
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	d->lv = new KListView(this);
 	d->lv->setFullWidth(true);
-	d->lv->addColumn(TQString::tqfromLatin1(""));
+	d->lv->addColumn(TQString::fromLatin1(""));
 	d->lv->header()->hide();
 
 	if(d->proto != 0)
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index f12e7116..5de3a023 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -40,7 +40,7 @@ namespace UI {
 
 AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 )
 {
-	btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) );
+	btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) );
 	connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) );
 	connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) );
 }
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 710d56f1..7b6fc27f 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -74,7 +74,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch
 	
 	//We should add a clear KAction here.  But we can't really do that with a designer file :\  this sucks
 
-	addresseeListView->setColumnText(2, SmallIconSet(TQString::tqfromLatin1("email")), i18n("Email"));
+	addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email"));
 
 	kListViewSearchLine->setListView(addresseeListView);
 	slotLoadAddressees();
diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
index 276620be..4c3993e0 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui
+++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>405</width>
                     <height>20</height>
diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp
index 55b58068..9fa9f023 100644
--- a/kopete/libkopete/ui/addresseeitem.cpp
+++ b/kopete/libkopete/ui/addresseeitem.cpp
@@ -49,7 +49,7 @@ TQString AddresseeItem::key( int column, bool ) const
 {
   if (column == Email) {
     TQString value = text(Email);
-    TQRegExp emailRe(TQString::tqfromLatin1("<\\S*>"));
+    TQRegExp emailRe(TQString::fromLatin1("<\\S*>"));
     int match = emailRe.search(value);
     if (match > -1)
       value = value.mid(match + 1, emailRe.matchedLength() - 2);
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp
index e5fd81b4..018baf7a 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -71,9 +71,9 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId,
 	d->account=account;
 	d->contactId=contactId;
 	d->widget->m_label->setText(i18n("<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added you to his/her contactlist. (Account %3)</qt>")
-			.tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::tqfromLatin1(":")
+			.tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":")
 			                  + KURL::encode_string( account->accountId() ) ,
-				  contactNick.isEmpty() ? contactId : contactNick + TQString::tqfromLatin1(" < ") + contactId + TQString::tqfromLatin1(" >")  ,
+				  contactNick.isEmpty() ? contactId : contactNick + TQString::fromLatin1(" < ") + contactId + TQString::fromLatin1(" >")  ,
 				  account->accountLabel()  	)   );
 	if( hide & InfoButton)
 		d->widget->m_infoButton->hide() ;
diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui
index 100e6eca..80390486 100644
--- a/kopete/libkopete/ui/contactaddednotifywidget.ui
+++ b/kopete/libkopete/ui/contactaddednotifywidget.ui
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>151</width>
                             <height>20</height>
@@ -199,7 +199,7 @@ Leave it empty if you want to see the contact nickname as display name.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>51</width>
                                     <height>20</height>
@@ -225,7 +225,7 @@ Leave it empty if you want to see the contact nickname as display name.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui
index cd91863d..490d2a7f 100644
--- a/kopete/libkopete/ui/fileconfirmbase.ui
+++ b/kopete/libkopete/ui/fileconfirmbase.ui
@@ -99,7 +99,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui
index be81b276..45b34aa2 100644
--- a/kopete/libkopete/ui/kopeteawaydialogbase.ui
+++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui
@@ -44,7 +44,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>300</width>
                     <height>0</height>
@@ -72,7 +72,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp
index 6492d1c0..cc6754d2 100644
--- a/kopete/libkopete/ui/kopetecontactaction.cpp
+++ b/kopete/libkopete/ui/kopetecontactaction.cpp
@@ -23,7 +23,7 @@
 
 KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver,
 	const char *slot, KAction *parent )
-: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().iconFor( contact ) ), KShortcut(),
+: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), KShortcut(),
 	parent, contact->contactId().latin1() )
 {
 	m_contact = contact;
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index fc9310fa..33b54c4d 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -40,15 +40,15 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo
 	m_emited=false;
 
 	m_view=new FileConfirmBase(this, "FileConfirmView");
-	m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::tqfromLatin1( " <" ) +
-			info.contact()->contactId() + TQString::tqfromLatin1( "> " ) );
+	m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) +
+			info.contact()->contactId() + TQString::fromLatin1( "> " ) );
 	m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) );
 	m_view->m_description->setText( description );
 	m_view->m_filename->setText( info.file() );
 	
 	KGlobal::config()->setGroup("File Transfer");
 	const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() );
-	m_view->m_saveto->setText(defaultPath  + TQString::tqfromLatin1( "/" ) + info.file() );
+	m_view->m_saveto->setText(defaultPath  + TQString::fromLatin1( "/" ) + info.file() );
 
 	setMainWidget(m_view);
 
@@ -61,7 +61,7 @@ KopeteFileConfirmDialog::~KopeteFileConfirmDialog()
 
 void KopeteFileConfirmDialog::slotBrowsePressed()
 {
-	TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::tqfromLatin1( "*" ), 0L , i18n( "File Transfer" ) );
+	TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::fromLatin1( "*" ), 0L , i18n( "File Transfer" ) );
 	if ( !saveFileName.isNull())
 	{
 		m_view->m_saveto->setText(saveFileName);
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index cf1fae01..42c01981 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -73,14 +73,14 @@ void ToolTip::maybeTip( const TQPoint &pos )
 
 	if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) )
 	{
-		TQRect tqitemRect = m_listView->tqitemRect( item );
+		TQRect itemRect = m_listView->itemRect( item );
 
 		uint leftMargin = m_listView->treeStepSize() *
 		   ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) +
 		   m_listView->itemMargin();
 
-		uint xAdjust = tqitemRect.left() + leftMargin;
-		uint yAdjust = tqitemRect.top();
+		uint xAdjust = itemRect.left() + leftMargin;
+		uint yAdjust = itemRect.top();
 		TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust );
 
 		std::pair<TQString,TQRect> toolTip = item->toolTip( relativePos );
@@ -88,7 +88,7 @@ void ToolTip::maybeTip( const TQPoint &pos )
 			return;
 
 		toolTip.second.moveBy( xAdjust, yAdjust );
-// 		kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: tqitemRect: "
+// 		kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: itemRect: "
 // 		                 << toolTip.second << ", tooltip:  " << toolTip.first << endl;
 		tip( toolTip.second, toolTip.first );
 	}
@@ -193,7 +193,7 @@ void ListView::keyPressEvent( TQKeyEvent *e )
 	else if ( (e->key() == TQt::Key_Enter || e->key() == TQt::Key_Return) && item && item->isVisible() )
 	{
 		// must provide a point within the item; emitExecute checks for this
-		TQPoint p = viewport()->mapToGlobal(tqitemRect(item).center());
+		TQPoint p = viewport()->mapToGlobal(itemRect(item).center());
 		emitExecute( currentItem(), p, 0 );
 	}
 	else
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index 6156b6aa..777d35ae 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -1145,7 +1145,7 @@ ContactComponent::~ContactComponent()
 
 void ContactComponent::updatePixmap()
 {
-	setPixmap( contact()->onlinetqStatus().iconFor( contact(), d->iconSize ) );
+	setPixmap( contact()->onlineStatus().iconFor( contact(), d->iconSize ) );
 }
 Kopete::Contact *ContactComponent::contact()
 {
@@ -1489,7 +1489,7 @@ void Item::setHeight( int )
 
 int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const
 {
-	// TQt computes the tqitemRect from this. we want the whole item to be
+	// TQt computes the itemRect from this. we want the whole item to be
 	// clickable, so we return the widest we could possibly be.
 	return lv->header()->sectionSize( c );
 }
@@ -1528,7 +1528,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt
 		const BackgroundMode bgmode = lv->viewport()->backgroundMode();
 		const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
 
-		if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+		if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) )
 			p->fillRect( 0, 0, width, height(), _cg.brush( crole ) );
 		else
 		{
@@ -1540,8 +1540,8 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt
 			if ( lv->isEnabled() )
 				how |= TQStyle::Style_Enabled;
 
-			lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView,
-						p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(),
+			lv->tqstyle().drawComplexControl( TQStyle::CC_ListView,
+						p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(),
 						how, TQStyle::SC_ListView, TQStyle::SC_None,
 						opt );
 		}
@@ -1565,7 +1565,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt
 				textheight++;
 			if ( textheight < height() ) {
 				int w = lv->treeStepSize() / 2;
-				lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, lv,
+				lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, lv,
 								TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg,
 								lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default,
 								TQStyle::SC_ListViewExpand,
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp
index af626858..edb63ffc 100644
--- a/kopete/libkopete/ui/kopetelistviewsearchline.cpp
+++ b/kopete/libkopete/ui/kopetelistviewsearchline.cpp
@@ -67,7 +67,7 @@ void SearchLine::updateSearch( const TQString &s )
 		for( TQListViewItemIterator it(listView(), TQListViewItemIterator::Selected | TQListViewItemIterator::Visible);
 		     it.current() && !currentItem; ++it )
 		{
-			if( listView()->tqitemRect( it.current() ).isValid() )
+			if( listView()->itemRect( it.current() ).isValid() )
 				currentItem = it.current();
 		}
 	}
diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui
index 6007a139..8a5663b6 100644
--- a/kopete/libkopete/ui/kopetepassworddialog.ui
+++ b/kopete/libkopete/ui/kopetepassworddialog.ui
@@ -92,7 +92,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
index 468efd56..6919064b 100644
--- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
+++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
@@ -49,7 +49,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index e09cdeb4..f69adcfc 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -41,7 +41,7 @@ KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, con
 : KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name )
 #else
 : KAction( KGuiItem( i18n( "&Configure Kopete..." ),
-	TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, parent, name )
+	TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name )
 #endif
 {
 	connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) );
@@ -70,57 +70,57 @@ KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *n
 
 KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name );
+	return new KAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
 {
-	return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
 }
 
 KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
 {
-	return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name );
 }
 
 #include "kopetestdaction.moc"
diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp
index 4b03f729..a1d7d1e1 100644
--- a/kopete/libkopete/ui/kopetewidgets.cpp
+++ b/kopete/libkopete/ui/kopetewidgets.cpp
@@ -36,7 +36,7 @@ public:
 		TQPixmap pix(m_widgets[key].iconSet);
 #else
 		TQPixmap pix(locate( "data", 
-			TQString::tqfromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet));
+			TQString::fromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet));
 #endif
 		return TQIconSet(pix);
 	}
@@ -71,41 +71,41 @@ KopeteWidgets::KopeteWidgets()
 {
         WidgetInfo widget;
 
-	widget.group = TQString::tqfromLatin1("Input (Kopete)");
+	widget.group = TQString::fromLatin1("Input (Kopete)");
 #ifdef EMBED_IMAGES
 	widget.iconSet = TQPixmap(kopete__ui__addressbooklinkwidget_xpm);
 #else
-	widget.iconSet = TQString::tqfromLatin1("kopete__ui__addressbooklinkwidget.png");
+	widget.iconSet = TQString::fromLatin1("kopete__ui__addressbooklinkwidget.png");
 #endif
-	widget.includeFile = TQString::tqfromLatin1("addressbooklinkwidget.h");
-	widget.toolTip = TQString::tqfromLatin1("Address Book Link Widget (Kopete)");
-	widget.whatsThis = TQString::tqfromLatin1("KABC::Addressee display/selector");
+	widget.includeFile = TQString::fromLatin1("addressbooklinkwidget.h");
+	widget.toolTip = TQString::fromLatin1("Address Book Link Widget (Kopete)");
+	widget.whatsThis = TQString::fromLatin1("KABC::Addressee display/selector");
 	widget.isContainer = false;
-	m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"), widget);
+	m_widgets.insert(TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"), widget);
 
-	widget.group = TQString::tqfromLatin1("Views (Kopete)");
+	widget.group = TQString::fromLatin1("Views (Kopete)");
 #ifdef EMBED_IMAGES
 	widget.iconSet = TQPixmap(kopete__ui__listview__listview_xpm);
 #else
-	widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__listview.png");
+	widget.iconSet = TQString::fromLatin1("kopete__ui__listview__listview.png");
 #endif
-	widget.includeFile = TQString::tqfromLatin1("kopetelistview.h");
-	widget.toolTip = TQString::tqfromLatin1("List View (Kopete)");
-	widget.whatsThis = TQString::tqfromLatin1("A component capable list view widget.");
+	widget.includeFile = TQString::fromLatin1("kopetelistview.h");
+	widget.toolTip = TQString::fromLatin1("List View (Kopete)");
+	widget.whatsThis = TQString::fromLatin1("A component capable list view widget.");
 	widget.isContainer = false;
-	m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::ListView"), widget);
+	m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::ListView"), widget);
 
-	widget.group = TQString::tqfromLatin1("Input (Kopete)");
+	widget.group = TQString::fromLatin1("Input (Kopete)");
 #ifdef EMBED_IMAGES
 	widget.iconSet = TQPixmap(kopete__ui__listview__searchline_xpm);
 #else
-	widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__searchline.png");
+	widget.iconSet = TQString::fromLatin1("kopete__ui__listview__searchline.png");
 #endif
-	widget.includeFile = TQString::tqfromLatin1("kopetelistviewsearchline.h");
-	widget.toolTip = TQString::tqfromLatin1("List View Search Line (Kopete)");
-	widget.whatsThis = TQString::tqfromLatin1("Search line able to use Kopete custom list View.");
+	widget.includeFile = TQString::fromLatin1("kopetelistviewsearchline.h");
+	widget.toolTip = TQString::fromLatin1("List View Search Line (Kopete)");
+	widget.whatsThis = TQString::fromLatin1("Search line able to use Kopete custom list View.");
 	widget.isContainer = false;
-	m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"), widget);
+	m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget);
 
 	new KInstance("kopetewidgets");
 }
@@ -116,13 +116,13 @@ KopeteWidgets::~KopeteWidgets()
 TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *parent, const char *name)
 {
 
-         if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"))
+         if (key == TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"))
                 return new Kopete::UI::AddressBookLinkWidget(parent, name);
 
-         if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView"))
+         if (key == TQString::fromLatin1("Kopete::UI::ListView::ListView"))
                 return new Kopete::UI::ListView::ListView(parent, name);
 
-         if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"))
+         if (key == TQString::fromLatin1("Kopete::UI::ListView::SearchLine"))
                 return new Kopete::UI::ListView::SearchLine(parent, 0, name);
 
 	return 0;
diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp
index 40ac3de9..35149e66 100644
--- a/kopete/libkopete/ui/userinfodialog.cpp
+++ b/kopete/libkopete/ui/userinfodialog.cpp
@@ -93,7 +93,7 @@ void UserInfoDialog::setAwayMessage( const TQString& msg )
 	d->awayMessage = msg;
 }
 
-void UserInfoDialog::settqStatus( const TQString& status )
+void UserInfoDialog::setStatus( const TQString& status )
 {
 	d->status = status;
 }
@@ -138,7 +138,7 @@ TQHBox* UserInfoDialog::addLabelEdit( const TQString& label, const TQString& tex
 	TQHBox *box = new TQHBox( d->page );
 	new TQLabel( label, box );
 	edit = new KLineEdit( box );
-  edit->tqsetAlignment( TQt::AlignHCenter );
+  edit->setAlignment( TQt::AlignHCenter );
 	edit->setText( text );
 	edit->setReadOnly( true );
 	return box;
diff --git a/kopete/libkopete/ui/userinfodialog.h b/kopete/libkopete/ui/userinfodialog.h
index 5926ab5a..ce2dcc90 100644
--- a/kopete/libkopete/ui/userinfodialog.h
+++ b/kopete/libkopete/ui/userinfodialog.h
@@ -50,7 +50,7 @@ namespace Kopete {
 		void setName( const TQString& name );
 		void setId( const TQString& id );
 		void setAwayMessage( const TQString& msg );
-		void settqStatus( const TQString& status );
+		void setStatus( const TQString& status );
 		void setWarningLevel(const TQString& level  );
 		void setOnlineSince( const TQString& since );
 		void setInfo( const TQString& info );