From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/kopeteawayaction.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kopete/libkopete/kopeteawayaction.cpp') diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp index ded2a830..c72d94bc 100644 --- a/kopete/libkopete/kopeteawayaction.cpp +++ b/kopete/libkopete/kopeteawayaction.cpp @@ -37,8 +37,8 @@ public: AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortcut &cut, - const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) - : KSelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) ) + const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) + : KSelectAction(text, pix, cut, tqparent, name ) , d(new Private( OnlineStatus() ) ) { TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), this, TQT_SLOT( slotAwayChanged() ) ); @@ -53,8 +53,8 @@ AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortc } AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, const KShortcut &cut, - const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) - : KSelectAction(text, pix, cut, parent, name ) , d(new Private( status ) ) + const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) + : KSelectAction(text, pix, cut, tqparent, name ) , d(new Private( status ) ) { TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), this, TQT_SLOT( slotAwayChanged() ) ); @@ -84,7 +84,7 @@ void AwayAction::slotAwayChanged() TQStringList menu; menu << i18n( "No Message" ); menu << i18n( "New Message..." ); - menu << TQString::null ; //separator + menu << TQString() ; //separator menu += awayMessages ; setItems( menu ); setCurrentItem( -1 ); @@ -106,11 +106,11 @@ void AwayAction::slotSelectAway( int index ) switch(index) { case 0: - awayReason = TQString::null; + awayReason = TQString(); break; case 1: bool ok; - awayReason = KInputDialog::getText( i18n( "New Away Message" ), i18n( "Please enter your away reason:" ) , TQString::null , &ok ); + awayReason = KInputDialog::getText( i18n( "New Away Message" ), i18n( "Please enter your away reason:" ) , TQString() , &ok ); if(!ok) //the user canceled return; if( !awayReason.isEmpty() ) -- cgit v1.2.1