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/yahoo/ui/yahooadd.ui | 18 ++-- kopete/protocols/yahoo/ui/yahooeditaccountbase.ui | 86 ++++++++--------- .../protocols/yahoo/ui/yahoogeneralinfowidget.ui | 102 ++++++++++----------- kopete/protocols/yahoo/ui/yahooinvitelistbase.ui | 74 +++++++-------- kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp | 10 +- kopete/protocols/yahoo/ui/yahooinvitelistimpl.h | 3 +- kopete/protocols/yahoo/ui/yahoootherinfowidget.ui | 26 +++--- kopete/protocols/yahoo/ui/yahoostealthsetting.ui | 14 +-- kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp | 16 ++-- kopete/protocols/yahoo/ui/yahoouserinfodialog.h | 5 +- .../protocols/yahoo/ui/yahooverifyaccountbase.ui | 32 +++---- kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp | 24 ++--- kopete/protocols/yahoo/ui/yahoowebcamdialog.h | 3 +- kopete/protocols/yahoo/ui/yahooworkinfowidget.ui | 44 ++++----- 14 files changed, 230 insertions(+), 227 deletions(-) (limited to 'kopete/protocols/yahoo/ui') diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui index ff3ef8f6..7aa1bd78 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -1,6 +1,6 @@ YahooAddContactBase - + Form1 @@ -25,15 +25,15 @@ 6 - + - layout53 + tqlayout53 unnamed - + textLabel1 @@ -50,7 +50,7 @@ The account name of the Yahoo account you would like to add. This should be in the form of an alphanumeric string (no spaces). - + contactID @@ -63,14 +63,14 @@ - + textLabel3_2 <i>(for example: joe8752)</i> - + AlignVCenter|AlignRight @@ -84,7 +84,7 @@ Expanding - + 20 80 @@ -93,5 +93,5 @@ - + diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 4b98f8be..a9102967 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -1,6 +1,6 @@ YahooEditAccountBase - + YahooEditAccountBase @@ -25,17 +25,17 @@ 0 - + tabWidget11 - + 460 0 - + tab @@ -46,7 +46,7 @@ unnamed - + mAccountInfo @@ -57,15 +57,15 @@ unnamed - + - layout81 + tqlayout81 unnamed - + label1 @@ -82,7 +82,7 @@ The account name of your Yahoo account. This should be in the form of an alphanumeric string (no spaces). - + mScreenName @@ -95,7 +95,7 @@ - + mAutoConnect @@ -106,7 +106,7 @@ Check to disable automatic connection. If checked, you may connect to this account manually using the icon in the bottom of the main Kopete window - + mGlobalIdentity @@ -116,7 +116,7 @@ - + groupBox5 @@ -135,7 +135,7 @@ unnamed - + textLabel6 @@ -147,7 +147,7 @@ 0 - + 0 0 @@ -156,11 +156,11 @@ To connect to the Yahoo network, you will need a Yahoo account.<br><br>If you do not currently have a Yahoo account, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -189,7 +189,7 @@ Expanding - + 20 81 @@ -198,7 +198,7 @@ - + TabPage @@ -219,14 +219,14 @@ Expanding - + 20 110 - + groupBox73 @@ -237,7 +237,7 @@ unnamed - + optionOverrideServer @@ -248,15 +248,15 @@ false - + - layout58 + tqlayout58 unnamed - + lblServer @@ -270,13 +270,13 @@ edtServerAddress - The IP address or hostmask of the Yahoo server you wish to connect to. + The IP address or hosttqmask of the Yahoo server you wish to connect to. - The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). + The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). - + editServerAddress @@ -287,13 +287,13 @@ scs.msg.yahoo.com - The IP address or hostmask of the Yahoo server you wish to connect to. + The IP address or hosttqmask of the Yahoo server you wish to connect to. - The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). + The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). - + lblPort @@ -313,7 +313,7 @@ The port on the Yahoo server that you would like to connect to. Normally this is 5050, but Yahoo also allows port 80 in case you are behind a firewall. - + sbxServerPort @@ -340,7 +340,7 @@ - + groupBox4 @@ -351,12 +351,12 @@ unnamed - + editPictureUrl - + buttonSelectPicture @@ -367,17 +367,17 @@ - + m_Picture - + 96 96 - + 96 96 @@ -396,7 +396,7 @@ true - + optionSendBuddyIcon @@ -409,14 +409,14 @@ - + labelStatusMessage - + AlignCenter @@ -460,8 +460,8 @@ mAutoConnect buttonRegister - + slotSelectPicture() - - + + diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui index b74dc94b..a9b93dcf 100644 --- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui @@ -1,6 +1,6 @@ YahooGeneralInfoWidget - + YahooGeneralInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox4 @@ -27,7 +27,7 @@ unnamed - + fullNameLabel_2 @@ -38,7 +38,7 @@ fullNameEdit - + fullNameLabel_2_2 @@ -49,7 +49,7 @@ fullNameEdit - + LastNameLabel @@ -60,7 +60,7 @@ fullNameEdit - + lastNameEdit @@ -68,7 +68,7 @@ false - + nickNameEdit @@ -84,7 +84,7 @@ false - + nickNameLabel @@ -95,7 +95,7 @@ nickNameEdit - + firstNameEdit @@ -103,7 +103,7 @@ false - + secondNameEdit @@ -111,7 +111,7 @@ false - + yahooIdLabel @@ -122,7 +122,7 @@ uinEdit - + yahooIdLabel_2 @@ -133,7 +133,7 @@ uinEdit - + birthdayLabel_2 @@ -144,7 +144,7 @@ birthday - + yahooIdEdit @@ -163,7 +163,7 @@ true - + titleEdit @@ -179,7 +179,7 @@ false - + birthdayEdit @@ -187,7 +187,7 @@ false - + anniversaryEdit @@ -195,7 +195,7 @@ false - + birthdayLabel @@ -218,14 +218,14 @@ Expanding - + 21 30 - + groupBox5 @@ -236,7 +236,7 @@ unnamed - + textLabel6_2_2 @@ -247,7 +247,7 @@ cellEdit - + textLabel10_2 @@ -258,7 +258,7 @@ homepageEdit - + emailEdit_3 @@ -274,7 +274,7 @@ false - + textLabel9 @@ -285,7 +285,7 @@ emailEdit - + textLabel9_3 @@ -296,7 +296,7 @@ emailEdit - + textLabel9_2 @@ -307,7 +307,7 @@ emailEdit - + emailEdit_2 @@ -323,7 +323,7 @@ false - + homepageEdit @@ -339,7 +339,7 @@ false - + emailEdit @@ -355,7 +355,7 @@ false - + faxEdit @@ -363,7 +363,7 @@ false - + textLabel7_2 @@ -374,7 +374,7 @@ faxEdit - + textLabel6_2_2_2 @@ -385,7 +385,7 @@ cellEdit - + pagerEdit @@ -401,7 +401,7 @@ false - + additionalEdit @@ -417,7 +417,7 @@ false - + textLabel5 @@ -428,7 +428,7 @@ phoneEdit - + cellEdit @@ -444,7 +444,7 @@ false - + textLabel6_2 @@ -455,7 +455,7 @@ cellEdit - + phoneEdit @@ -468,7 +468,7 @@ - + groupBox2 @@ -479,7 +479,7 @@ unnamed - + textLabel1 @@ -490,7 +490,7 @@ addressEdit - + textLabel8 @@ -501,7 +501,7 @@ countryEdit - + addressEdit @@ -516,14 +516,14 @@ Expanding - + 20 78 - + textLabel4 @@ -534,7 +534,7 @@ stateEdit - + stateEdit @@ -550,7 +550,7 @@ false - + textLabel2 @@ -561,7 +561,7 @@ cityEdit - + cityEdit @@ -577,7 +577,7 @@ false - + countryEdit @@ -585,7 +585,7 @@ false - + textLabel3 @@ -596,7 +596,7 @@ zipEdit - + zipEdit @@ -643,5 +643,5 @@ homepageEdit yahooIdEdit - + diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui index 09a3cd15..6c83ac64 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui +++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui @@ -1,6 +1,6 @@ YahooInviteListBase - + YahooInviteListBase @@ -19,15 +19,15 @@ unnamed - + - layout19 + tqlayout19 unnamed - + groupBox3 @@ -38,15 +38,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + textLabel2 @@ -54,7 +54,7 @@ Friend List - + New Item @@ -63,7 +63,7 @@ listFriends - + 0 180 @@ -72,15 +72,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel2_2 @@ -88,7 +88,7 @@ Chat Invitation List - + New Item @@ -97,27 +97,27 @@ listInvited - + 0 150 - + - layout2 + tqlayout2 unnamed - + editBuddyAdd - + btnCustomAdd @@ -129,9 +129,9 @@ - + - layout10 + tqlayout10 @@ -147,14 +147,14 @@ Expanding - + 20 20 - + btn_Add @@ -162,7 +162,7 @@ Add >> - + btn_Remove @@ -180,7 +180,7 @@ Expanding - + 20 90 @@ -191,15 +191,15 @@ - + - layout14 + tqlayout14 unnamed - + txtInvMsg @@ -217,29 +217,29 @@ Fixed - + 20 21 - + editMessage - + - layout18 + tqlayout18 unnamed - + btnCancel @@ -265,14 +265,14 @@ Maximum - + 350 31 - + btnInvite @@ -326,12 +326,12 @@ btnRemove_clicked() - + btnAdd_clicked() btnRemove_clicked() btnAddCustom_clicked() btnCancel_clicked() btnInvite_clicked() - - + + diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp index 594e7a01..a5f27b86 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp @@ -22,7 +22,7 @@ #include #include -YahooInviteListImpl::YahooInviteListImpl(TQWidget *parent, const char *name) : YahooInviteListBase(parent,name) +YahooInviteListImpl::YahooInviteListImpl(TQWidget *tqparent, const char *name) : YahooInviteListBase(tqparent,name) { listFriends->setSelectionMode( TQListBox::Extended ); listInvited->setSelectionMode( TQListBox::Extended ); @@ -65,9 +65,9 @@ void YahooInviteListImpl::addInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_inviteeList.find( *it ) == m_inviteeList.end() ) + if( m_inviteeList.tqfind( *it ) == m_inviteeList.end() ) m_inviteeList.push_back( *it ); - if( m_buddyList.find( *it ) != m_buddyList.end() ) + if( m_buddyList.tqfind( *it ) != m_buddyList.end() ) m_buddyList.remove( *it ); } @@ -80,9 +80,9 @@ void YahooInviteListImpl::removeInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_buddyList.find( *it ) == m_buddyList.end() ) + if( m_buddyList.tqfind( *it ) == m_buddyList.end() ) m_buddyList.push_back( *it ); - if( m_inviteeList.find( *it ) != m_inviteeList.end() ) + if( m_inviteeList.tqfind( *it ) != m_inviteeList.end() ) m_inviteeList.remove( *it ); } diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h index 94fa6402..270fef08 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h @@ -25,8 +25,9 @@ class YahooInviteListImpl : public YahooInviteListBase { Q_OBJECT + TQ_OBJECT public: - YahooInviteListImpl(TQWidget *parent=0, const char *name=0); + YahooInviteListImpl(TQWidget *tqparent=0, const char *name=0); ~YahooInviteListImpl(); void fillFriendList( const TQStringList &buddies ); diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui index db2e4a8f..98d754d6 100644 --- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui @@ -1,6 +1,6 @@ YahooOtherInfoWidget - + YahooOtherInfoWidget @@ -16,7 +16,7 @@ unnamed - + textLabel13 @@ -24,7 +24,7 @@ Contact comments: - + commentsEdit @@ -32,7 +32,7 @@ false - + textLabel2 @@ -40,7 +40,7 @@ Note 1: - + note1Edit @@ -48,7 +48,7 @@ false - + textLabel3 @@ -56,7 +56,7 @@ Note 2: - + note2Edit @@ -64,7 +64,7 @@ false - + note3Edit @@ -72,7 +72,7 @@ false - + textLabel4 @@ -80,7 +80,7 @@ Note 3: - + note4Edit @@ -88,7 +88,7 @@ false - + textLabel5 @@ -106,7 +106,7 @@ Expanding - + 20 130 @@ -115,5 +115,5 @@ - + diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui index 6c9a6fc0..f83b2050 100644 --- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui +++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui @@ -1,6 +1,6 @@ YahooStealthSetting - + YahooStealthSetting @@ -12,7 +12,7 @@ 114 - + 195 75 @@ -22,14 +22,14 @@ unnamed - + buttonGroup1 Show Me As - + radioPermOffline @@ -45,7 +45,7 @@ Perma&nently offline - + radioOnline @@ -64,7 +64,7 @@ true - + radioOffline @@ -92,5 +92,5 @@ radioOnline - + diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 700c91e5..536f975b 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -39,29 +39,29 @@ #include "yahoootherinfowidget.h" #include "yahoocontact.h" -YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) +YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) { kdDebug(14180) << k_funcinfo << "Creating new yahoo user info widget" << endl; m_contact = c; showButton( User2, false ); TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General Yahoo 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 YahooGeneralInfoWidget( 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 YahooWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other Yahoo 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 YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); @@ -219,9 +219,9 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) m_genInfoWidget->titleEdit->setText( yab.title ); if( yab.birthday.isValid() ) - m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").arg( yab.birthday.day() ).arg( yab.birthday.month() ).arg( yab.birthday.year() )); + m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").tqarg( yab.birthday.day() ).tqarg( yab.birthday.month() ).tqarg( yab.birthday.year() )); if( yab.anniversary.isValid() ) - m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").arg( yab.anniversary.day() ).arg( yab.anniversary.month() ).arg( yab.anniversary.year() )); + m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").tqarg( yab.anniversary.day() ).tqarg( yab.anniversary.month() ).tqarg( yab.anniversary.year() )); m_genInfoWidget->addressEdit->setText( yab.privateAdress ); m_genInfoWidget->cityEdit->setText( yab.privateCity ); @@ -256,5 +256,5 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) #include "yahoouserinfodialog.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/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h index e8529033..a2cff58e 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h @@ -32,8 +32,9 @@ class YahooContact; class YahooUserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - YahooUserInfoDialog( YahooContact *c, TQWidget* parent = 0, const char* name = 0 ); + YahooUserInfoDialog( YahooContact *c, TQWidget* tqparent = 0, const char* name = 0 ); void setAccountConnected( bool isOnline ); signals: void saveYABEntry( YABEntry & ); @@ -53,4 +54,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/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui index 73eb827a..10eccd2e 100644 --- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui @@ -1,6 +1,6 @@ YahooVerifyAccountBase - + YahooVerifyAccountBase @@ -12,7 +12,7 @@ 200 - + 450 200 @@ -22,7 +22,7 @@ unnamed - + textLabel1 @@ -30,15 +30,15 @@ Your Account has to be verified because of too many false login attempts.<br> - + - layout0 + tqlayout0 unnamed - + textLabel2 @@ -46,7 +46,7 @@ Please enter the chars shown in the picture: - + mWord @@ -61,7 +61,7 @@ Expanding - + 110 20 @@ -80,16 +80,16 @@ Expanding - + 20 16 - + - layout16 + tqlayout16 @@ -105,18 +105,18 @@ Expanding - + 72 20 - + mPicture - + 240 75 @@ -139,7 +139,7 @@ Expanding - + 72 20 @@ -155,5 +155,5 @@ 789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8 - + diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index caa3c75a..9c37c07d 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -27,9 +27,9 @@ #include -YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contactId ), - KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ) +YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ), + KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); @@ -44,11 +44,11 @@ YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * pare m_imageContainer = new Kopete::WebcamWidget( page ); m_imageContainer->setText( i18n( "No webcam image received" ) ); m_imageContainer->setMinimumSize(320,240); - m_imageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_imageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); topLayout->add( m_imageContainer ); m_Viewer = new TQLabel( page ); - m_Viewer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_Viewer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_Viewer->hide(); topLayout->add( m_Viewer ); @@ -67,7 +67,7 @@ void YahooWebcamDialog::newImage( const TQPixmap &image ) void YahooWebcamDialog::webcamPaused() { - m_imageContainer->setText( TQString::fromLatin1("*** Webcam paused ***") ); + m_imageContainer->setText( TQString::tqfromLatin1("*** Webcam paused ***") ); } void YahooWebcamDialog::webcamClosed( int reason ) @@ -77,15 +77,15 @@ void YahooWebcamDialog::webcamClosed( int reason ) switch ( reason ) { case 1: - closeReason = i18n( "%1 has stopped broadcasting" ).arg( contactName ); break; + closeReason = i18n( "%1 has stopped broadcasting" ).tqarg( contactName ); break; case 2: - closeReason = i18n( "%1 has cancelled viewing permission" ).arg( contactName ); break; + closeReason = i18n( "%1 has cancelled viewing permission" ).tqarg( contactName ); break; case 3: - closeReason = i18n( "%1 has declined permission to view webcam" ).arg( contactName ); break; + closeReason = i18n( "%1 has declined permission to view webcam" ).tqarg( contactName ); break; case 4: - closeReason = i18n( "%1 does not have his/her webcam online" ).arg( contactName ); break; + closeReason = i18n( "%1 does not have his/her webcam online" ).tqarg( contactName ); break; default: - closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).arg( contactName); + closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).tqarg( contactName); } m_imageContainer->clear(); @@ -94,7 +94,7 @@ void YahooWebcamDialog::webcamClosed( int reason ) void YahooWebcamDialog::setViewer( const TQStringList &viewer ) { - TQString s = i18n( "%1 viewer(s)" ).arg( viewer.size() ); + TQString s = i18n( "%1 viewer(s)" ).tqarg( viewer.size() ); if( viewer.size() ) { s += ": "; diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h index 67380d1f..eb8e1626 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h @@ -33,8 +33,9 @@ namespace Kopete class YahooWebcamDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - YahooWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 ); + YahooWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 ); ~YahooWebcamDialog(); void setViewer( const TQStringList & ); diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui index 0be88f61..5a61311a 100644 --- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui @@ -1,6 +1,6 @@ YahooWorkInfoWidget - + YahooWorkInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox2 @@ -27,7 +27,7 @@ unnamed - + textLabel10 @@ -35,7 +35,7 @@ Phone: - + phoneEdit @@ -53,7 +53,7 @@ - + buttonGroup1 @@ -64,7 +64,7 @@ unnamed - + textLabel1 @@ -72,7 +72,7 @@ Name: - + textLabel8 @@ -80,7 +80,7 @@ Homepage: - + companyEdit @@ -88,7 +88,7 @@ false - + homepageEdit @@ -96,7 +96,7 @@ false - + textLabel9 @@ -112,7 +112,7 @@ Country: - + countryEdit @@ -120,12 +120,12 @@ false - + addressEdit - + textLabel2 @@ -143,14 +143,14 @@ Expanding - + 20 20 - + cityEdit @@ -158,7 +158,7 @@ false - + stateEdit @@ -166,7 +166,7 @@ false - + textLabel5 @@ -174,7 +174,7 @@ State: - + textLabel3 @@ -182,7 +182,7 @@ City: - + textLabel4 @@ -190,7 +190,7 @@ Zip: - + zipEdit @@ -210,7 +210,7 @@ Expanding - + 20 150 @@ -229,5 +229,5 @@ stateEdit countryEdit - + -- cgit v1.2.1