From 2bc1d72869b62af05ae4feafd878203b526da8c5 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/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/msn/config/msnpreferences.cpp | 2 +- kopete/protocols/msn/dispatcher.cpp | 10 +++++----- kopete/protocols/msn/dispatcher.h | 2 +- kopete/protocols/msn/messageformatter.cpp | 2 +- kopete/protocols/msn/messageformatter.h | 2 +- kopete/protocols/msn/msnaccount.cpp | 4 ++-- kopete/protocols/msn/msnaccount.h | 2 +- kopete/protocols/msn/msnaddcontactpage.cpp | 4 ++-- kopete/protocols/msn/msnaddcontactpage.h | 2 +- kopete/protocols/msn/msnchatsession.cpp | 2 +- kopete/protocols/msn/msncontact.cpp | 6 +++--- kopete/protocols/msn/msncontact.h | 2 +- kopete/protocols/msn/msndebugrawcmddlg.cpp | 4 ++-- kopete/protocols/msn/msndebugrawcmddlg.h | 2 +- kopete/protocols/msn/msnfiletransfersocket.cpp | 4 ++-- kopete/protocols/msn/msnfiletransfersocket.h | 2 +- kopete/protocols/msn/msnprotocol.cpp | 12 ++++++------ kopete/protocols/msn/msnprotocol.h | 6 +++--- kopete/protocols/msn/msnsocket.cpp | 2 +- kopete/protocols/msn/msnsocket.h | 2 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 8 ++++---- kopete/protocols/msn/msnswitchboardsocket.h | 2 +- kopete/protocols/msn/transport.cpp | 20 ++++++++++---------- kopete/protocols/msn/transport.h | 10 +++++----- kopete/protocols/msn/ui/msneditaccountwidget.cpp | 4 ++-- kopete/protocols/msn/ui/msneditaccountwidget.h | 2 +- kopete/protocols/msn/webcam.cpp | 4 ++-- kopete/protocols/msn/webcam.h | 2 +- kopete/protocols/msn/webcam/msnwebcamdialog.cpp | 4 ++-- kopete/protocols/msn/webcam/msnwebcamdialog.h | 2 +- 30 files changed, 66 insertions(+), 66 deletions(-) (limited to 'kopete/protocols/msn') diff --git a/kopete/protocols/msn/config/msnpreferences.cpp b/kopete/protocols/msn/config/msnpreferences.cpp index 6366e849..a6f5371f 100644 --- a/kopete/protocols/msn/config/msnpreferences.cpp +++ b/kopete/protocols/msn/config/msnpreferences.cpp @@ -26,7 +26,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_msn, MSNProtocolConfigFactory( "kcm_kopet class MSNPreferences : public KCAutoConfigModule { public: - MSNPreferences( TQWidget *tqparent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), tqparent, args ) + MSNPreferences( TQWidget *parent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), parent, args ) { setMainWidget( new msnPrefsUI( this ) , "MSN"); } diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index acf9c8db..34aa7425 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -50,8 +50,8 @@ using P2P::OutgoingTransfer; #include -Dispatcher::Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip) - : TQObject(tqparent) , m_contact(contact) , m_callbackChannel(0l) , m_ip(ip) +Dispatcher::Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip) + : TQObject(parent) , m_contact(contact) , m_callbackChannel(0l) , m_ip(ip) {} Dispatcher::~Dispatcher() @@ -607,10 +607,10 @@ void Dispatcher::messageAcknowledged(unsigned int correlationId, bool fullReceiv Kopete::Contact* Dispatcher::getContactByAccountId(const TQString& accountId) { Kopete::Contact *contact = 0l; - if(tqparent()) + if(parent()) { // Retrieve the contact from the current chat session context. - Kopete::ChatSession *session = dynamic_cast(tqparent()->tqparent()); + Kopete::ChatSession *session = dynamic_cast(parent()->parent()); if(session) { contact = session->account()->contacts()[accountId]; @@ -636,7 +636,7 @@ TQ_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream) Dispatcher::CallbackChannel* Dispatcher::callbackChannel() { if(m_callbackChannel == 0l){ - MSNSwitchBoardSocket *callback = dynamic_cast(tqparent()); + MSNSwitchBoardSocket *callback = dynamic_cast(parent()); if(callback == 0l) return 0l; m_callbackChannel = new Dispatcher::CallbackChannel(callback); } diff --git a/kopete/protocols/msn/dispatcher.h b/kopete/protocols/msn/dispatcher.h index 690a7992..f7933ffc 100644 --- a/kopete/protocols/msn/dispatcher.h +++ b/kopete/protocols/msn/dispatcher.h @@ -42,7 +42,7 @@ namespace P2P{ { Q_OBJECT TQ_OBJECT public: - Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip); + Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip); ~Dispatcher(); void detach(TransferContext* transfer); diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp index f869d87e..40bd8877 100644 --- a/kopete/protocols/msn/messageformatter.cpp +++ b/kopete/protocols/msn/messageformatter.cpp @@ -26,7 +26,7 @@ using P2P::MessageFormatter; using P2P::Message; -MessageFormatter::MessageFormatter(TQObject *tqparent, const char *name) : TQObject(tqparent, name) +MessageFormatter::MessageFormatter(TQObject *parent, const char *name) : TQObject(parent, name) {} MessageFormatter::~MessageFormatter() diff --git a/kopete/protocols/msn/messageformatter.h b/kopete/protocols/msn/messageformatter.h index c5e7e77a..7fd050d7 100644 --- a/kopete/protocols/msn/messageformatter.h +++ b/kopete/protocols/msn/messageformatter.h @@ -30,7 +30,7 @@ namespace P2P{ { Q_OBJECT TQ_OBJECT public: - MessageFormatter(TQObject *tqparent = 0, const char *name = 0); + MessageFormatter(TQObject *parent = 0, const char *name = 0); ~MessageFormatter(); Message readMessage(const TQByteArray& stream, bool compact=false); diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index f99117bc..fbf43221 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -61,8 +61,8 @@ #include "avdevice/videodevicepool.h" #endif -MSNAccount::MSNAccount( MSNProtocol *tqparent, const TQString& AccountID, const char *name ) - : Kopete::PasswordedAccount ( tqparent, AccountID.lower(), 0, name ) +MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const char *name ) + : Kopete::PasswordedAccount ( parent, AccountID.lower(), 0, name ) { m_notifySocket = 0L; m_connectstatus = MSNProtocol::protocol()->NLN; diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h index f7c9b4e3..31ae451d 100644 --- a/kopete/protocols/msn/msnaccount.h +++ b/kopete/protocols/msn/msnaccount.h @@ -43,7 +43,7 @@ class MSNAccount : public Kopete::PasswordedAccount TQ_OBJECT public: - MSNAccount( MSNProtocol *tqparent, const TQString &accountID, const char *name = 0L ); + MSNAccount( MSNProtocol *parent, const TQString &accountID, const char *name = 0L ); /* * return the menu for this account diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp index 2442d627..8bdf77a1 100644 --- a/kopete/protocols/msn/msnaddcontactpage.cpp +++ b/kopete/protocols/msn/msnaddcontactpage.cpp @@ -25,8 +25,8 @@ #include "kopeteaccount.h" #include "kopeteuiglobal.h" -MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *tqparent, const char *name ) - : AddContactPage(tqparent,name) +MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *parent, const char *name ) + : AddContactPage(parent,name) { (new TQVBoxLayout(this))->setAutoAdd(true); /* if ( connected ) diff --git a/kopete/protocols/msn/msnaddcontactpage.h b/kopete/protocols/msn/msnaddcontactpage.h index 5d1fa2f0..8e1f7694 100644 --- a/kopete/protocols/msn/msnaddcontactpage.h +++ b/kopete/protocols/msn/msnaddcontactpage.h @@ -17,7 +17,7 @@ class MSNAddContactPage : public AddContactPage Q_OBJECT TQ_OBJECT public: - MSNAddContactPage(bool connected, TQWidget *tqparent=0, const char *name=0); + MSNAddContactPage(bool connected, TQWidget *parent=0, const char *name=0); ~MSNAddContactPage(); msnAddUI *msndata; TQLabel *noaddMsg1; diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 74c2bd63..2b7fe8bb 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -128,7 +128,7 @@ MSNChatSession::~MSNChatSession() { delete m_image; //force to disconnect the switchboard - //not needed since the m_chatService has us as tqparent + //not needed since the m_chatService has us as parent // if(m_chatService) // delete m_chatService; diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index cb4bfaa6..304029bf 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -50,8 +50,8 @@ #include "msnnotifysocket.h" #include "msnaccount.h" -MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent ) -: Kopete::Contact( account, id, tqparent ) +MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent ) +: Kopete::Contact( account, id, parent ) { m_deleted = false; m_allowed = false; @@ -75,7 +75,7 @@ MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::Me // wizard, and it can be because we are creating a temporary contact. // if it's added by the wizard, the status will be set immediately after. // if it's a temporary contact, better to set the unknown status. - setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN ); + setOnlineStatus( ( parent && parent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN ); actionBlock = 0L; diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h index 7ab36fc0..97039fed 100644 --- a/kopete/protocols/msn/msncontact.h +++ b/kopete/protocols/msn/msncontact.h @@ -47,7 +47,7 @@ class MSNContact : public Kopete::Contact TQ_OBJECT public: - MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent ); + MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent ); ~MSNContact(); /** diff --git a/kopete/protocols/msn/msndebugrawcmddlg.cpp b/kopete/protocols/msn/msndebugrawcmddlg.cpp index a6790062..48c4050e 100644 --- a/kopete/protocols/msn/msndebugrawcmddlg.cpp +++ b/kopete/protocols/msn/msndebugrawcmddlg.cpp @@ -27,8 +27,8 @@ #include -MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *tqparent ) -: KDialogBase( tqparent, 0L, true, +MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *parent ) +: KDialogBase( parent, 0L, true, i18n( "DEBUG: Send Raw Command - MSN Plugin" ), Ok | Cancel, Ok, true ) { diff --git a/kopete/protocols/msn/msndebugrawcmddlg.h b/kopete/protocols/msn/msndebugrawcmddlg.h index ee69f6c6..7ff50df7 100644 --- a/kopete/protocols/msn/msndebugrawcmddlg.h +++ b/kopete/protocols/msn/msndebugrawcmddlg.h @@ -35,7 +35,7 @@ class MSNDebugRawCmdDlg : public KDialogBase TQ_OBJECT public: - MSNDebugRawCmdDlg( TQWidget *tqparent ); + MSNDebugRawCmdDlg( TQWidget *parent ); ~MSNDebugRawCmdDlg(); TQString command(); diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index 31d16aeb..72b5f1f8 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -40,8 +40,8 @@ using namespace KNetwork; -MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* tqparent) - : MSNSocket(tqparent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) +MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* parent) + : MSNSocket(parent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) { m_handle=handle; m_kopeteTransfer=0l; diff --git a/kopete/protocols/msn/msnfiletransfersocket.h b/kopete/protocols/msn/msnfiletransfersocket.h index a5a21f49..6dda5aa0 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.h +++ b/kopete/protocols/msn/msnfiletransfersocket.h @@ -43,7 +43,7 @@ class MSNFileTransferSocket : public MSNSocket , public MSNInvitation TQ_OBJECT public: - MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* tqparent = 0L ); + MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* parent = 0L ); ~MSNFileTransferSocket(); static TQString applicationID() { return "5D3E02AB-6190-11d3-BBBB-00C04F795683"; } diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 4337e9b2..26869ea7 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -47,8 +47,8 @@ K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_ms MSNProtocol *MSNProtocol::s_protocol = 0L; -MSNProtocol::MSNProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( MSNProtocolFactory::instance(), tqparent, name ), +MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( MSNProtocolFactory::instance(), parent, name ), NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString(), i18n( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ), BSY( Kopete::OnlineStatus::Away, 20, this, 2, "msn_busy", i18n( "Busy" ) , i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), BRB( Kopete::OnlineStatus::Away, 22, this, 3, "msn_brb", i18n( "Be Right Back" ), i18n( "Be &Right Back" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), @@ -111,14 +111,14 @@ Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaConta return c; } -AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *tqparent , Kopete::Account *i) +AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *parent , Kopete::Account *i) { - return (new MSNAddContactPage(i->isConnected(),tqparent)); + return (new MSNAddContactPage(i->isConnected(),parent)); } -KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return new MSNEditAccountWidget(this,account,tqparent); + return new MSNEditAccountWidget(this,account,parent); } Kopete::Account *MSNProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/msn/msnprotocol.h b/kopete/protocols/msn/msnprotocol.h index 405baa95..4da1e6ad 100644 --- a/kopete/protocols/msn/msnprotocol.h +++ b/kopete/protocols/msn/msnprotocol.h @@ -59,7 +59,7 @@ class KOPETE_EXPORT MSNProtocol : public Kopete::Protocol TQ_OBJECT public: - MSNProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); + MSNProtocol( TQObject *parent, const char *name, const TQStringList &args ); /** * SyncMode indicates whether settings differing between client and @@ -153,8 +153,8 @@ public: virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, const TQMap &serializedData, const TQMap &addressBookData ); - virtual AddContactPage *createAddContactWidget( TQWidget *tqparent , Kopete::Account *i); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); + virtual AddContactPage *createAddContactWidget( TQWidget *parent , Kopete::Account *i); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); virtual Kopete::Account *createNewAccount(const TQString &accountId); static MSNProtocol* protocol(); diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 6dc8fa94..f238a507 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -54,7 +54,7 @@ class MimeMessage TQString message; }; -MSNSocket::MSNSocket(TQObject* tqparent) : TQObject (tqparent) +MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent) { m_onlinetqStatus = Disconnected; m_socket = 0L; diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h index c6dff087..e4238a59 100644 --- a/kopete/protocols/msn/msnsocket.h +++ b/kopete/protocols/msn/msnsocket.h @@ -50,7 +50,7 @@ class KOPETE_EXPORT MSNSocket : public TQObject TQ_OBJECT public: - MSNSocket(TQObject* tqparent=0l); + MSNSocket(TQObject* parent=0l); ~MSNSocket(); /** diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index f5cc890a..319df782 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -63,8 +63,8 @@ #include "dispatcher.h" using P2P::Dispatcher; -MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *tqparent ) -: MSNSocket( tqparent ) +MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *parent ) +: MSNSocket( parent ) { m_account = account; m_recvIcons=0; @@ -767,7 +767,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) int nb=(int)ceil((float)(len_M)/(float)(futurmessages_size)); - if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a tqparent somewere*/ , + if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a parent somewere*/ , i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(nb) , i18n("Message too big - MSN Plugin" ), KStdGuiItem::cont() , "SendLongMessages" ) == KMessageBox::Continue ) @@ -1104,7 +1104,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( ) { /* This is a workaround against the bug 113425 - The problem: the P2P::Webcam class is tqparent of us, and when we get deleted, it get deleted. + The problem: the P2P::Webcam class is parent of us, and when we get deleted, it get deleted. the correct solution would be to change that. The second problem: after one minute of inactivity, the official client close the chat socket. the workaround: we simulate the activity by sending small packet each 50 seconds diff --git a/kopete/protocols/msn/msnswitchboardsocket.h b/kopete/protocols/msn/msnswitchboardsocket.h index df76eab0..f607a0a6 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.h +++ b/kopete/protocols/msn/msnswitchboardsocket.h @@ -49,7 +49,7 @@ public: /** * Contructor: id is the KopeteMessageMangager's id */ - MSNSwitchBoardSocket( MSNAccount * account , TQObject *tqparent); + MSNSwitchBoardSocket( MSNAccount * account , TQObject *parent); ~MSNSwitchBoardSocket(); private: diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index 593cfc74..da0b856e 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -34,8 +34,8 @@ using namespace KNetwork; namespace PeerToPeer { -Transport::Transport(TQObject* tqparent, const char* name) - : TQObject(tqparent, name) +Transport::Transport(TQObject* parent, const char* name) + : TQObject(parent, name) { mFormatter = new PeerToPeer::MessageFormatter(this); } @@ -103,15 +103,15 @@ void Transport::slotOnReceive(const TQString& contact, const TQByteArray& bytes) -TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TQObject(tqparent, name) +TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name) +: TQObject(parent, name) { mAddress = to; mFormatter = formatter; } -TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TQObject(tqparent, name) +TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name) +: TQObject(parent, name) { mSocket = socket; mAddress = mSocket->peerAddress(); @@ -166,8 +166,8 @@ void TransportBridge::slotOnSocketReceive() -TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TransportBridge(to, formatter, tqparent, name) +TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name) +: TransportBridge(to, formatter, parent, name) { mSocket = new KStreamSocket(mAddress.ipAddress().toString(), TQString::number(mAddress.port()), this); mSocket->setBlocking(false); @@ -176,8 +176,8 @@ TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, M mConnected = false; } -TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TransportBridge(socket, formatter, tqparent, name) +TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name) +: TransportBridge(socket, formatter, parent, name) { mConnected = (mSocket->state() == KStreamSocket::Open) ? true : false; mSocket->setBlocking(false); diff --git a/kopete/protocols/msn/transport.h b/kopete/protocols/msn/transport.h index a606714b..9a7152fb 100644 --- a/kopete/protocols/msn/transport.h +++ b/kopete/protocols/msn/transport.h @@ -53,7 +53,7 @@ class Transport : public TQObject TQ_OBJECT public: /** @brief Creates a new instance of the class Transport. */ - Transport(TQObject* tqparent, const char* name = 0l); + Transport(TQObject* parent, const char* name = 0l); ~Transport(); /** @brief Get a transport bridge with the specified address, port, type and identifier. */ TransportBridge* getBridge(const TQString& address, TQ_UINT16 port, TransportBridgeType type, const TQString& identifier); @@ -87,9 +87,9 @@ public: protected: /** @brief Creates a new instance of the class TransportBridge with the specified address and formatter. */ - TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); + TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); /** @brief Creates a new instance of the class TransportBridge with the specified socket and formatter. */ - TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); + TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); public: /** @brief Creates a connection between two peers. */ @@ -131,8 +131,8 @@ public: virtual ~TcpTransportBridge(); private: - TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); - TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); + TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); + TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); protected slots: virtual void slotOnConnect(); diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index aa16e07e..4bb246a2 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -65,8 +65,8 @@ public: TQImage pictureData; }; -MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent, const char * /* name */ ) -: TQWidget( tqparent ), KopeteEditAccountWidget( account ) +MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent, const char * /* name */ ) +: TQWidget( parent ), KopeteEditAccountWidget( account ) { d = new MSNEditAccountWidgetPrivate; diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.h b/kopete/protocols/msn/ui/msneditaccountwidget.h index 1d97b4f9..d52c52c9 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.h +++ b/kopete/protocols/msn/ui/msneditaccountwidget.h @@ -38,7 +38,7 @@ class MSNEditAccountWidget : public TQWidget, public KopeteEditAccountWidget TQ_OBJECT public: - MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0 ); + MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent = 0, const char *name = 0 ); ~MSNEditAccountWidget(); virtual bool validateData(); virtual Kopete::Account * apply(); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 584ae803..e2024a94 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -42,8 +42,8 @@ using namespace KNetwork; namespace P2P { -Webcam::Webcam(Who who, const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionId) - : TransferContext(to,tqparent,sessionId) , m_who(who) , m_timerId(0) +Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessionId) + : TransferContext(to,parent,sessionId) , m_who(who) , m_timerId(0) { setType(P2P::WebcamType); m_direction = Incoming; diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h index 59858d94..75e742d3 100644 --- a/kopete/protocols/msn/webcam.h +++ b/kopete/protocols/msn/webcam.h @@ -34,7 +34,7 @@ class Webcam : public TransferContext public: enum Who { wProducer , wViewer }; - Webcam( Who who , const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionID); + Webcam( Who who , const TQString& to, Dispatcher *parent, TQ_UINT32 sessionID); ~Webcam( ); virtual void processMessage(const Message& message); diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index e07aaebc..31e5dbfc 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -27,9 +27,9 @@ -MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * tqparent, const char * name ) +MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, const char * name ) : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ), - KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ ), + KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ), m_imageContainer( this ) { setInitialSize( TQSize(320,290), true ); diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.h b/kopete/protocols/msn/webcam/msnwebcamdialog.h index 292eb410..0bd415fe 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.h +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.h @@ -37,7 +37,7 @@ class KOPETE_EXPORT MSNWebcamDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - MSNWebcamDialog( const TQString& contact, TQWidget* tqparent = 0, const char* name = 0 ); + MSNWebcamDialog( const TQString& contact, TQWidget* parent = 0, const char* name = 0 ); ~MSNWebcamDialog(); public slots: -- cgit v1.2.1