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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

24 files changed, 147 insertions, 147 deletions

diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp
index a2181cc9..3a9b94ff 100644
--- a/kopete/libkopete/ui/accountselector.cpp
+++ b/kopete/libkopete/ui/accountselector.cpp
@@ -20,7 +20,7 @@
 #include "kopeteaccountmanager.h"
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 
 #include <kdebug.h>
@@ -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::fromLatin1(""));
+	d->lv->addColumn(TQString::tqfromLatin1(""));
 	d->lv->header()->hide();
 
 	if(d->proto != 0)
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index 31e04a52..f12e7116 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::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) );
+	btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) );
 	connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) );
 	connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) );
 }
@@ -74,7 +74,7 @@ void AddressBookLinkWidget::slotSelectAddressee()
 {
 	TQString message;
 	if ( mMetaContact )
-		message = i18n("Choose the corresponding entry for '%1'" ).arg( mMetaContact->displayName() );
+		message = i18n("Choose the corresponding entry for '%1'" ).tqarg( mMetaContact->displayName() );
  	else
 		message = i18n("Choose the corresponding entry in the address book" );
 
diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui
index f9fb6e59..8fc4c46f 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui
+++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 7b6fc27f..710d56f1 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::fromLatin1("email")), i18n("Email"));
+	addresseeListView->setColumnText(2, SmallIconSet(TQString::tqfromLatin1("email")), i18n("Email"));
 
 	kListViewSearchLine->setListView(addresseeListView);
 	slotLoadAddressees();
diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
index 423b2047..276620be 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>405</width>
                     <height>20</height>
@@ -128,7 +128,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp
index 890435b0..55b58068 100644
--- a/kopete/libkopete/ui/addresseeitem.cpp
+++ b/kopete/libkopete/ui/addresseeitem.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 #include <tqregexp.h>
@@ -49,7 +49,7 @@ TQString AddresseeItem::key( int column, bool ) const
 {
   if (column == Email) {
     TQString value = text(Email);
-    TQRegExp emailRe(TQString::fromLatin1("<\\S*>"));
+    TQRegExp emailRe(TQString::tqfromLatin1("<\\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 2a96ac9a..e5fd81b4 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqapplication.h>
 
 #include <klocale.h>
@@ -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>")
-			.arg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":")
+			.tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::tqfromLatin1(":")
 			                  + KURL::encode_string( account->accountId() ) ,
-				  contactNick.isEmpty() ? contactId : contactNick + TQString::fromLatin1(" < ") + contactId + TQString::fromLatin1(" >")  ,
+				  contactNick.isEmpty() ? contactId : contactNick + TQString::tqfromLatin1(" < ") + contactId + TQString::tqfromLatin1(" >")  ,
 				  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 f29756e8..100e6eca 100644
--- a/kopete/libkopete/ui/contactaddednotifywidget.ui
+++ b/kopete/libkopete/ui/contactaddednotifywidget.ui
@@ -24,13 +24,13 @@
             <property name="text">
                 <string>The contact XXX added you in his contactlist</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>151</width>
                             <height>20</height>
@@ -98,7 +98,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout19</cstring>
+                        <cstring>tqlayout19</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -135,7 +135,7 @@ Leave it empty if you want to see the contact nickname as display name.</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -183,7 +183,7 @@ Leave it empty if you want to see the contact nickname as display name.</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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="sizeHint">
+                            <property name="tqsizeHint">
                                 <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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui
index 98970958..cd91863d 100644
--- a/kopete/libkopete/ui/fileconfirmbase.ui
+++ b/kopete/libkopete/ui/fileconfirmbase.ui
@@ -32,7 +32,7 @@
             <property name="text">
                 <string>A user is trying to send you a file. The file will only be downloaded if you accept this dialog. If you do not wish to receive it, please click 'Refuse'. This file will never be executed by Kopete at any point during or after the transfer.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -99,7 +99,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui
index 38571bd6..be81b276 100644
--- a/kopete/libkopete/ui/kopeteawaydialogbase.ui
+++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui
@@ -26,7 +26,7 @@
             <property name="text">
                 <string>Please specify an away message, or choose a predefined one.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -44,7 +44,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>300</width>
                     <height>0</height>
@@ -72,7 +72,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp
index cc6754d2..6492d1c0 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->onlineStatus().iconFor( contact ) ), KShortcut(),
+: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().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 a325e19f..fc9310fa 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include <textedit.h>
+#include <tqtextedit.h>
 
 #include <klineedit.h>
 #include <kconfig.h>
@@ -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::fromLatin1( " <" ) +
-			info.contact()->contactId() + TQString::fromLatin1( "> " ) );
+	m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::tqfromLatin1( " <" ) +
+			info.contact()->contactId() + TQString::tqfromLatin1( "> " ) );
 	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::fromLatin1( "/" ) + info.file() );
+	m_view->m_saveto->setText(defaultPath  + TQString::tqfromLatin1( "/" ) + info.file() );
 
 	setMainWidget(m_view);
 
@@ -61,7 +61,7 @@ KopeteFileConfirmDialog::~KopeteFileConfirmDialog()
 
 void KopeteFileConfirmDialog::slotBrowsePressed()
 {
-	TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::fromLatin1( "*" ), 0L , i18n( "File Transfer" ) );
+	TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::tqfromLatin1( "*" ), 0L , i18n( "File Transfer" ) );
 	if ( !saveFileName.isNull())
 	{
 		m_view->m_saveto->setText(saveFileName);
@@ -83,7 +83,7 @@ void KopeteFileConfirmDialog::slotUser2()
 		
 		if(TQFile(m_view->m_saveto->text()).exists())
 		{
-			int ret=KMessageBox::warningContinueCancel(this,  i18n("The file '%1' already exists.\nDo you want to overwrite it ?").arg(m_view->m_saveto->text()) ,
+			int ret=KMessageBox::warningContinueCancel(this,  i18n("The file '%1' already exists.\nDo you want to overwrite it ?").tqarg(m_view->m_saveto->text()) ,
 					 i18n("Overwrite File") , KStdGuiItem::save());
 			if(ret==KMessageBox::Cancel)
 				return;
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 7e783024..cf1fae01 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 itemRect = m_listView->itemRect( item );
+		TQRect tqitemRect = m_listView->tqitemRect( item );
 
 		uint leftMargin = m_listView->treeStepSize() *
 		   ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) +
 		   m_listView->itemMargin();
 
-		uint xAdjust = itemRect.left() + leftMargin;
-		uint yAdjust = itemRect.top();
+		uint xAdjust = tqitemRect.left() + leftMargin;
+		uint yAdjust = tqitemRect.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: itemRect: "
+// 		kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: tqitemRect: "
 // 		                 << toolTip.second << ", tooltip:  " << toolTip.first << endl;
 		tip( toolTip.second, toolTip.first );
 	}
@@ -174,7 +174,7 @@ void ListView::setShowTreeLines( bool bShowAsTree )
 		setRootIsDecorated( false );
 		setTreeStepSize( 0 );
 	}
-	// TODO: relayout all items. their width may have changed, but they won't know about it.
+	// TODO: retqlayout all items. their width may have changed, but they won't know about it.
 }
 
 /* This is a small hack ensuring that only F2 triggers inline
@@ -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(itemRect(item).center());
+		TQPoint p = viewport()->mapToGlobal(tqitemRect(item).center());
 		emitExecute( currentItem(), p, 0 );
 	}
 	else
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index b66dc1af..6156b6aa 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -236,7 +236,7 @@ bool Component::setMinHeight( int height )
 	return true;
 }
 
-void Component::layout( const TQRect &newRect )
+void Component::tqlayout( const TQRect &newRect )
 {
 	if ( rect().isNull() )
 		d->startRect = TQRect( newRect.topLeft(), newRect.topLeft() );
@@ -262,26 +262,26 @@ void Component::paint( TQPainter *painter, const TQColorGroup &cg )
 	}
 }
 
-void Component::repaint()
+void Component::tqrepaint()
 {
-	d->parent->repaint();
+	d->parent->tqrepaint();
 }
 
-void Component::relayout()
+void Component::retqlayout()
 {
-	d->parent->relayout();
+	d->parent->retqlayout();
 }
 
 void Component::componentAdded( Component *component )
 {
 	ComponentBase::componentAdded( component );
-	//update( Relayout );
+	//update( Retqlayout );
 }
 
 void Component::componentRemoved( Component *component )
 {
 	ComponentBase::componentRemoved( component );
-	//update( Relayout );
+	//update( Retqlayout );
 }
 
 // BoxComponent --------
@@ -374,14 +374,14 @@ void BoxComponent::calcMinSize()
 	}
 
 	if ( sizeChanged )
-		repaint();
+		tqrepaint();
 	else
-		relayout();
+		retqlayout();
 }
 
-void BoxComponent::layout( const TQRect &rect )
+void BoxComponent::tqlayout( const TQRect &rect )
 {
-	Component::layout( rect );
+	Component::tqlayout( rect );
 
 	bool horiz = (d->direction ==Qt::Horizontal);
 	int fixedSize = 0;
@@ -437,7 +437,7 @@ void BoxComponent::layout( const TQRect &rect )
 			pos += rc.height();
 			remaining -= rc.height() - minHeight;
 		}
-		comp->layout( rc & rect );
+		comp->tqlayout( rc & rect );
 		pos += padding;
 	}
 }
@@ -518,7 +518,7 @@ void	ContactBoxComponent::reloadTheme()
 	d->bottom_pixmap.load(str);
 }
 
-void	ContactBoxComponent::layout(const TQRect &rect)
+void	ContactBoxComponent::tqlayout(const TQRect &rect)
 {
 	d->sub.setLeft(rect.left() +
 			d->left_pixmap.width());
@@ -529,8 +529,8 @@ void	ContactBoxComponent::layout(const TQRect &rect)
 	d->sub.setBottom(rect.bottom() -
 			d->bottom_pixmap.height());
 
-	BoxComponent::layout(d->sub);
-	Component::layout(rect);
+	BoxComponent::tqlayout(d->sub);
+	Component::tqlayout(rect);
 }
 
 int	ContactBoxComponent::widthForHeight(int height)
@@ -661,7 +661,7 @@ void	GroupBoxComponent::reloadTheme()
 	d->bottom_pixmap.load(str);
 }
 
-void	GroupBoxComponent::layout(const TQRect &rect)
+void	GroupBoxComponent::tqlayout(const TQRect &rect)
 {
 	d->sub.setLeft(rect.left() +
 			d->left_pixmap.width());
@@ -672,8 +672,8 @@ void	GroupBoxComponent::layout(const TQRect &rect)
 	d->sub.setBottom(rect.bottom() -
 			d->bottom_pixmap.height());
 
-	BoxComponent::layout(d->sub);
-	Component::layout(rect);
+	BoxComponent::tqlayout(d->sub);
+	Component::tqlayout(rect);
 }
 
 int	GroupBoxComponent::widthForHeight(int height)
@@ -758,7 +758,7 @@ ImageComponent::ImageComponent( ComponentBase *parent, int minW, int minH )
 {
 	setMinWidth( minW );
 	setMinHeight( minH );
-	repaint();
+	tqrepaint();
 }
 
 ImageComponent::~ImageComponent()
@@ -777,7 +777,7 @@ void ImageComponent::setPixmap( const TQPixmap &img, bool)
 	setMinWidth(d->image.width());
 	setMinHeight(d->image.height());
 
-	repaint();
+	tqrepaint();
 }
 
 void ImageComponent::paint( TQPainter *painter, const TQColorGroup & )
@@ -814,7 +814,7 @@ void		FaceComponent::setPixmap(const TQPixmap &img, bool)
 		setMinHeight(d->image.height() + 4);
 	}
 
-	repaint();
+	tqrepaint();
 }
 
 static TQPoint	operator+(const TQPoint &pt, const TQSize &sz)
@@ -881,7 +881,7 @@ void TextComponent::setText( const TQString &text )
 {
 	if ( text == d->text ) return;
 	d->text = text;
-	relayout();
+	retqlayout();
 	calcMinSize();
 }
 
@@ -906,7 +906,7 @@ void TextComponent::calcMinSize()
 	else
 		setMinHeight( 0 );
 
-	repaint();
+	tqrepaint();
 }
 
 int TextComponent::widthForHeight( int )
@@ -927,13 +927,13 @@ void TextComponent::setColor( const TQColor &color )
 {
 	d->color = color;
 	d->customColor = true;
-	repaint();
+	tqrepaint();
 }
 
 void TextComponent::setDefaultColor()
 {
 	d->customColor = false;
-	repaint();
+	tqrepaint();
 }
 
 void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg )
@@ -968,9 +968,9 @@ DisplayNameComponent::~DisplayNameComponent()
 	delete d;
 }
 
-void DisplayNameComponent::layout( const TQRect &rect )
+void DisplayNameComponent::tqlayout( const TQRect &rect )
 {
-	Component::layout( rect );
+	Component::tqlayout( rect );
 
 	// finally, lay everything out
 	TQRect rc;
@@ -989,7 +989,7 @@ void DisplayNameComponent::layout( const TQRect &rect )
 				if ( comp->rtti() == Rtti_TextComponent )
 				{
 					comp->show();
-					comp->layout( TQRect( usedWidth+ rect.left(), rect.top(),
+					comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(),
 							     totalWidth - usedWidth,
 							     comp->heightForWidth( totalWidth - usedWidth ) ) );
 				} else {
@@ -999,7 +999,7 @@ void DisplayNameComponent::layout( const TQRect &rect )
 			else 
 			{
 				comp->show();
-				comp->layout( TQRect( usedWidth+ rect.left(), rect.top(),
+				comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(),
 						     comp->widthForHeight( rect.height() ),
 						     comp->heightForWidth( rect.width() ) ) );
 			}
@@ -1145,7 +1145,7 @@ ContactComponent::~ContactComponent()
 
 void ContactComponent::updatePixmap()
 {
-	setPixmap( contact()->onlineStatus().iconFor( contact(), d->iconSize ) );
+	setPixmap( contact()->onlinetqStatus().iconFor( contact(), d->iconSize ) );
 }
 Kopete::Contact *ContactComponent::contact()
 {
@@ -1316,13 +1316,13 @@ void Item::initLVI()
 void Item::slotColumnResized()
 {
 	scheduleLayout();
-	// if we've been resized, don't animate the layout
+	// if we've been resized, don't animate the tqlayout
 	d->animateLayout = false;
 }
 
 void Item::scheduleLayout()
 {
-	// perform a delayed layout in order to speed it all up
+	// perform a delayed tqlayout in order to speed it all up
 	if ( ! d->layoutTimer.isActive() )
 		d->layoutTimer.start( 30, true );
 }
@@ -1341,7 +1341,7 @@ void Item::slotLayoutItems()
 		}
 
 		int height = component( n )->heightForWidth( width );
-		component( n )->layout( TQRect( 0, 0, width, height ) );
+		component( n )->tqlayout( TQRect( 0, 0, width, height ) );
 		//kdDebug(14000) << k_funcinfo << "Component " << n << " is " << width << " x " << height << endl;
 	}
 
@@ -1370,7 +1370,7 @@ void Item::slotLayoutAnimateItems()
 
 	updateAnimationPosition( p, s );
 	setHeight(0);
-	repaint();
+	tqrepaint();
 }
 
 float Item::opacity()
@@ -1382,7 +1382,7 @@ void Item::setOpacity( float opacity )
 {
 	if ( d->opacity == opacity ) return;
 	d->opacity = opacity;
-	repaint();
+	tqrepaint();
 }
 
 void Item::setSearchMatch( bool match )
@@ -1451,18 +1451,18 @@ void Item::slotUpdateVisibility()
 		setVisible( false );
 	}
 	setHeight( 0 );
-	repaint();
+	tqrepaint();
 }
 
-void Item::repaint()
+void Item::tqrepaint()
 {
-	// if we're about to relayout, don't bother painting yet.
+	// if we're about to retqlayout, don't bother painting yet.
 	if ( d->layoutTimer.isActive() )
 		return;
 	listView()->repaintItem( this );
 }
 
-void Item::relayout()
+void Item::retqlayout()
 {
 	scheduleLayout();
 }
@@ -1489,7 +1489,7 @@ void Item::setHeight( int )
 
 int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const
 {
-	// TQt computes the itemRect from this. we want the whole item to be
+	// TQt computes the tqitemRect 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->colorGroup().brush( crole ) )
+		if ( _cg.brush( crole ) != lv->tqcolorGroup().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().drawComplexControl( TQStyle::CC_ListView,
-						p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(),
+			lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView,
+						p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(),
 						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().drawComplexControl( TQStyle::CC_ListView, p, lv,
+				lv->tqstyle().tqdrawComplexControl( 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/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h
index bd2a2968..0868afab 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.h
+++ b/kopete/libkopete/ui/kopetelistviewitem.h
@@ -44,9 +44,9 @@ public:
 	Component *componentAt( const TQPoint &pt );
 
 	/** Repaint this item */
-	virtual void repaint() = 0;
-	/** Relayout this item */
-	virtual void relayout() = 0;
+	virtual void tqrepaint() = 0;
+	/** Retqlayout this item */
+	virtual void retqlayout() = 0;
 
 	/**
 	 * Get the tool tip string and rectangle for a tip request at position
@@ -64,7 +64,7 @@ protected:
 	virtual void componentRemoved( Component *component );
 	/** A child item has been resized */
 	virtual void componentResized( Component *component );
-	/** Remove all children */
+	/** Remove all tqchildren */
 	virtual void clear();
 
 	/** @internal animate items */
@@ -112,16 +112,16 @@ public:
 	 * @param rect the new rectangle this component will paint in, relative to the painter
 	 *             passed to the paint() function by the parent item.
 	 */
-	virtual void layout( const TQRect &rect );
+	virtual void tqlayout( const TQRect &rect );
 
 	/**
 	 * Paint this item, inside the rectangle returned by rect().
-	 * The default implementation calls paint on all children.
+	 * The default implementation calls paint on all tqchildren.
 	 */
 	virtual void paint( TQPainter *painter, const TQColorGroup &cg );
 
-	void repaint();
-	void relayout();
+	void tqrepaint();
+	void retqlayout();
 
 	/**
 	 * @return the rect this component was allocated last time it was laid out
@@ -196,19 +196,19 @@ public:
 protected:
 	/**
 	 * Change the minimum width, in pixels, this component requires in order
-	 * to be at all useful. Note: do not call this from your layout() function.
+	 * to be at all useful. Note: do not call this from your tqlayout() function.
 	 * @param width the minimum width
 	 * @return true if the size has actually changed, false if it's been set to
-	 *         the existing values. if it returns true, you do not need to relayout,
+	 *         the existing values. if it returns true, you do not need to retqlayout,
 	 *         since the parent component will do that for you.
 	 */
 	bool setMinWidth( int width );
 	/**
 	 * Change the minimum height, in pixels, this component requires in order
-	 * to be at all useful. Note: do not call this from your layout() function.
+	 * to be at all useful. Note: do not call this from your tqlayout() function.
 	 * @param height the minimum height
 	 * @return true if the size has actually changed, false if it's been set to
-	 *         the existing values. If it returns true, you do not need to relayout,
+	 *         the existing values. If it returns true, you do not need to retqlayout,
 	 *         since the parent component will do that for you.
 	 */
 	bool setMinHeight( int height );
@@ -236,7 +236,7 @@ public:
 	BoxComponent( ComponentBase *parent, Direction dir =Horizontal );
 	~BoxComponent();
 
-	virtual void layout( const TQRect &rect );
+	virtual void tqlayout( const TQRect &rect );
 
 	virtual int widthForHeight( int height );
 	virtual int heightForWidth( int width );
@@ -267,7 +267,7 @@ public:
 
 	virtual void	reloadTheme();
 
-	virtual void	layout(const TQRect &rect);
+	virtual void	tqlayout(const TQRect &rect);
 
 	virtual int		widthForHeight(int height);
 	virtual int		heightForWidth(int width);
@@ -290,7 +290,7 @@ public:
 
 	virtual void	reloadTheme();
 
-	virtual void	layout(const TQRect &rect);
+	virtual void	tqlayout(const TQRect &rect);
 
 	virtual int		widthForHeight(int height);
 	virtual int		heightForWidth(int width);
@@ -406,7 +406,7 @@ public:
 	 * Dtor
 	 */
 	~DisplayNameComponent();
-	void layout( const TQRect& rect );
+	void tqlayout( const TQRect& rect );
 
 	TQString text();
 	void setText( const TQString& text );
@@ -460,8 +460,8 @@ public:
 	Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0  );
 	~Item();
 
-	void repaint();
-	void relayout();
+	void tqrepaint();
+	void retqlayout();
 
 	void setup();
 	virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp
index edb63ffc..af626858 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()->itemRect( it.current() ).isValid() )
+			if( listView()->tqitemRect( it.current() ).isValid() )
 				currentItem = it.current();
 		}
 	}
diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui
index ac510361..6007a139 100644
--- a/kopete/libkopete/ui/kopetepassworddialog.ui
+++ b/kopete/libkopete/ui/kopetepassworddialog.ui
@@ -19,7 +19,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -50,7 +50,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -92,7 +92,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
index 6919064b..468efd56 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index f69adcfc..e09cdeb4 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::fromLatin1( "configure" ) ), 0, 0, 0, parent, name )
+	TQString::tqfromLatin1( "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::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "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::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "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::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "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::fromLatin1( "attach" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "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::fromLatin1( "history" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "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::fromLatin1( "folder" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "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::fromLatin1( "move" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "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::fromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name );
+	return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "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::fromLatin1( "signature" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "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::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "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::fromLatin1( "player_play" ), 0, recvr, slot, parent, name );
+	return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "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 a1d7d1e1..4b03f729 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::fromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet));
+			TQString::tqfromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet));
 #endif
 		return TQIconSet(pix);
 	}
@@ -71,41 +71,41 @@ KopeteWidgets::KopeteWidgets()
 {
         WidgetInfo widget;
 
-	widget.group = TQString::fromLatin1("Input (Kopete)");
+	widget.group = TQString::tqfromLatin1("Input (Kopete)");
 #ifdef EMBED_IMAGES
 	widget.iconSet = TQPixmap(kopete__ui__addressbooklinkwidget_xpm);
 #else
-	widget.iconSet = TQString::fromLatin1("kopete__ui__addressbooklinkwidget.png");
+	widget.iconSet = TQString::tqfromLatin1("kopete__ui__addressbooklinkwidget.png");
 #endif
-	widget.includeFile = TQString::fromLatin1("addressbooklinkwidget.h");
-	widget.toolTip = TQString::fromLatin1("Address Book Link Widget (Kopete)");
-	widget.whatsThis = TQString::fromLatin1("KABC::Addressee display/selector");
+	widget.includeFile = TQString::tqfromLatin1("addressbooklinkwidget.h");
+	widget.toolTip = TQString::tqfromLatin1("Address Book Link Widget (Kopete)");
+	widget.whatsThis = TQString::tqfromLatin1("KABC::Addressee display/selector");
 	widget.isContainer = false;
-	m_widgets.insert(TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"), widget);
+	m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"), widget);
 
-	widget.group = TQString::fromLatin1("Views (Kopete)");
+	widget.group = TQString::tqfromLatin1("Views (Kopete)");
 #ifdef EMBED_IMAGES
 	widget.iconSet = TQPixmap(kopete__ui__listview__listview_xpm);
 #else
-	widget.iconSet = TQString::fromLatin1("kopete__ui__listview__listview.png");
+	widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__listview.png");
 #endif
-	widget.includeFile = TQString::fromLatin1("kopetelistview.h");
-	widget.toolTip = TQString::fromLatin1("List View (Kopete)");
-	widget.whatsThis = TQString::fromLatin1("A component capable list view widget.");
+	widget.includeFile = TQString::tqfromLatin1("kopetelistview.h");
+	widget.toolTip = TQString::tqfromLatin1("List View (Kopete)");
+	widget.whatsThis = TQString::tqfromLatin1("A component capable list view widget.");
 	widget.isContainer = false;
-	m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::ListView"), widget);
+	m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::ListView"), widget);
 
-	widget.group = TQString::fromLatin1("Input (Kopete)");
+	widget.group = TQString::tqfromLatin1("Input (Kopete)");
 #ifdef EMBED_IMAGES
 	widget.iconSet = TQPixmap(kopete__ui__listview__searchline_xpm);
 #else
-	widget.iconSet = TQString::fromLatin1("kopete__ui__listview__searchline.png");
+	widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__searchline.png");
 #endif
-	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.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.isContainer = false;
-	m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget);
+	m_widgets.insert(TQString::tqfromLatin1("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::fromLatin1("Kopete::UI::AddressBookLinkWidget"))
+         if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"))
                 return new Kopete::UI::AddressBookLinkWidget(parent, name);
 
-         if (key == TQString::fromLatin1("Kopete::UI::ListView::ListView"))
+         if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView"))
                 return new Kopete::UI::ListView::ListView(parent, name);
 
-         if (key == TQString::fromLatin1("Kopete::UI::ListView::SearchLine"))
+         if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"))
                 return new Kopete::UI::ListView::SearchLine(parent, 0, name);
 
 	return 0;
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index dbd8dec9..0fa64a4e 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -23,7 +23,7 @@
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvaluelist.h>
 
 #include <kapplication.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui
index 4ff402b1..52d946b9 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui
+++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui
@@ -42,7 +42,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp
index 2fa3962c..40ac3de9 100644
--- a/kopete/libkopete/ui/userinfodialog.cpp
+++ b/kopete/libkopete/ui/userinfodialog.cpp
@@ -27,7 +27,7 @@
 
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 namespace Kopete {
 
@@ -59,7 +59,7 @@ struct UserInfoDialog::UserInfoDialogPrivate {
 };
 
 UserInfoDialog::UserInfoDialog( const TQString& descr )
-: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).arg( descr ), KDialogBase::Ok )
+: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).tqarg( descr ), KDialogBase::Ok )
 {
 	d = new UserInfoDialogPrivate;
 	d->page = new TQWidget( this );
@@ -93,7 +93,7 @@ void UserInfoDialog::setAwayMessage( const TQString& msg )
 	d->awayMessage = msg;
 }
 
-void UserInfoDialog::setStatus( const TQString& status )
+void UserInfoDialog::settqStatus( 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->setAlignment( TQt::AlignHCenter );
+  edit->tqsetAlignment( 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 ce2dcc90..5926ab5a 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 setStatus( const TQString& status );
+		void settqStatus( const TQString& status );
 		void setWarningLevel(const TQString& level  );
 		void setOnlineSince( const TQString& since );
 		void setInfo( const TQString& info );