rename the following methods:

tqparent parent
tqmask mask


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

src/otrguiclient.cpp

@@ -39,8 +39,8 @@
   */
 
 
-OtrGUIClient::OtrGUIClient( Kopete::ChatSession *tqparent, const char *name )
-: TQObject( tqparent, name ), KXMLGUIClient( tqparent )
+OtrGUIClient::OtrGUIClient( Kopete::ChatSession *parent, const char *name )
+: TQObject( parent, name ), KXMLGUIClient( parent )
 {
 	setInstance( OTRPlugin::plugin()->instance() );
 
@@ -57,7 +57,7 @@ OtrGUIClient::OtrGUIClient( Kopete::ChatSession *tqparent, const char *name )
 
 	connect( this, TQT_SIGNAL( signalVerifyFingerprint( Kopete::ChatSession * ) ), OTRPlugin::plugin(), TQT_SLOT(slotVerifyFingerprint( Kopete::ChatSession * )) );
 
-	m_manager = tqparent;
+	m_manager = parent;
 	otrActionMenu = new KActionMenu(i18n("OTR Settings"),"otr_disabled", actionCollection(), "otr_settings");
 	otrActionMenu->setDelayed( false );
 	actionEnableOtr = new KAction(i18n( "Start OTR session" ), "otr_private", 0,this,TQT_SLOT(slotEnableOtr()),actionCollection(), "enable_otr");
@@ -70,7 +70,7 @@ OtrGUIClient::OtrGUIClient( Kopete::ChatSession *tqparent, const char *name )
 
 	setXMLFile("otrchatui.rc");
 
-	encryptionEnabled( tqparent, OtrlChatInterface::self()->privState(tqparent) );
+	encryptionEnabled( parent, OtrlChatInterface::self()->privState(parent) );
     
 
 }

src/otrguiclient.h

@@ -54,7 +54,7 @@ class OtrGUIClient : public TQObject , public KXMLGUIClient
 
 public:
 
-	OtrGUIClient( Kopete::ChatSession *tqparent, const char *name=0L );
+	OtrGUIClient( Kopete::ChatSession *parent, const char *name=0L );
 	~OtrGUIClient();
 
 

src/otrplugin.cpp

@@ -62,8 +62,8 @@ typedef KGenericFactory<OTRPlugin> OTRPluginFactory;
 static const KAboutData aboutdata("kopete_otr", I18N_NOOP("OTR") , "0.7" );
 K_EXPORT_COMPONENT_FACTORY( kopete_otr, OTRPluginFactory( &aboutdata )  )
 
-OTRPlugin::OTRPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ )
-: Kopete::Plugin( OTRPluginFactory::instance(), tqparent, name )
+OTRPlugin::OTRPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ )
+: Kopete::Plugin( OTRPluginFactory::instance(), parent, name )
 {
 	if( !pluginStatic_ )
 		pluginStatic_=this;

src/otrplugin.h

@@ -74,7 +74,7 @@ public:
 
 	static OTRPlugin  *plugin();
 
-	OTRPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
+	OTRPlugin( TQObject *parent, const char *name, const TQStringList &args );
 	~OTRPlugin();
 
 	void emitGoneSecure( Kopete::ChatSession *session, int status );

src/otrpreferences.cpp

@@ -57,8 +57,8 @@
 typedef KGenericFactory<OTRPreferences> OTRPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_otr, OTRPreferencesFactory("kcm_kopete_otr"))
 
-OTRPreferences::OTRPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args)
-		: KCModule(OTRPreferencesFactory::instance(), tqparent, args)
+OTRPreferences::OTRPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
+		: KCModule(OTRPreferencesFactory::instance(), parent, args)
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	preferencesDialog = new OTRPrefsUI(this);

src/otrpreferences.h

@@ -34,7 +34,7 @@ class OTRPreferences : public KCModule  {
   TQ_OBJECT
 
 public:
-	OTRPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList());
+	OTRPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
 	~OTRPreferences();
 
 private:

src/privkeypopup.cpp

@@ -25,8 +25,8 @@
 
 #include "privkeypopup.h"
 
-PrivKeyPopup::PrivKeyPopup(TQWidget* tqparent, const char* name, WFlags fl)
-: PrivKeyPopupUI(tqparent,name,fl)
+PrivKeyPopup::PrivKeyPopup(TQWidget* parent, const char* name, WFlags fl)
+: PrivKeyPopupUI(parent,name,fl)
 {
 }
 

src/privkeypopup.h

@@ -33,7 +33,7 @@ class PrivKeyPopup : public PrivKeyPopupUI
   TQ_OBJECT
 
 public:
-	PrivKeyPopup(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+	PrivKeyPopup(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~PrivKeyPopup();
 	void setCloseLock( bool locked );
   /*$PUBLIC_FUNCTIONS$*/

src/smppopup.cpp

@@ -29,8 +29,8 @@
 #include "smppopup.h"
 #include "verifypopup.h"
 
-SMPPopup::SMPPopup(TQWidget* tqparent, const char* name, WFlags fl, ConnContext *context, Kopete::ChatSession *session, bool initiate )
-: SMPPopupUI(tqparent,name,fl)
+SMPPopup::SMPPopup(TQWidget* parent, const char* name, WFlags fl, ConnContext *context, Kopete::ChatSession *session, bool initiate )
+: SMPPopupUI(parent,name,fl)
 {
 	this->context = context;
 	this->session = session;

src/smppopup.h

@@ -36,7 +36,7 @@ class SMPPopup : public SMPPopupUI
   TQ_OBJECT
 
 public:
-  SMPPopup(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0, ConnContext *context = 0, Kopete::ChatSession *session = 0, bool initiate = true );
+  SMPPopup(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0, ConnContext *context = 0, Kopete::ChatSession *session = 0, bool initiate = true );
   ~SMPPopup();
   /*$PUBLIC_FUNCTIONS$*/
 

src/verifypopup.cpp

@@ -32,8 +32,8 @@
 #include "kopetechatsession.h"
 #include "kopetecontact.h"
 
-VerifyPopup::VerifyPopup(TQWidget* tqparent, const char* name, Kopete::ChatSession *session, bool modal, WFlags fl)
-: VerifyPopupUI(tqparent,name, modal,fl)
+VerifyPopup::VerifyPopup(TQWidget* parent, const char* name, Kopete::ChatSession *session, bool modal, WFlags fl)
+: VerifyPopupUI(parent,name, modal,fl)
 {
 	this->session = session;
 	alContact->setText(i18n("Verify fingerprint for %1.").tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));

src/verifypopup.h

@@ -30,7 +30,7 @@ class VerifyPopup : public VerifyPopupUI
   TQ_OBJECT
 
 public:
-  VerifyPopup(TQWidget* tqparent = 0, const char* name = 0, Kopete::ChatSession *session = NULL, bool modal = FALSE, WFlags fl = 0 );
+  VerifyPopup(TQWidget* parent = 0, const char* name = 0, Kopete::ChatSession *session = NULL, bool modal = FALSE, WFlags fl = 0 );
   ~VerifyPopup();
   /*$PUBLIC_FUNCTIONS$*/