1 files changed, 23 insertions, 23 deletions

diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 3e14e66d..bb440ef2 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -22,7 +22,7 @@
 
 #include <math.h>
 
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -46,7 +46,7 @@ public:
 		emoticonSelector = new EmoticonSelector( m_popup, "KopeteEmoticonActionPrivate::emoticonSelector");
 		m_popup->insertItem( emoticonSelector );
 		// TODO: Maybe connect to kopeteprefs and redo list only on config changes
-		connect( m_popup, SIGNAL( aboutToShow() ), emoticonSelector, SLOT( prepareList() ) );
+		connect( m_popup, TQT_SIGNAL( aboutToShow() ), emoticonSelector, TQT_SLOT( prepareList() ) );
 	}
 
 	~KopeteEmoticonActionPrivate()
@@ -61,16 +61,16 @@ public:
 	bool m_stickyMenu;
 };
 
-KopeteEmoticonAction::KopeteEmoticonAction( QObject* parent, const char* name )
+KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name )
   : KAction( i18n( "Add Smiley" ), 0, parent, name )
 {
 	d = new KopeteEmoticonActionPrivate;
 
 	// Try to load the icon for our current emoticon theme, when it fails
 	// fall back to our own default
-	QString icon;
-	QMap<QString, QStringList> emoticonsMap = Kopete::Emoticons::self()->emoticonAndPicList();
-	for( QMap<QString, QStringList>::const_iterator it = emoticonsMap.constBegin();
+	TQString icon;
+	TQMap<TQString, TQStringList> emoticonsMap = Kopete::Emoticons::self()->emoticonAndPicList();
+	for( TQMap<TQString, TQStringList>::const_iterator it = emoticonsMap.constBegin();
 		it != emoticonsMap.constEnd(); ++it )
 	{
 		if( ( *it ).contains( ":)" ) || ( *it ).contains( ":-)" ) )
@@ -83,11 +83,11 @@ KopeteEmoticonAction::KopeteEmoticonAction( QObject* parent, const char* name )
 	if ( icon.isNull() )
 		setIcon( "emoticon" );
 	else
-		setIconSet( QIconSet( icon ) );
+		setIconSet( TQIconSet( icon ) );
 
 	setShortcutConfigurable( false );
-	connect( d->emoticonSelector, SIGNAL( ItemSelected( const QString & ) ),
-		this, SIGNAL( activated( const QString & ) ) );
+	connect( d->emoticonSelector, TQT_SIGNAL( ItemSelected( const TQString & ) ),
+		this, TQT_SIGNAL( activated( const TQString & ) ) );
 }
 
 KopeteEmoticonAction::~KopeteEmoticonAction()
@@ -98,7 +98,7 @@ KopeteEmoticonAction::~KopeteEmoticonAction()
 	d = 0;
 }
 
-void KopeteEmoticonAction::popup( const QPoint& global )
+void KopeteEmoticonAction::popup( const TQPoint& global )
 {
 	popupMenu()->popup( global );
 }
@@ -128,7 +128,7 @@ void KopeteEmoticonAction::setStickyMenu(bool sticky)
 	d->m_stickyMenu = sticky;
 }
 
-int KopeteEmoticonAction::plug( QWidget* widget, int index )
+int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 {
 	if (kapp && !kapp->authorizeKAction(name()))
 		return -1;
@@ -136,9 +136,9 @@ int KopeteEmoticonAction::plug( QWidget* widget, int index )
 //	kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl;
 
 	// KDE4/Qt TODO: Use qobject_cast instead.
-	if ( widget->inherits("QPopupMenu") )
+	if ( widget->inherits("TQPopupMenu") )
 	{
-		QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+		TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
 		int id;
 		if ( hasIcon() )
 			id = menu->insertItem( iconSet(KIcon::Small), text(), d->m_popup, -1, index );
@@ -149,7 +149,7 @@ int KopeteEmoticonAction::plug( QWidget* widget, int index )
 			menu->setItemEnabled( id, false );
 
 		addContainer( menu, id );
-		connect( menu, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+		connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
 		if ( m_parentCollection )
 			m_parentCollection->connectHighlight( menu, this );
@@ -166,8 +166,8 @@ int KopeteEmoticonAction::plug( QWidget* widget, int index )
 		if ( icon().isEmpty() && !iconSet(KIcon::Small).isNull() )
 		{
 			bar->insertButton(
-				iconSet(KIcon::Small).pixmap(), id_, SIGNAL(clicked()), this,
-				SLOT(slotActivated()), isEnabled(), plainText(),
+				iconSet(KIcon::Small).pixmap(), id_, TQT_SIGNAL(clicked()), this,
+				TQT_SLOT(slotActivated()), isEnabled(), plainText(),
 				index );
 		}
 		else
@@ -179,17 +179,17 @@ int KopeteEmoticonAction::plug( QWidget* widget, int index )
 			else
 			instance = KGlobal::instance();
 
-			bar->insertButton( icon(), id_, SIGNAL( clicked() ), this,
-									SLOT( slotActivated() ), isEnabled(), plainText(),
+			bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
+									TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
 									index, instance );
 		}
 
 		addContainer( bar, id_ );
 
 		if (!whatsThis().isEmpty())
-			QWhatsThis::add( bar->getButton(id_), whatsThis() );
+			TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-		connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+		connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
 		if (delayed())
 			bar->setDelayedPopup(id_, popupMenu(), stickyMenu());
@@ -202,9 +202,9 @@ int KopeteEmoticonAction::plug( QWidget* widget, int index )
 		return containerCount() - 1;
 	}
 	// KDE4/Qt TODO: Use qobject_cast instead.
-	else if ( widget->inherits( "QMenuBar" ) )
+	else if ( widget->inherits( "TQMenuBar" ) )
 	{
-		QMenuBar *bar = static_cast<QMenuBar *>( widget );
+		TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
 		int id;
 
@@ -214,7 +214,7 @@ int KopeteEmoticonAction::plug( QWidget* widget, int index )
 			bar->setItemEnabled( id, false );
 
 		addContainer( bar, id );
-		connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+		connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
 		return containerCount() - 1;
 	}