From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/oscar/icq/ui/icqadd.ui | 22 ++--- .../protocols/oscar/icq/ui/icqaddcontactpage.cpp | 12 +-- kopete/protocols/oscar/icq/ui/icqaddcontactpage.h | 7 +- .../protocols/oscar/icq/ui/icqauthreplydialog.cpp | 10 +- kopete/protocols/oscar/icq/ui/icqauthreplydialog.h | 3 +- kopete/protocols/oscar/icq/ui/icqauthreplyui.ui | 36 ++++---- kopete/protocols/oscar/icq/ui/icqeditaccountui.ui | 74 +++++++-------- .../oscar/icq/ui/icqeditaccountwidget.cpp | 6 +- .../protocols/oscar/icq/ui/icqeditaccountwidget.h | 5 +- kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui | 102 ++++++++++----------- .../oscar/icq/ui/icqinterestinfowidget.ui | 24 ++--- .../protocols/oscar/icq/ui/icqotherinfowidget.ui | 14 +-- kopete/protocols/oscar/icq/ui/icqsearchbase.ui | 56 +++++------ kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp | 22 ++--- kopete/protocols/oscar/icq/ui/icqsearchdialog.h | 5 +- .../protocols/oscar/icq/ui/icquserinfowidget.cpp | 14 +-- kopete/protocols/oscar/icq/ui/icquserinfowidget.h | 5 +- kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui | 54 +++++------ 18 files changed, 238 insertions(+), 233 deletions(-) (limited to 'kopete/protocols/oscar/icq/ui') diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui index ef793fbb..c42adfe2 100644 --- a/kopete/protocols/oscar/icq/ui/icqadd.ui +++ b/kopete/protocols/oscar/icq/ui/icqadd.ui @@ -1,6 +1,6 @@ icqAddUI - + icqAddUI @@ -22,15 +22,15 @@ 6 - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -38,22 +38,22 @@ UIN #: - + uinEdit - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -71,7 +71,7 @@ Expanding - + 47 26 @@ -101,7 +101,7 @@ Expanding - + 20 20 @@ -115,7 +115,7 @@ 89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002a749444154388d7d91cd4b945114c69f73ef3b33ea7ca838a6a32681501194d2975050b4c82f92dc042e5a550b5bf60744bb16b58a8268218144d026da64da228a0a2b52d1c8c8c48f2c54669c19df79df793fefbd2d662469860e1cb870cef3e339cf2500989b5b88e56cb78b0857f2b6d3e67b0e0b0503baf4e57bdbb21eb8b6fadedf7fda4599a2e999f9bdb66b5fb75db79b3164b8c6b3504af8426852885adff3272dc31cb14c313e38d827fe0568593d77225811b8d8d810475555a89e88e0791e0c330f2515cc7c9e6ccb822f8d6f00964a009e6b5f8ed554211a0d235c5501ce1874c30411414a89582cdc0625c3e964e64c3900b35de768301000e70c1ae7608c81738e80a6a1b2b202b16814cd4d8946ced550b90c98e33a158c113ccf47ceccc3cc5b080534282591d94c637d6d1d5bd92c2ccb3af2f0d1e8bd92135cd7370184018088c0350ec639a291086291083ccf432e6740d3822c994cc54a1c5886f5d1755d48a920a584520a4a291000251508844c3a83baf82e1051e90996e5dc5959fe0d21fd4270424208015184e9ba8e0f139350d050460fd6de7ec80e5786313b3307c33021a484effb104222994c61ecc52b380ec1cbfcc281fcd33dd3379af7ec04d0f497c5ae8977afc77b7acf6262620a7a2e0d2505a0181a1a1388d735209f5a41647504bb833fdcad8de4e896c9864edd5edb00006d9bd49468c4c0406f318b420b2121a440eaf324226d3588b79c0f6a536303d6fc2a9e5d4d5c1bb8bfb6cc769829f7cd2010aaf77741f7dbb095d1517bb81b0dadf57dd1907bf3f1a5448b5656b52d2ea6c62b6bf076ad09355f17cc939d84face736185d10bd9d9541dfbbb5c1010018c1158f14d44205600ad878ebdf9f47cfceec6a6e5b0d6e39a1139d8a5b1e2707878e47f660a15aaddfcb9a4df4a3f79d921abf7f52cda1d737f0030624881b39160420000000049454e44ae426082 - + kpushbutton.h diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 3461ed8f..6280644b 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 *parent, const char *name) - : AddContactPage(parent,name) +ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent, const char *name) + : AddContactPage(tqparent,name) { kdDebug(14153) << k_funcinfo << "called" << endl; mAccount = owner; @@ -66,13 +66,13 @@ void ICQAddContactPage::showEvent(TQShowEvent *e) AddContactPage::showEvent(e); } -bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *parentContact ) +bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *tqparentContact ) { kdDebug(14153) << k_funcinfo << "called; adding contact..." << endl; TQString contactId = addUI->uinEdit->text(); kdDebug(14153) << k_funcinfo << "uin=" << contactId << endl; - return mAccount->addContact(contactId, parentContact, Kopete::Account::ChangeKABC ); + return mAccount->addContact(contactId, tqparentContact, Kopete::Account::ChangeKABC ); } @@ -87,7 +87,7 @@ bool ICQAddContactPage::validateData() return false; } - Q_ULONG uin = addUI->uinEdit->text().toULong(); + TQ_ULONG uin = addUI->uinEdit->text().toULong(); if ( uin < 1000 ) { // Invalid (or missing) UIN @@ -123,4 +123,4 @@ void ICQAddContactPage::searchDialogDestroyed() #include "icqaddcontactpage.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; replace-tabs off; +// kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h index c6c22eb2..23c514f6 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h @@ -32,13 +32,14 @@ class ICQSearchDialog; class ICQAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - ICQAddContactPage(ICQAccount *owner, TQWidget *parent = 0, const char *name = 0); + ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent = 0, const char *name = 0); ~ICQAddContactPage(); virtual bool validateData(); - virtual bool apply(Kopete::Account* , Kopete::MetaContact *parentContact); + virtual bool apply(Kopete::Account* , Kopete::MetaContact *tqparentContact); void setUINFromSearch( const TQString& ); @@ -57,4 +58,4 @@ private: #endif -//kate: space-indent off; replace-tabs off; indent-mode csands; +//kate: space-indent off; tqreplace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp index a92b33de..a2803f71 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp @@ -24,8 +24,8 @@ #include #include -ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *parent, const char *name, bool wasRequested ) - : KDialogBase( parent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel ) +ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *tqparent, const char *name, bool wasRequested ) + : KDialogBase( tqparent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel ) { m_ui = new ICQAuthReplyUI( this ); setMainWidget( m_ui ); @@ -38,7 +38,7 @@ ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *parent, const char *name, bool } else { - this->setWFlags( this->getWFlags() | Qt::WDestructiveClose ); + this->setWFlags( this->getWFlags() | TQt::WDestructiveClose ); } } @@ -50,9 +50,9 @@ void ICQAuthReplyDialog::setUser( const TQString & user ) { if ( m_wasRequested ) m_ui->lblUserReq->setText( - i18n( "%1 requested authorization to add you to his/her contact list." ).arg( user ) ); + i18n( "%1 requested authorization to add you to his/her contact list." ).tqarg( user ) ); else - m_ui->lblUserReq->setText( i18n( "Authorization reply to %1." ).arg( user ) ); + m_ui->lblUserReq->setText( i18n( "Authorization reply to %1." ).tqarg( user ) ); } void ICQAuthReplyDialog::setRequestReason( const TQString & reason ) diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h index f32d4569..9b801859 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h @@ -29,8 +29,9 @@ class ICQAuthReplyUI; class ICQAuthReplyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ICQAuthReplyDialog(TQWidget *parent = 0, const char *name = 0, bool wasRequested = true); + ICQAuthReplyDialog(TQWidget *tqparent = 0, const char *name = 0, bool wasRequested = true); ~ICQAuthReplyDialog(); void setUser( const TQString& user ); diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui index 12607856..a73b95a2 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui +++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui @@ -1,6 +1,6 @@ ICQAuthReplyUI - + ICQAuthReplyUI @@ -19,15 +19,15 @@ unnamed - + - layout22 + tqlayout22 unnamed - + lblReason @@ -43,16 +43,16 @@ Reason: - + leReason - + - layout23 + tqlayout23 @@ -68,14 +68,14 @@ Expanding - + 50 20 - + bgAction @@ -100,7 +100,7 @@ unnamed - + rbGrant @@ -111,7 +111,7 @@ true - + rbDecline @@ -131,7 +131,7 @@ Expanding - + 220 21 @@ -140,7 +140,7 @@ - + lblUserReq @@ -148,15 +148,15 @@ %1 requested authorization to add you to his/her contact list. - + - layout24 + tqlayout24 unnamed - + lblReqReason @@ -172,7 +172,7 @@ Request Reason: - + lblRequestReason @@ -192,5 +192,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index 3ecc91cb..074e4424 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -1,6 +1,6 @@ ICQEditAccountUI - + ICQEditAccountUI @@ -25,11 +25,11 @@ 0 - + tabWidget7 - + tab @@ -40,7 +40,7 @@ unnamed - + groupBox3 @@ -51,15 +51,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + lblAccountId @@ -76,7 +76,7 @@ The user ID of your ICQ account. This should be in the form of a number (no decimals, no spaces). - + edtAccountId @@ -94,7 +94,7 @@ mPasswordWidget - + chkAutoLogin @@ -108,7 +108,7 @@ If you check that case, the account will not be connected when you press the "Connect All" button, or at startup even if you selected to automatically connect at startup - + chkGlobalIdentity @@ -118,7 +118,7 @@ - + groupBox5 @@ -137,7 +137,7 @@ unnamed - + textLabel6 @@ -149,7 +149,7 @@ 0 - + 0 0 @@ -159,11 +159,11 @@ To connect to the ICQ network, you will need an ICQ account.<br><br> If you do not currently have an ICQ account, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -183,7 +183,7 @@ If you do not currently have an ICQ account, please click the button to create o Expanding - + 20 40 @@ -192,7 +192,7 @@ If you do not currently have an ICQ account, please click the button to create o - + tab @@ -203,7 +203,7 @@ If you do not currently have an ICQ account, please click the button to create o unnamed - + groupBox2 @@ -214,7 +214,7 @@ If you do not currently have an ICQ account, please click the button to create o unnamed - + edtServerPort @@ -237,7 +237,7 @@ If you do not currently have an ICQ account, please click the button to create o The port on the ICQ server that you would like to connect to. Normally this is 5190. - + edtServerAddress @@ -248,13 +248,13 @@ If you do not currently have an ICQ account, please click the button to create o login.icq.com - The IP address or hostmask of the ICQ server you wish to connect to. + The IP address or hosttqmask of the ICQ server you wish to connect to. - The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). + The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). - + lblServerPort @@ -274,7 +274,7 @@ If you do not currently have an ICQ account, please click the button to create o The port on the ICQ server that you would like to connect to. Normally this is 5190. - + lblServer @@ -288,13 +288,13 @@ If you do not currently have an ICQ account, please click the button to create o edtServerAddress - The IP address or hostmask of the ICQ server you wish to connect to. + The IP address or hosttqmask of the ICQ server you wish to connect to. - The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). + The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). - + optionOverrideServer @@ -304,7 +304,7 @@ If you do not currently have an ICQ account, please click the button to create o - + groupBox65 @@ -315,7 +315,7 @@ If you do not currently have an ICQ account, please click the button to create o unnamed - + chkRequireAuth @@ -329,7 +329,7 @@ If you do not currently have an ICQ account, please click the button to create o Enable authorization requirement, which will not allow users to add you to their contact list without authorization from you. Check this box, and you will have to confirm any users who add you to their list before they may see your online status. - + chkHideIP @@ -343,7 +343,7 @@ If you do not currently have an ICQ account, please click the button to create o Checking this box will not allow people to see what your IP address if they view your ICQ user details such as name, address, or age. - + chkWebAware @@ -372,14 +372,14 @@ If you do not currently have an ICQ account, please click the button to create o Expanding - + 20 40 - + encodingCombo @@ -387,7 +387,7 @@ If you do not currently have an ICQ account, please click the button to create o true - + textLabel1 @@ -404,14 +404,14 @@ If you do not currently have an ICQ account, please click the button to create o - + labelStatusMessage - + AlignCenter @@ -479,7 +479,7 @@ If you do not currently have an ICQ account, please click the button to create o chkHideIP chkWebAware - + kopetepasswordwidget.h diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index 04a312a4..874c2075 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 *parent, const char *name) - : TQWidget(parent, name), KopeteEditAccountWidget(account) + Kopete::Account *account, TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name), KopeteEditAccountWidget(account) { kdDebug(14153) << k_funcinfo << "Called." << endl; @@ -187,4 +187,4 @@ void ICQEditAccountWidget::slotOpenRegister() #include "icqeditaccountwidget.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; replace-tabs off; +// kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h index 4bc1a52b..c9affe90 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h @@ -31,10 +31,11 @@ class ICQEditAccountUI; class ICQEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: ICQEditAccountWidget(ICQProtocol *, Kopete::Account *, - TQWidget *parent=0, const char *name=0); + TQWidget *tqparent=0, const char *name=0); virtual bool validateData(); virtual Kopete::Account *apply(); @@ -49,4 +50,4 @@ protected: }; #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; replace-tabs off; +// kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui index 6383bec1..52288b38 100644 --- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui +++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui @@ -1,6 +1,6 @@ ICQGeneralInfoWidget - + ICQGeneralInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox2 @@ -27,7 +27,7 @@ unnamed - + textLabel2 @@ -38,7 +38,7 @@ cityEdit - + textLabel1 @@ -49,7 +49,7 @@ addressEdit - + textLabel5 @@ -60,7 +60,7 @@ phoneEdit - + textLabel4 @@ -71,7 +71,7 @@ stateEdit - + cityEdit @@ -87,7 +87,7 @@ true - + textLabel8 @@ -98,7 +98,7 @@ countryEdit - + homepageEdit @@ -114,7 +114,7 @@ true - + textLabel9 @@ -125,7 +125,7 @@ emailEdit - + emailEdit @@ -141,7 +141,7 @@ true - + textLabel10_2 @@ -152,7 +152,7 @@ homepageEdit - + cellEdit @@ -168,7 +168,7 @@ true - + countryEdit @@ -176,7 +176,7 @@ true - + stateEdit @@ -192,7 +192,7 @@ true - + textLabel7_2 @@ -203,7 +203,7 @@ faxEdit - + faxEdit @@ -211,7 +211,7 @@ true - + phoneEdit @@ -222,7 +222,7 @@ true - + textLabel6_2 @@ -233,7 +233,7 @@ cellEdit - + addressEdit @@ -249,7 +249,7 @@ true - + textLabel3 @@ -260,7 +260,7 @@ zipEdit - + zipEdit @@ -281,7 +281,7 @@ - + groupBox4 @@ -292,7 +292,7 @@ unnamed - + uinEdit @@ -308,7 +308,7 @@ true - + fullNameLabel @@ -319,7 +319,7 @@ fullNameEdit - + ipEdit @@ -331,7 +331,7 @@ 0 - + 125 0 @@ -344,7 +344,7 @@ true - + timezoneEdit @@ -352,7 +352,7 @@ true - + nickNameEdit @@ -368,7 +368,7 @@ true - + nickNameLabel @@ -379,7 +379,7 @@ nickNameEdit - + uinLabel @@ -390,7 +390,7 @@ uinEdit - + birthdayLabel @@ -401,12 +401,12 @@ birthday - + ageSpinBox - + textLabel6 @@ -417,7 +417,7 @@ genderEdit - + birthday @@ -425,7 +425,7 @@ true - + fullNameEdit @@ -433,7 +433,7 @@ true - + genderEdit @@ -441,7 +441,7 @@ true - + ipLabel @@ -452,7 +452,7 @@ ipEdit - + textLabel7 @@ -463,7 +463,7 @@ timezoneEdit - + maritalLabel @@ -471,7 +471,7 @@ Marital status: - + textLabel10 @@ -490,7 +490,7 @@ ageSpinBox - + marital @@ -500,7 +500,7 @@ - + groupBox3 @@ -511,7 +511,7 @@ unnamed - + oStateEdit @@ -519,7 +519,7 @@ true - + oCountryEdit @@ -527,7 +527,7 @@ true - + oCityEdit @@ -543,7 +543,7 @@ true - + textLabel2_2 @@ -551,7 +551,7 @@ City: - + textLabel3_2 @@ -559,7 +559,7 @@ Country: - + textLabel1_2 @@ -579,7 +579,7 @@ Expanding - + 21 20 @@ -607,5 +607,5 @@ emailEdit homepageEdit - + diff --git a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui index ce4041c9..a8107e44 100644 --- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui @@ -1,6 +1,6 @@ ICQInterestInfoWidget - + ICQInterestInfoWidget @@ -16,7 +16,7 @@ unnamed - + buttonGroup1 @@ -27,7 +27,7 @@ unnamed - + desc1 @@ -35,7 +35,7 @@ true - + desc2 @@ -43,7 +43,7 @@ true - + desc3 @@ -51,7 +51,7 @@ true - + topic2 @@ -59,7 +59,7 @@ true - + topic1 @@ -67,7 +67,7 @@ true - + topic3 @@ -75,7 +75,7 @@ true - + topic4 @@ -83,7 +83,7 @@ true - + desc4 @@ -103,7 +103,7 @@ Expanding - + 20 220 @@ -112,5 +112,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui index 4e5a3a34..2e1079a2 100644 --- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui @@ -1,6 +1,6 @@ ICQOtherInfoWidget - + ICQOtherInfoWidget @@ -26,14 +26,14 @@ Expanding - + 20 30 - + textLabel12 @@ -41,12 +41,12 @@ Email addresses: - + emailListBox - + textLabel13 @@ -54,7 +54,7 @@ Contact notes: - + notesEdit @@ -64,5 +64,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index 68e59281..5e2b3bf6 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -1,6 +1,6 @@ ICQSearchBase - + ICQSearchBase @@ -114,18 +114,18 @@ Expanding - + 41 190 - + tabWidget3 - + tab @@ -136,7 +136,7 @@ unnamed - + textLabel1 @@ -147,7 +147,7 @@ uin - + uin @@ -162,7 +162,7 @@ Expanding - + 20 105 @@ -171,7 +171,7 @@ - + tab @@ -182,17 +182,17 @@ unnamed - + lastName - + nickName - + textLabel4 @@ -203,7 +203,7 @@ lastName - + textLabel3 @@ -214,7 +214,7 @@ firstName - + textLabel6 @@ -225,7 +225,7 @@ email - + textLabel2 @@ -236,12 +236,12 @@ nickName - + country - + textLabel9 @@ -252,17 +252,17 @@ language - + language - + city - + textLabel10 @@ -273,17 +273,17 @@ city - + firstName - + email - + textLabel8 @@ -294,12 +294,12 @@ gender - + gender - + onlyOnline @@ -307,7 +307,7 @@ Only search for online contacts - + textLabel11 @@ -328,7 +328,7 @@ Expanding - + 20 16 @@ -345,7 +345,7 @@ Expanding - + 166 20 @@ -479,7 +479,7 @@ closeButton searchResults - + kpushbutton.h kpushbutton.h diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index e52e707f..57c551aa 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* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "ICQ User Search" ), 0, NoDefault ) +ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, 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( parent() ); + ICQAddContactPage* iacp = dynamic_cast( tqparent() ); if ( !iacp ) { - kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our parent!!" << endl; + kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our tqparent!!" << endl; } else { @@ -296,13 +296,13 @@ void ICQSearchDialog::searchFinished( int numLeft ) void ICQSearchDialog::clearFields() { - m_searchUI->uin->setText( TQString::null ); + m_searchUI->uin->setText( TQString() ); - m_searchUI->firstName->setText( TQString::null ); - m_searchUI->lastName->setText( TQString::null ); - m_searchUI->nickName->setText( TQString::null ); - m_searchUI->email->setText( TQString::null ); - m_searchUI->city->setText( TQString::null ); + m_searchUI->firstName->setText( TQString() ); + m_searchUI->lastName->setText( TQString() ); + m_searchUI->nickName->setText( TQString() ); + m_searchUI->email->setText( TQString() ); + m_searchUI->city->setText( TQString() ); m_searchUI->gender->setCurrentItem( 0 ); // Unspecified m_searchUI->country->setCurrentItem( 0 ); m_searchUI->language->setCurrentItem( 0 ); @@ -315,6 +315,6 @@ void ICQSearchDialog::newSearch() clearFields(); } -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; #include "icqsearchdialog.moc" diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h index aca61ee7..2dcdd502 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h @@ -32,8 +32,9 @@ class ICQUserInfoWidget; class ICQSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ICQSearchDialog( ICQAccount* account, TQWidget* parent = 0, const char* name = 0 ); + ICQSearchDialog( ICQAccount* account, TQWidget* tqparent = 0, const char* name = 0 ); ~ICQSearchDialog(); private slots: @@ -66,4 +67,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 44fd5afd..3c327198 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -40,35 +40,35 @@ #include "icqinterestinfowidget.h" -ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "ICQ User Information" ), Ok ) +ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "ICQ User Information" ), Ok ) { kdDebug(14153) << k_funcinfo << "Creating new icq user info widget" << endl; TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); TQFrame* interestInfo = addPage( i18n( "Interest Info" ), i18n( "Interest" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo ); m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information" ); interestLayout->addWidget( m_interestInfoWidget ); @@ -186,5 +186,5 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui ) #include "icquserinfowidget.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h index ac4048ab..6fd5d84a 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h @@ -32,8 +32,9 @@ class ICQContact; class ICQUserInfoWidget : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ICQUserInfoWidget( TQWidget* parent = 0, const char* name = 0 ); + ICQUserInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); void setContact( ICQContact* contact ); public slots: @@ -55,4 +56,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui index a31021ba..bd6b714a 100644 --- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui @@ -1,6 +1,6 @@ ICQWorkInfoWidget - + ICQWorkInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox2 @@ -27,7 +27,7 @@ unnamed - + textLabel10 @@ -35,7 +35,7 @@ Phone: - + textLabel11 @@ -43,7 +43,7 @@ Fax: - + textLabel6 @@ -51,7 +51,7 @@ Department: - + departmentEdit @@ -59,7 +59,7 @@ true - + textLabel7 @@ -67,7 +67,7 @@ Position: - + positionEdit @@ -75,7 +75,7 @@ true - + phoneEdit @@ -83,7 +83,7 @@ true - + faxEdit @@ -93,7 +93,7 @@ - + buttonGroup1 @@ -104,7 +104,7 @@ unnamed - + textLabel1 @@ -112,7 +112,7 @@ Name: - + textLabel8 @@ -120,7 +120,7 @@ Homepage: - + textLabel2 @@ -128,7 +128,7 @@ Address: - + textLabel4 @@ -136,7 +136,7 @@ Zip: - + textLabel5 @@ -144,7 +144,7 @@ State: - + textLabel3 @@ -152,7 +152,7 @@ City: - + textLabel9 @@ -168,7 +168,7 @@ Country: - + companyEdit @@ -176,7 +176,7 @@ true - + homepageEdit @@ -184,7 +184,7 @@ true - + addressEdit @@ -192,7 +192,7 @@ true - + cityEdit @@ -200,7 +200,7 @@ true - + stateEdit @@ -208,7 +208,7 @@ true - + zipEdit @@ -216,7 +216,7 @@ true - + countryEdit @@ -236,7 +236,7 @@ Expanding - + 20 70 @@ -245,5 +245,5 @@ - + -- cgit v1.2.1