rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 27 insertions, 27 deletions

diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index cd8f2326..d9a6a632 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -36,12 +36,12 @@
 
 KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L;
 
-KopetePreferencesAction::KopetePreferencesAction( KActionCollection *tqparent, const char *name )
+KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const char *name )
 #if KDE_IS_VERSION( 3, 3, 90 )
-: KAction( KStdGuiItem::configure(), 0, 0, 0, tqparent, name )
+: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name )
 #else
 : KAction( KGuiItem( i18n( "&Configure Kopete..." ),
-	TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, tqparent, name )
+	TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, parent, name )
 #endif
 {
 	connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) );
@@ -63,64 +63,64 @@ void KopetePreferencesAction::slotShowPreferences()
 	KWin::activateWindow( s_settingsDialog->dialog()->winId() );
 }
 
-KAction * KopeteStdAction::preferences( KActionCollection *tqparent, const char *name )
+KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *name )
 {
-	return new KopetePreferencesAction( tqparent, name );
+	return new KopetePreferencesAction( parent, name );
 }
 
-KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+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, tqparent, 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 *tqparent, const char *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, tqparent, 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 *tqparent, const char *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, tqparent, 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 *tqparent, const char *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, tqparent, 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 *tqparent, const char *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, tqparent, 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 *tqparent, const char *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, tqparent, 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 *tqparent, const char *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, tqparent, 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 *tqparent, const char *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, tqparent, 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 *tqparent, const char *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, tqparent, 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* tqparent, const char *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, tqparent, 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* tqparent, const char *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, tqparent, name );
+	return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, parent, name );
 }
 
 #include "kopetestdaction.moc"