From cc685f712832a40b1fdb15ea338a82462f96a7f7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 | 8 ++++---- src/otrguiclient.h | 2 +- src/otrplugin.cpp | 4 ++-- src/otrplugin.h | 2 +- src/otrpreferences.cpp | 4 ++-- src/otrpreferences.h | 2 +- src/privkeypopup.cpp | 4 ++-- src/privkeypopup.h | 2 +- src/smppopup.cpp | 4 ++-- src/smppopup.h | 2 +- src/verifypopup.cpp | 4 ++-- src/verifypopup.h | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/otrguiclient.cpp b/src/otrguiclient.cpp index 00d36e3..0460551 100644 --- a/src/otrguiclient.cpp +++ b/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) ); } diff --git a/src/otrguiclient.h b/src/otrguiclient.h index cbca74b..588d862 100644 --- a/src/otrguiclient.h +++ b/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(); diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index b929b4c..fc846fd 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -62,8 +62,8 @@ typedef KGenericFactory 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; diff --git a/src/otrplugin.h b/src/otrplugin.h index ba9d97e..5e260b6 100644 --- a/src/otrplugin.h +++ b/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 ); diff --git a/src/otrpreferences.cpp b/src/otrpreferences.cpp index c904475..65dca42 100644 --- a/src/otrpreferences.cpp +++ b/src/otrpreferences.cpp @@ -57,8 +57,8 @@ typedef KGenericFactory 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); diff --git a/src/otrpreferences.h b/src/otrpreferences.h index 6848e89..00f8946 100644 --- a/src/otrpreferences.h +++ b/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: diff --git a/src/privkeypopup.cpp b/src/privkeypopup.cpp index 931e3cb..3d3b8e4 100644 --- a/src/privkeypopup.cpp +++ b/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) { } diff --git a/src/privkeypopup.h b/src/privkeypopup.h index fb0ab1e..e1ea0df 100644 --- a/src/privkeypopup.h +++ b/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$*/ diff --git a/src/smppopup.cpp b/src/smppopup.cpp index 8ee8623..36f650b 100644 --- a/src/smppopup.cpp +++ b/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; diff --git a/src/smppopup.h b/src/smppopup.h index 44c69a0..9e48a48 100644 --- a/src/smppopup.h +++ b/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$*/ diff --git a/src/verifypopup.cpp b/src/verifypopup.cpp index 560ad7e..2fc7bc8 100644 --- a/src/verifypopup.cpp +++ b/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()))); diff --git a/src/verifypopup.h b/src/verifypopup.h index 2e72221..cdb314c 100644 --- a/src/verifypopup.h +++ b/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$*/ -- cgit v1.2.1