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/msn/ui/msnadd.ui | 20 +- kopete/protocols/msn/ui/msndebugrawcommand_base.ui | 18 +- kopete/protocols/msn/ui/msneditaccountui.ui | 230 ++++++++++----------- kopete/protocols/msn/ui/msneditaccountwidget.cpp | 16 +- kopete/protocols/msn/ui/msneditaccountwidget.h | 3 +- kopete/protocols/msn/ui/msninfo.ui | 42 ++-- 6 files changed, 165 insertions(+), 164 deletions(-) (limited to 'kopete/protocols/msn/ui') diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui index ff99bb92..6373ccf3 100644 --- a/kopete/protocols/msn/ui/msnadd.ui +++ b/kopete/protocols/msn/ui/msnadd.ui @@ -1,6 +1,6 @@ msnAddUI - + msnAddUI @@ -22,22 +22,22 @@ 6 - + - layout21 + tqlayout21 unnamed - + TextLabel1 &MSN Passport ID: - + AlignTop @@ -50,7 +50,7 @@ The user ID of the MSN contact you would like to add. This should be in the form of a valid E-mail address. - + addID @@ -63,14 +63,14 @@ - + textLabel2 <i>(for example: joe@hotmail.com)</i> - + AlignVCenter|AlignRight @@ -84,7 +84,7 @@ Expanding - + 20 160 @@ -93,5 +93,5 @@ - + diff --git a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui index 3b98ce0d..27c1050f 100644 --- a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui +++ b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui @@ -1,6 +1,6 @@ MSNDebugRawCommand_base - + MSNDebugRawCommand_base @@ -22,7 +22,7 @@ 6 - + TextLabel2 @@ -33,12 +33,12 @@ m_params - + m_command - + TextLabel1 @@ -49,12 +49,12 @@ m_command - + m_params - + m_addId @@ -65,7 +65,7 @@ true - + m_addNewline @@ -84,7 +84,7 @@ PlainText - + TextLabel3 @@ -100,7 +100,7 @@ m_addId m_addNewline - + ktextedit.h diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui index 5a3b8294..b4bfe186 100644 --- a/kopete/protocols/msn/ui/msneditaccountui.ui +++ b/kopete/protocols/msn/ui/msneditaccountui.ui @@ -1,7 +1,7 @@ MSNEditAccountUI Olivier Goffart - + Form1 @@ -26,14 +26,14 @@ 0 - + tabWidget3 Rounded - + tab_connection @@ -54,14 +54,14 @@ Expanding - + 20 146 - + groupBox5 @@ -80,7 +80,7 @@ unnamed - + textLabel6 @@ -92,7 +92,7 @@ 0 - + 0 0 @@ -101,11 +101,11 @@ To connect to the Microsoft network, you will need a Microsoft Passport.<br><br>If you do not currently have a Passport, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -115,7 +115,7 @@ - + m_accountInfo @@ -126,15 +126,15 @@ unnamed - + - layout14 + tqlayout14 unnamed - + TextLabel1_3 @@ -159,7 +159,7 @@ The user ID of the MSN contact you would like to use. This should be in the form of a valid E-mail address. - + m_login @@ -180,7 +180,7 @@ m_password - + m_autologin @@ -194,7 +194,7 @@ If you check this checkbox, the account will not be connected when you press the "Connect All" button, or at startup when automatic connection at startup is enabled. - + m_globalIdentity @@ -206,7 +206,7 @@ - + TabPage @@ -217,7 +217,7 @@ unnamed - + textLabel1_3 @@ -229,11 +229,11 @@ <qt><b>Note:</b> These settings are applicable to all MSN accounts - + WordBreak|AlignCenter - + global_settings_page @@ -244,7 +244,7 @@ unnamed - + NotifyNewChat @@ -263,15 +263,15 @@ This option will notify you when a contact starts typing their message, before the message is sent or finished. - + - layout13_2 + tqlayout13_2 unnamed - + textLabel1_4 @@ -285,7 +285,7 @@ <dt>Automatically</dt><dd>Always try to download the picture if the contact has one. <b>Note:</b> this will open a socket, and let the user know you are downloading their picture.</dd></dl> - + Only Manually @@ -324,7 +324,7 @@ - + useCustomEmoticons @@ -338,7 +338,7 @@ MSN Messenger allows users to download and use custom emoticons. If this option is enabled, Kopete will download these emoticons and show them. - + exportEmoticons @@ -355,7 +355,7 @@ Only works for emoticons in the PNG format. - + privacy_page @@ -366,7 +366,7 @@ Only works for emoticons in the PNG format. unnamed - + SendClientInfo @@ -389,7 +389,7 @@ Only works for emoticons in the PNG format. Third party MSN clients, such as Kopete, give users the ability to let other third party clients guess which client they are using. We recommend leaving this checkbox checked. - + SendTypingNotification @@ -406,15 +406,15 @@ Only works for emoticons in the PNG format. <qt>Check this box to send <b>Typing notifications</b> to your contacts. When you are composing a message, you might want your contact to know that you are typing so that he knows you are answering.</qt> - + - layout28 + tqlayout28 unnamed - + SendJabber @@ -449,7 +449,7 @@ Only works for emoticons in the PNG format. Expanding - + 61 21 @@ -468,21 +468,21 @@ Only works for emoticons in the PNG format. Minimum - + 20 21 - + textLabel1_5 There are also privacy options in the "Contacts" tab - + WordBreak|AlignCenter @@ -498,7 +498,7 @@ Only works for emoticons in the PNG format. Expanding - + 31 40 @@ -507,7 +507,7 @@ Only works for emoticons in the PNG format. - + tab_info @@ -518,7 +518,7 @@ Only works for emoticons in the PNG format. unnamed - + Layout22_2 @@ -532,7 +532,7 @@ Only works for emoticons in the PNG format. 6 - + TextLabel2_2_2 @@ -554,7 +554,7 @@ Only works for emoticons in the PNG format. The alias you would like to use on MSN. You may change this at any time you wish. - + m_displayName @@ -567,7 +567,7 @@ Only works for emoticons in the PNG format. - + m_phones @@ -578,7 +578,7 @@ Only works for emoticons in the PNG format. unnamed - + TextLabel5 @@ -589,7 +589,7 @@ Only works for emoticons in the PNG format. m_phh - + TextLabel6 @@ -600,17 +600,17 @@ Only works for emoticons in the PNG format. m_phw - + m_phw - + m_phh - + TextLabel7 @@ -621,14 +621,14 @@ Only works for emoticons in the PNG format. m_phm - + m_phm - + groupBox2 @@ -639,15 +639,15 @@ Only works for emoticons in the PNG format. unnamed - + - layout17 + tqlayout17 unnamed - + m_useDisplayPicture @@ -655,7 +655,7 @@ Only works for emoticons in the PNG format. E&xport a display picture - + textLabel1_2 @@ -673,19 +673,19 @@ Only works for emoticons in the PNG format. Please select a square image. The image will be scaled to 96x96. - + WordBreak|AlignVCenter - + - layout13 + tqlayout13 unnamed - + m_selectImage @@ -706,7 +706,7 @@ Only works for emoticons in the PNG format. Expanding - + 61 21 @@ -725,7 +725,7 @@ Only works for emoticons in the PNG format. Minimum - + 20 1 @@ -734,9 +734,9 @@ Only works for emoticons in the PNG format. - + - layout16 + tqlayout16 @@ -745,7 +745,7 @@ Only works for emoticons in the PNG format. 0 - + m_displayPicture @@ -760,13 +760,13 @@ Only works for emoticons in the PNG format. 0 - + 96 96 - + 96 96 @@ -789,7 +789,7 @@ Only works for emoticons in the PNG format. Minimum - + 20 1 @@ -810,14 +810,14 @@ Only works for emoticons in the PNG format. Expanding - + 20 21 - + m_warning_1 @@ -836,13 +836,13 @@ Only works for emoticons in the PNG format. WARNING: You need to be connected to modify this page. - + WordBreak|AlignVCenter - + tab_contacts @@ -853,7 +853,7 @@ Only works for emoticons in the PNG format. unnamed - + label_font @@ -863,15 +863,15 @@ Only works for emoticons in the PNG format. <b>Bold</b> contacts are in your contact list but you are not in their contact list. - + - layout6 + tqlayout6 unnamed - + textLabel2 @@ -882,20 +882,20 @@ Only works for emoticons in the PNG format. m_BL - + m_AL - + - layout4 + tqlayout4 unnamed - + m_blockButton @@ -903,7 +903,7 @@ Only works for emoticons in the PNG format. &> - + m_allowButton @@ -921,7 +921,7 @@ Only works for emoticons in the PNG format. Expanding - + 20 20 @@ -930,7 +930,7 @@ Only works for emoticons in the PNG format. - + textLabel1 @@ -941,16 +941,16 @@ Only works for emoticons in the PNG format. m_AL - + m_BL - + - layout58 + tqlayout58 @@ -966,14 +966,14 @@ Only works for emoticons in the PNG format. Expanding - + 41 20 - + m_blp @@ -994,7 +994,7 @@ Only works for emoticons in the PNG format. Expanding - + 41 20 @@ -1003,9 +1003,9 @@ Only works for emoticons in the PNG format. - + - layout59 + tqlayout59 @@ -1021,18 +1021,18 @@ Only works for emoticons in the PNG format. Expanding - + 81 20 - + m_RLButton - + 200 32767 @@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format. Expanding - + 111 20 @@ -1067,7 +1067,7 @@ Only works for emoticons in the PNG format. - + m_warning_2 @@ -1086,13 +1086,13 @@ Only works for emoticons in the PNG format. WARNING: You need to be connected to modify this page - + WordBreak|AlignVCenter - + TabPage @@ -1103,7 +1103,7 @@ Only works for emoticons in the PNG format. unnamed - + groupBox66 @@ -1114,7 +1114,7 @@ Only works for emoticons in the PNG format. unnamed - + optionOverrideServer @@ -1122,17 +1122,17 @@ Only works for emoticons in the PNG format. &Override default server information - + - layout20 + tqlayout20 unnamed - + - layout19 + tqlayout19 @@ -1141,7 +1141,7 @@ Only works for emoticons in the PNG format. 3 - + labelServer @@ -1155,7 +1155,7 @@ Only works for emoticons in the PNG format. m_serverName - + labelPort @@ -1171,7 +1171,7 @@ Only works for emoticons in the PNG format. - + m_serverName @@ -1196,7 +1196,7 @@ Only works for emoticons in the PNG format. Only modify these values if you want to use a special IM proxy server, like SIMP - + m_serverPort @@ -1221,7 +1221,7 @@ Only works for emoticons in the PNG format. - + optionUseHttpMethod @@ -1234,15 +1234,15 @@ This may be used to connect on a network with a restrictive firewall. Only check this option if the normal connection doesn't work. - + - layout22 + tqlayout22 unnamed - + m_useWebcamPort @@ -1253,7 +1253,7 @@ Only check this option if the normal connection doesn't work. If you are behind a firewall, you may specify a base port to use for the incoming connection, and configure your firewall to accept connections on a range of 10 ports, starting at this one. Incoming connections are used for the webcam. If you don't specify a port yourself, the operating system will choose an available port for you. It is recommended to leave the checkbox unchecked. - + m_webcamPort @@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work. Expanding - + 21 70 @@ -1297,14 +1297,14 @@ Only check this option if the normal connection doesn't work. - + labelStatusMessage - + AlignCenter @@ -1412,7 +1412,7 @@ Only check this option if the normal connection doesn't work. m_blp m_RLButton - + kopetepasswordwidget.h kcombobox.h diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index baa4fb60..b165c9f4 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 *parent, const char * /* name */ ) -: TQWidget( parent ), KopeteEditAccountWidget( account ) +MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent, const char * /* name */ ) +: TQWidget( tqparent ), KopeteEditAccountWidget( account ) { d = new MSNEditAccountWidgetPrivate; @@ -76,7 +76,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui = new MSNEditAccountUI( this ); - d->autoConfig = new KAutoConfig( d->ui ); + d->autoConfig = new KAutoConfig( TQT_TQOBJECT(d->ui) ); d->autoConfig->addWidget( d->ui->global_settings_page, "MSN" ); d->autoConfig->addWidget( d->ui->privacy_page, "MSN" ); //the JabberAccount need to be saved as text, and can't be handled by kautoconfig @@ -159,7 +159,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui->m_blp->setChecked( config->readEntry( "BLP" ) == "BL" ); d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); d->ui->m_displayPicture->setPixmap( d->pictureUrl ); d->ui->m_useDisplayPicture->setChecked( config->readBoolEntry( "exportCustomPicture" )); @@ -227,7 +227,7 @@ Kopete::Account * MSNEditAccountWidget::apply() if( d->ui->m_useDisplayPicture->isChecked() && !d->pictureData.isNull() ) { d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account()->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account()->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); if ( d->pictureData.save( d->pictureUrl, "PNG" ) ) { static_cast( account() )->setPictureUrl( d->pictureUrl ); @@ -291,7 +291,7 @@ void MSNEditAccountWidget::slotAllow() MSNNotifySocket *notify = static_cast( account() )->notifySocket(); if ( !notify ) return; - notify->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null ); + notify->removeContact( handle, MSNProtocol::BL, TQString(), TQString() ); d->ui->m_BL->takeItem( item ); d->ui->m_AL->insertItem( item ); @@ -310,7 +310,7 @@ void MSNEditAccountWidget::slotBlock() if ( !notify ) return; - notify->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null ); + notify->removeContact( handle, MSNProtocol::AL, TQString(), TQString() ); d->ui->m_AL->takeItem( item ); d->ui->m_BL->insertItem( item ); @@ -327,7 +327,7 @@ void MSNEditAccountWidget::slotSelectImage() { TQString path = 0; bool remoteFile = false; - KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "MSN Display Picture" ) ); + KURL filePath = KFileDialog::getImageOpenURL( TQString(), this, i18n( "MSN Display Picture" ) ); if( filePath.isEmpty() ) return; diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.h b/kopete/protocols/msn/ui/msneditaccountwidget.h index 40900871..1d97b4f9 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.h +++ b/kopete/protocols/msn/ui/msneditaccountwidget.h @@ -35,9 +35,10 @@ class MSNEditAccountWidgetPrivate; class MSNEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent = 0, const char *name = 0 ); + MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0 ); ~MSNEditAccountWidget(); virtual bool validateData(); virtual Kopete::Account * apply(); diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui index 17f1eecd..f983af30 100644 --- a/kopete/protocols/msn/ui/msninfo.ui +++ b/kopete/protocols/msn/ui/msninfo.ui @@ -1,6 +1,6 @@ MSNInfo - + MSNInfo @@ -16,7 +16,7 @@ unnamed - + Layout22 @@ -30,7 +30,7 @@ 6 - + TextLabel2_2 @@ -46,7 +46,7 @@ Email address: - + m_id @@ -56,7 +56,7 @@ - + Layout22_2 @@ -70,7 +70,7 @@ 6 - + TextLabel2_2_2 @@ -86,7 +86,7 @@ Display name: - + m_displayName @@ -96,15 +96,15 @@ - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -112,7 +112,7 @@ Personal message: - + m_personalMessage @@ -122,7 +122,7 @@ - + GroupBox2 @@ -133,7 +133,7 @@ unnamed - + TextLabel5 @@ -141,7 +141,7 @@ Home: - + TextLabel6 @@ -149,7 +149,7 @@ Work: - + m_phw @@ -157,7 +157,7 @@ true - + m_phh @@ -165,7 +165,7 @@ true - + TextLabel7 @@ -173,7 +173,7 @@ Mobile: - + m_phm @@ -183,7 +183,7 @@ - + m_reversed @@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you. Expanding - + 20 40 @@ -217,5 +217,5 @@ If not, the user has not added you to their list, or has removed you. - + -- cgit v1.2.1