summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/icq
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit2bc1d72869b62af05ae4feafd878203b526da8c5 (patch)
tree2676903bb600bd9646644856e354940471ad84e2 /kopete/protocols/oscar/icq
parent937b2991d8e78166eea904c80ad04d34607017a4 (diff)
downloadtdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz
tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip
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
Diffstat (limited to 'kopete/protocols/oscar/icq')
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.h2
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.h2
-rw-r--r--kopete/protocols/oscar/icq/icqprotocol.cpp12
-rw-r--r--kopete/protocols/oscar/icq/icqprotocol.h6
-rw-r--r--kopete/protocols/oscar/icq/icqreadaway.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqreadaway.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icqaddcontactpage.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icqauthreplydialog.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountui.ui8
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp8
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchdialog.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icquserinfowidget.h2
19 files changed, 39 insertions, 39 deletions
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index b65f7e4e..ca53a294 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -74,8 +74,8 @@ void ICQMyselfContact::fetchShortInfo()
static_cast<ICQAccount*>( account() )->engine()->requestShortInfo( contactId() );
}
-ICQAccount::ICQAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name)
- : OscarAccount(tqparent, accountID, name, true)
+ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char *name)
+ : OscarAccount(parent, accountID, name, true)
{
kdDebug(14152) << k_funcinfo << accountID << ": Called."<< endl;
setMyself( new ICQMyselfContact( this ) );
diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h
index e6a86819..a5335dbc 100644
--- a/kopete/protocols/oscar/icq/icqaccount.h
+++ b/kopete/protocols/oscar/icq/icqaccount.h
@@ -51,7 +51,7 @@ Q_OBJECT
TQ_OBJECT
public:
- ICQAccount( Kopete::Protocol *tqparent, TQString accountID, const char *name = 0L );
+ ICQAccount( Kopete::Protocol *parent, TQString accountID, const char *name = 0L );
virtual ~ICQAccount();
ICQProtocol *protocol();
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 59979073..d5163db7 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -51,9 +51,9 @@
#include "oscarencodingselectiondialog.h"
#include "ssimanager.h"
-ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *tqparent,
+ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *parent,
const TQString& icon, const Oscar::SSI& ssiItem )
-: OscarContact( account, name, tqparent, icon, ssiItem )
+: OscarContact( account, name, parent, icon, ssiItem )
{
mProtocol = static_cast<ICQProtocol *>(protocol());
m_infoWidget = 0L;
diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h
index 59a87d4d..4c1d11e2 100644
--- a/kopete/protocols/oscar/icq/icqcontact.h
+++ b/kopete/protocols/oscar/icq/icqcontact.h
@@ -52,7 +52,7 @@ Q_OBJECT
public:
/** Normal ICQ constructor */
- ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *tqparent,
+ ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *parent,
const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() );
virtual ~ICQContact();
diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp
index a6888cee..dad58726 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.cpp
+++ b/kopete/protocols/oscar/icq/icqprotocol.cpp
@@ -173,8 +173,8 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c
ICQProtocol* ICQProtocol::protocolStatic_ = 0L;
-ICQProtocol::ICQProtocol(TQObject *tqparent, const char *name, const TQStringList&)
-: Kopete::Protocol( ICQProtocolFactory::instance(), tqparent, name ),
+ICQProtocol::ICQProtocol(TQObject *parent, const char *name, const TQStringList&)
+: Kopete::Protocol( ICQProtocolFactory::instance(), parent, name ),
firstName(Kopete::Global::Properties::self()->firstName()),
lastName(Kopete::Global::Properties::self()->lastName()),
awayMessage(Kopete::Global::Properties::self()->awayMessage()),
@@ -793,14 +793,14 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta
return c;
}
-AddContactPage *ICQProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account)
+AddContactPage *ICQProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account)
{
- return new ICQAddContactPage( static_cast<ICQAccount*>( account ), tqparent);
+ return new ICQAddContactPage( static_cast<ICQAccount*>( account ), parent);
}
-KopeteEditAccountWidget *ICQProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent)
+KopeteEditAccountWidget *ICQProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent)
{
- return new ICQEditAccountWidget(this, account, tqparent);
+ return new ICQEditAccountWidget(this, account, parent);
}
Kopete::Account *ICQProtocol::createNewAccount(const TQString &accountId)
diff --git a/kopete/protocols/oscar/icq/icqprotocol.h b/kopete/protocols/oscar/icq/icqprotocol.h
index b614dd32..7af69b84 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.h
+++ b/kopete/protocols/oscar/icq/icqprotocol.h
@@ -41,7 +41,7 @@ Q_OBJECT
TQ_OBJECT
public:
- ICQProtocol(TQObject *tqparent, const char *name, const TQStringList &args);
+ ICQProtocol(TQObject *parent, const char *name, const TQStringList &args);
virtual ~ICQProtocol();
/**
@@ -54,8 +54,8 @@ public:
virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact,
const TQMap<TQString, TQString> &serializedData,
const TQMap<TQString, TQString> &addressBookData );
- AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *account);
- KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent);
+ AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account);
+ KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent);
Kopete::Account *createNewAccount(const TQString &accountId);
ICQ::OnlineStatusManager *statusManager();
diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp
index 7856df8a..94eaa063 100644
--- a/kopete/protocols/oscar/icq/icqreadaway.cpp
+++ b/kopete/protocols/oscar/icq/icqreadaway.cpp
@@ -29,8 +29,8 @@
#include <assert.h>
-ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *tqparent, const char* name)
- : KDialogBase(tqparent, name, false, TQString(), Close | User1,
+ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name)
+ : KDialogBase(parent, name, false, TQString(), Close | User1,
Close, false, i18n("&Fetch Again"))
{
assert(c);
diff --git a/kopete/protocols/oscar/icq/icqreadaway.h b/kopete/protocols/oscar/icq/icqreadaway.h
index d489a202..a9a03c72 100644
--- a/kopete/protocols/oscar/icq/icqreadaway.h
+++ b/kopete/protocols/oscar/icq/icqreadaway.h
@@ -31,7 +31,7 @@ class ICQReadAway : public KDialogBase
TQ_OBJECT
public:
- ICQReadAway(ICQContact *, TQWidget *tqparent = 0, const char* name = "ICQReadAway");
+ ICQReadAway(ICQContact *, TQWidget *parent = 0, const char* name = "ICQReadAway");
private slots:
void slotFetchAwayMessage();
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index 84ce12e7..935b9853 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -39,8 +39,8 @@
#include "icqsearchdialog.h"
-ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent, const char *name)
- : AddContactPage(tqparent,name)
+ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *parent, const char *name)
+ : AddContactPage(parent,name)
{
kdDebug(14153) << k_funcinfo << "called" << endl;
mAccount = owner;
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
index aebd4afa..1a901a0e 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -35,7 +35,7 @@ Q_OBJECT
TQ_OBJECT
public:
- ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent = 0, const char *name = 0);
+ ICQAddContactPage(ICQAccount *owner, TQWidget *parent = 0, const char *name = 0);
~ICQAddContactPage();
virtual bool validateData();
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
index a2803f71..59b6ce82 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
@@ -24,8 +24,8 @@
#include <tqradiobutton.h>
#include <tqlineedit.h>
-ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *tqparent, const char *name, bool wasRequested )
- : KDialogBase( tqparent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel )
+ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *parent, const char *name, bool wasRequested )
+ : KDialogBase( parent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel )
{
m_ui = new ICQAuthReplyUI( this );
setMainWidget( m_ui );
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
index 9b801859..de11a442 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
@@ -31,7 +31,7 @@ class ICQAuthReplyDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ICQAuthReplyDialog(TQWidget *tqparent = 0, const char *name = 0, bool wasRequested = true);
+ ICQAuthReplyDialog(TQWidget *parent = 0, const char *name = 0, bool wasRequested = true);
~ICQAuthReplyDialog();
void setUser( const TQString& user );
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
index 8c8776e0..1bc5d379 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
@@ -248,10 +248,10 @@ If you do not currently have an ICQ account, please click the button to create o
<string>login.icq.com</string>
</property>
<property name="toolTip" stdset="0">
- <string>The IP address or hosttqmask of the ICQ server you wish to connect to.</string>
+ <string>The IP address or hostmask of the ICQ server you wish to connect to.</string>
</property>
<property name="whatsThis" stdset="0">
- <string>The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string>
+ <string>The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string>
</property>
</widget>
<widget class="TQLabel" row="1" column="1">
@@ -288,10 +288,10 @@ If you do not currently have an ICQ account, please click the button to create o
<cstring>edtServerAddress</cstring>
</property>
<property name="toolTip" stdset="0">
- <string>The IP address or hosttqmask of the ICQ server you wish to connect to.</string>
+ <string>The IP address or hostmask of the ICQ server you wish to connect to.</string>
</property>
<property name="whatsThis" stdset="0">
- <string>The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string>
+ <string>The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string>
</property>
</widget>
<widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4">
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
index 3feb48bf..04a312a4 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
@@ -44,8 +44,8 @@
#include "icqcontact.h"
ICQEditAccountWidget::ICQEditAccountWidget(ICQProtocol *protocol,
- Kopete::Account *account, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name), KopeteEditAccountWidget(account)
+ Kopete::Account *account, TQWidget *parent, const char *name)
+ : TQWidget(parent, name), KopeteEditAccountWidget(account)
{
kdDebug(14153) << k_funcinfo << "Called." << endl;
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
index 2ef9e703..788cee4b 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
@@ -35,7 +35,7 @@ Q_OBJECT
public:
ICQEditAccountWidget(ICQProtocol *, Kopete::Account *,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
virtual bool validateData();
virtual Kopete::Account *apply();
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
index aabf046d..f8b16198 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
@@ -41,8 +41,8 @@
#include "icqcontact.h"
#include "icquserinfowidget.h"
-ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* tqparent, const char* name )
-: KDialogBase( tqparent, name, true, i18n( "ICQ User Search" ), 0, NoDefault )
+ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* parent, const char* name )
+: KDialogBase( parent, name, true, i18n( "ICQ User Search" ), 0, NoDefault )
{
m_account = account;
m_searchUI = new ICQSearchBase( this, name );
@@ -171,10 +171,10 @@ void ICQSearchDialog::stopSearch()
void ICQSearchDialog::addContact()
{
- ICQAddContactPage* iacp = dynamic_cast<ICQAddContactPage*>( tqparent() );
+ ICQAddContactPage* iacp = dynamic_cast<ICQAddContactPage*>( parent() );
if ( !iacp )
{
- kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our tqparent!!" << endl;
+ kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our parent!!" << endl;
}
else
{
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
index f9bfa81e..e437ce63 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
@@ -34,7 +34,7 @@ class ICQSearchDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ICQSearchDialog( ICQAccount* account, TQWidget* tqparent = 0, const char* name = 0 );
+ ICQSearchDialog( ICQAccount* account, TQWidget* parent = 0, const char* name = 0 );
~ICQSearchDialog();
private slots:
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
index 5c1d4500..1eb1c934 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
@@ -40,8 +40,8 @@
#include "icqinterestinfowidget.h"
-ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * tqparent, const char * name )
-: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "ICQ User Information" ), Ok )
+ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name )
+: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "ICQ User Information" ), Ok )
{
kdDebug(14153) << k_funcinfo << "Creating new icq user info widget" << endl;
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
index 16d1d5d9..e8c5c54f 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
@@ -34,7 +34,7 @@ class ICQUserInfoWidget : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ICQUserInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
+ ICQUserInfoWidget( TQWidget* parent = 0, const char* name = 0 );
void setContact( ICQContact* contact );
public slots: