diff options
Diffstat (limited to 'kopete/protocols/oscar/aim')
-rw-r--r-- | kopete/protocols/oscar/aim/aimaccount.cpp | 10 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimaccount.h | 2 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimcontact.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimjoinchat.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimjoinchat.h | 2 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimprotocol.cpp | 12 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimprotocol.h | 6 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimuserinfo.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/aimuserinfo.h | 2 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/ui/aimaddcontactpage.h | 2 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/ui/aimeditaccountui.ui | 8 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h | 2 |
14 files changed, 33 insertions, 33 deletions
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index cc890add..33a4b365 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -200,13 +200,13 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio } -AIMAccount::AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name) - : OscarAccount(tqparent, accountID, name, false) +AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name) + : OscarAccount(parent, accountID, name, false) { kdDebug(14152) << k_funcinfo << accountID << ": Called."<< endl; AIMMyselfContact* mc = new AIMMyselfContact( this ); setMyself( mc ); - myself()->setOnlineStatus( static_cast<AIMProtocol*>( tqparent )->statusOffline ); + myself()->setOnlineStatus( static_cast<AIMProtocol*>( parent )->statusOffline ); TQString profile = configGroup()->readEntry( "Profile", i18n( "Visit the Kopete website at <a href=\"http://kopete.kde.org\">http://kopete.kde.org</a>") ); mc->setOwnProfile( profile ); @@ -597,13 +597,13 @@ void AIMAccount::disconnected( DisconnectReason reason ) void AIMAccount::messageReceived( const Oscar::Message& message ) { kdDebug(14152) << k_funcinfo << " Got a message, calling OscarAccount::messageReceived" << endl; - // Want to call the tqparent to do everything else + // Want to call the parent to do everything else if ( message.type() != 0x0003 ) { OscarAccount::messageReceived(message); // Check to see if our status is away, and send an away message - // Might be duplicate code from the tqparent class to get some needed information + // Might be duplicate code from the parent class to get some needed information // Perhaps a refactoring is needed. kdDebug(14152) << k_funcinfo << "Checking to see if I'm online.." << endl; if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index fc3d57ff..fb18c69a 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -87,7 +87,7 @@ Q_OBJECT TQ_OBJECT public: - AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name=0L); + AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name=0L); virtual ~AIMAccount(); // Accessor method for the action menu diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index c71fed4d..ffa81067 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -43,9 +43,9 @@ #include "aimcontact.h" #include "aimaccount.h" -AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::MetaContact* tqparent, +AIMContact::AIMContact( Kopete::Account* 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<AIMProtocol *>(protocol()); setOnlineStatus( mProtocol->statusOffline ); diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp index 98a68361..2ccec9b2 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.cpp +++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp @@ -27,8 +27,8 @@ #include "aimaccount.h" AIMJoinChatUI::AIMJoinChatUI( AIMAccount* account, bool modal, - TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, modal, i18n( "Join AIM Chat Room" ), + TQWidget* parent, const char* name ) + : KDialogBase( parent, name, modal, i18n( "Join AIM Chat Room" ), Cancel | User1, User1, true, i18n( "Join" ) ) { diff --git a/kopete/protocols/oscar/aim/aimjoinchat.h b/kopete/protocols/oscar/aim/aimjoinchat.h index 13dab708..13838fd1 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.h +++ b/kopete/protocols/oscar/aim/aimjoinchat.h @@ -32,7 +32,7 @@ class AIMJoinChatUI : public KDialogBase Q_OBJECT TQ_OBJECT public: - AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* tqparent = 0, + AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* parent = 0, const char* name = 0 ); ~AIMJoinChatUI(); diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index b3d4205f..fe4dbf22 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -227,8 +227,8 @@ void AIMProtocolHandler::handleURL(const KURL &url) const -AIMProtocol::AIMProtocol(TQObject *tqparent, const char *name, const TQStringList &) - : Kopete::Protocol( AIMProtocolFactory::instance(), tqparent, name ), +AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList &) + : Kopete::Protocol( AIMProtocolFactory::instance(), parent, name ), statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString(), i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away, @@ -301,14 +301,14 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac return c; } -AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) +AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) { - return ( new AIMAddContactPage( account->isConnected(), tqparent ) ); + return ( new AIMAddContactPage( account->isConnected(), parent ) ); } -KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return ( new AIMEditAccountWidget( this, account, tqparent ) ); + return ( new AIMEditAccountWidget( this, account, parent ) ); } Kopete::Account *AIMProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/oscar/aim/aimprotocol.h b/kopete/protocols/oscar/aim/aimprotocol.h index e133ed97..a1e03983 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.h +++ b/kopete/protocols/oscar/aim/aimprotocol.h @@ -43,7 +43,7 @@ class AIMProtocol : public Kopete::Protocol TQ_OBJECT public: - AIMProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); + AIMProtocol( TQObject *parent, const char *name, const TQStringList &args ); virtual ~AIMProtocol(); /** * Return the active instance of the protocol @@ -57,8 +57,8 @@ public: 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 ); /** diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 767c519d..2ed71d94 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -37,8 +37,8 @@ #include <krun.h> AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *tqparent, const char* name ) - : KDialogBase( tqparent, name, modal, i18n( "User Information on %1" ) + TQWidget *parent, const char* name ) + : KDialogBase( parent, name, modal, i18n( "User Information on %1" ) .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), Cancel | Ok , Ok, true ) { diff --git a/kopete/protocols/oscar/aim/aimuserinfo.h b/kopete/protocols/oscar/aim/aimuserinfo.h index 43f27b94..da2c261c 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.h +++ b/kopete/protocols/oscar/aim/aimuserinfo.h @@ -33,7 +33,7 @@ class AIMUserInfoDialog : public KDialogBase TQ_OBJECT public: AIMUserInfoDialog(Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *tqparent, const char* name); + TQWidget *parent, const char* name); ~AIMUserInfoDialog(); private: diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp index 7a2d1b1d..f00741c9 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp @@ -25,9 +25,9 @@ #include <klocale.h> #include <kmessagebox.h> -AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *tqparent, +AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *parent, const char *name ) - : AddContactPage(tqparent,name) + : AddContactPage(parent,name) { m_gui = 0; (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h index e186ac61..c3cb1092 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h @@ -20,7 +20,7 @@ Q_OBJECT TQ_OBJECT public: - AIMAddContactPage(bool connected, TQWidget *tqparent=0, + AIMAddContactPage(bool connected, TQWidget *parent=0, const char *name=0); ~AIMAddContactPage(); diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 5221130e..deaa2ff2 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -262,10 +262,10 @@ <cstring>edtServerAddress</cstring> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to.</string> + <string>The IP address or hostmask of the AIM server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> + <string>The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> </property> </widget> <widget class="TQLineEdit"> @@ -279,10 +279,10 @@ <string>login.oscar.aol.com</string> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to.</string> + <string>The IP address or hostmask of the AIM server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> + <string>The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> </property> </widget> <widget class="TQLabel"> diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 85e78ace..2e0100ab 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -20,8 +20,8 @@ #include "aimaccount.h" AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *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(14152) << k_funcinfo << "Called." << endl; diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h index b3c4ad3a..dbf82adb 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h @@ -41,7 +41,7 @@ Q_OBJECT public: AIMEditAccountWidget(AIMProtocol *protocol, Kopete::Account *account, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); virtual ~AIMEditAccountWidget(); virtual bool validateData(); |