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 --- .../protocols/groupwise/ui/gwaccountpreferences.ui | 42 ++++++------- kopete/protocols/groupwise/ui/gwaddcontactpage.cpp | 8 +-- kopete/protocols/groupwise/ui/gwaddcontactpage.h | 3 +- kopete/protocols/groupwise/ui/gwaddui.ui | 20 +++--- .../protocols/groupwise/ui/gwchatpropsdialog.cpp | 8 +-- kopete/protocols/groupwise/ui/gwchatpropsdialog.h | 5 +- kopete/protocols/groupwise/ui/gwchatpropswidget.ui | 58 ++++++++--------- .../protocols/groupwise/ui/gwchatsearchdialog.cpp | 4 +- kopete/protocols/groupwise/ui/gwchatsearchdialog.h | 3 +- .../protocols/groupwise/ui/gwchatsearchwidget.ui | 12 ++-- .../protocols/groupwise/ui/gwcontactproperties.cpp | 14 ++--- .../protocols/groupwise/ui/gwcontactproperties.h | 7 ++- .../protocols/groupwise/ui/gwcontactpropswidget.ui | 30 ++++----- kopete/protocols/groupwise/ui/gwcontactsearch.ui | 72 +++++++++++----------- .../protocols/groupwise/ui/gwcustomstatusedit.ui | 24 ++++---- .../protocols/groupwise/ui/gwcustomstatuswidget.ui | 16 ++--- .../protocols/groupwise/ui/gweditaccountwidget.cpp | 4 +- .../protocols/groupwise/ui/gweditaccountwidget.h | 3 +- kopete/protocols/groupwise/ui/gwprivacy.ui | 46 +++++++------- kopete/protocols/groupwise/ui/gwprivacydialog.cpp | 8 +-- kopete/protocols/groupwise/ui/gwprivacydialog.h | 3 +- .../groupwise/ui/gwreceiveinvitationdialog.cpp | 6 +- .../groupwise/ui/gwreceiveinvitationdialog.h | 3 +- kopete/protocols/groupwise/ui/gwsearch.cpp | 10 +-- kopete/protocols/groupwise/ui/gwsearch.h | 5 +- kopete/protocols/groupwise/ui/gwshowinvitation.ui | 30 ++++----- 26 files changed, 226 insertions(+), 218 deletions(-) (limited to 'kopete/protocols/groupwise/ui') diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index b5cfabcc..6b3d89f7 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -1,6 +1,6 @@ GroupWiseAccountPreferences - + GroupWiseAccountPreferences @@ -25,11 +25,11 @@ 0 - + tabWidget11 - + tab @@ -40,7 +40,7 @@ unnamed - + groupBox55 @@ -51,15 +51,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -76,7 +76,7 @@ The account name of your account. - + m_userId @@ -94,7 +94,7 @@ m_password - + m_autoConnect @@ -119,15 +119,15 @@ Horizontal - + - layout66 + tqlayout66 unnamed - + labelServer @@ -155,7 +155,7 @@ The IP address or hostname of the server you would like to connect to (for example im.yourcorp.com). - + m_server @@ -172,7 +172,7 @@ The IP address or hostname of the server you would like to connect to (for example im.yourcorp.com). - + labelPort @@ -200,7 +200,7 @@ The port on the server that you would like to connect to (default is 5222). - + m_port @@ -240,7 +240,7 @@ - + TabPage @@ -251,7 +251,7 @@ unnamed - + m_alwaysAccept @@ -269,7 +269,7 @@ Expanding - + 20 91 @@ -279,14 +279,14 @@ - + labelStatusMessage - + AlignCenter @@ -316,5 +316,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082 - + diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp index 5ece3882..5f48d727 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp @@ -45,8 +45,8 @@ #include "gwaddui.h" #include "userdetailsmanager.h" -GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent, const char* name ) - : AddContactPage(parent, name) +GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent, const char* name ) + : AddContactPage(tqparent, name) { m_account = static_cast( owner ); kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; @@ -73,7 +73,7 @@ GroupWiseAddContactPage::~GroupWiseAddContactPage() // i18n( "There was an error while carrying out your search. Please change your search terms or try again later." ) } -bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* parentContact ) +bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* tqparentContact ) { if ( validateData() ) { @@ -91,7 +91,7 @@ bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaConta else return false; - return ( account->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ); + return ( account->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ); } else return false; diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.h b/kopete/protocols/groupwise/ui/gwaddcontactpage.h index 209a601a..10a36e21 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.h +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.h @@ -41,8 +41,9 @@ class GroupWiseContactSearch; class GroupWiseAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent = 0, const char* name = 0 ); + GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent = 0, const char* name = 0 ); ~GroupWiseAddContactPage(); /** diff --git a/kopete/protocols/groupwise/ui/gwaddui.ui b/kopete/protocols/groupwise/ui/gwaddui.ui index 16859bef..6c360392 100644 --- a/kopete/protocols/groupwise/ui/gwaddui.ui +++ b/kopete/protocols/groupwise/ui/gwaddui.ui @@ -1,6 +1,6 @@ GroupWiseAddUI - + GroupWiseAddUI @@ -28,11 +28,11 @@ 0 - + m_tabWidget - + tab @@ -43,7 +43,7 @@ unnamed - + bg_addMethod @@ -54,7 +54,7 @@ unnamed - + m_userName @@ -68,7 +68,7 @@ Type some or all of the contact's name. Matches will be shown below - + rb_userId @@ -79,7 +79,7 @@ true - + rb_userName @@ -90,7 +90,7 @@ Userna&me: - + m_userId @@ -108,7 +108,7 @@ - + tab @@ -133,5 +133,5 @@ setEnabled(bool) - + diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp index 1cfee7ee..41b26f66 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp @@ -29,16 +29,16 @@ #include "gwchatpropsdialog.h" -GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * parent, const char * name ) - : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), +GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ) + : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); } GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * parent, const char * name ) - : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), + TQWidget * tqparent, const char * name ) + : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h index 7228bb57..d7ba18c3 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h @@ -41,16 +41,17 @@ class GroupWiseChatPropsWidget; class GroupWiseChatPropsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Construct an empty dialog */ - GroupWiseChatPropsDialog( TQWidget * parent, const char * name ); + GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ); /** * Construct a populated dialog */ GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * parent, const char * name ); + TQWidget * tqparent, const char * name ); ~GroupWiseChatPropsDialog() {} diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index ecb764b9..651a3b17 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -1,6 +1,6 @@ GroupWiseChatPropsWidget - + GroupWiseChatPropsWidget @@ -19,7 +19,7 @@ unnamed - + m_displayName @@ -27,15 +27,15 @@ DISPLAY NAME - + - layout16 + tqlayout16 unnamed - + m_creator @@ -49,7 +49,7 @@ The user who created the chatroom - + textLabel10_2 @@ -60,7 +60,7 @@ m_firstName_2 - + lblTopic @@ -71,7 +71,7 @@ m_displayName - + m_disclaimer @@ -85,7 +85,7 @@ A disclaimer for users entering the chatroom - + m__2_2 @@ -96,7 +96,7 @@ m_displayName_3 - + m_topic @@ -110,7 +110,7 @@ The current topic of the discussion - + m_query @@ -124,7 +124,7 @@ UNKNOWN - + textLabel11_2_2 @@ -135,7 +135,7 @@ m_lastName_2_2 - + m__2_2_2 @@ -146,7 +146,7 @@ m_displayName_3 - + lbl_displayName_2 @@ -157,7 +157,7 @@ m_displayName_2 - + m_description @@ -171,7 +171,7 @@ General description of the chatroom - + m_maxUsers @@ -185,7 +185,7 @@ Maximum simultaneous users allowed in the chatroom - + textLabel10 @@ -196,7 +196,7 @@ m_firstName - + textLabel11 @@ -207,7 +207,7 @@ m_lastName - + m_createdOn @@ -221,7 +221,7 @@ Date and time the chatroom was created - + m_archive @@ -235,7 +235,7 @@ Indicates if the chatroom is being archived on the server - + m_owner @@ -265,7 +265,7 @@ - + buttonGroup2 @@ -276,7 +276,7 @@ unnamed - + m_chkRead @@ -290,7 +290,7 @@ General permission to read messages in the chatroom - + m_chkWrite @@ -304,7 +304,7 @@ General permission to write messages in the chatroom - + m_chkModify @@ -320,7 +320,7 @@ - + textLabel1 @@ -339,9 +339,9 @@ Access permissions for specific users - + - layout15 + tqlayout15 @@ -384,7 +384,7 @@ - + klistbox.h kpushbutton.h diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index b9021b1f..5c55310d 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -34,8 +34,8 @@ #include "gwchatsearchdialog.h" -GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Search Chatrooms" ), +GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Search Chatrooms" ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ) { m_widget = new GroupWiseChatSearchWidget( this ); diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h index c65cfa43..e22860d3 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h @@ -29,8 +29,9 @@ class GroupWiseChatSearchWidget; class GroupWiseChatSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); + GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); ~GroupWiseChatSearchDialog(); protected: void populateWidget(); diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index f6f2014c..c239ce86 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -1,6 +1,6 @@ GroupWiseChatSearchWidget - + GroupWiseChatSearchWidget @@ -63,9 +63,9 @@ false - + - layout2 + tqlayout2 @@ -89,14 +89,14 @@ Expanding - + 340 20 - + m_btnRefresh @@ -108,7 +108,7 @@ - + klistview.h kpushbutton.h diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 92f4da11..7c7042dd 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -41,13 +41,13 @@ #include "gwcontactproperties.h" -GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name) - : TQObject(parent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name) + : TQObject(tqparent, name) { init(); // set up the contents of the props widget m_propsWidget->m_userId->setText( contact->contactId() ); - m_propsWidget->m_status->setText( contact->onlineStatus().description() ); + m_propsWidget->m_status->setText( contact->onlinetqStatus().description() ); m_propsWidget->m_displayName->setText( contact->metaContact()->displayName() ); m_propsWidget->m_firstName->setText( contact->property( Kopete::Global::Properties::self()->firstName() ).value().toString() ); m_propsWidget->m_lastName->setText( contact->property( Kopete::Global::Properties::self()->lastName() ).value().toString() ); @@ -56,8 +56,8 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta m_dialog->show(); } -GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *parent, const char *name ) - : TQObject(parent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *tqparent, const char *name ) + : TQObject(tqparent, name) { init(); // set up the contents of the props widget @@ -78,7 +78,7 @@ GroupWiseContactProperties::~GroupWiseContactProperties() void GroupWiseContactProperties::init() { - m_dialog = new KDialogBase( ::qt_cast( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); + m_dialog = new KDialogBase( ::tqqt_cast( tqparent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); m_propsWidget = new GroupWiseContactPropsWidget( m_dialog ); // set up the context menu and copy action m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 ); @@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy() kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; if ( m_propsWidget->m_propsView->currentItem() ) { - QClipboard *cb = kapp->clipboard(); + TQClipboard *cb = kapp->tqclipboard(); cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) ); } } diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h index 226a6229..38cce07d 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.h +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h @@ -32,18 +32,19 @@ Logic, wrapping UI, for displaying contact properties @author SUSE AG */ -class GroupWiseContactProperties : public QObject +class GroupWiseContactProperties : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Display properties given a GroupWiseContact */ - GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name ); + GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name ); /** * Display properties given a GroupWise::ContactDetails */ - GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *parent = 0, const char *name = 0 ); + GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *tqparent = 0, const char *name = 0 ); ~GroupWiseContactProperties(); protected: void setupProperties( TQMap< TQString, TQString > serverProps ); diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index 3aece991..12e0deb2 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -1,6 +1,6 @@ GroupWiseContactPropsWidget - + GroupWiseContactPropsWidget @@ -16,7 +16,7 @@ unnamed - + m_userId @@ -46,15 +46,15 @@ Horizontal - + - layout15 + tqlayout15 unnamed - + m_lastName @@ -68,15 +68,15 @@ Change the display name used for this contact - + textLabel14 - Status: + tqStatus: - + m_displayName @@ -90,7 +90,7 @@ Change the display name used for this contact - + m_status @@ -98,7 +98,7 @@ USER_STATUS - + textLabel10 @@ -106,7 +106,7 @@ First name: - + lbl_displayName @@ -117,7 +117,7 @@ m_displayName - + m_firstName @@ -131,7 +131,7 @@ Change the display name used for this contact - + textLabel11 @@ -155,7 +155,7 @@ Horizontal - + textLabel15 @@ -204,7 +204,7 @@ - + klistview.h diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 868072ce..8c215959 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -1,6 +1,6 @@ GroupWiseContactSearchWidget - + GroupWiseContactSearchWidget @@ -19,15 +19,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -38,7 +38,7 @@ m_firstName - + textLabel3 @@ -49,7 +49,7 @@ m_userId - + textLabel4 @@ -60,17 +60,17 @@ m_title - + m_userId - + m_firstName - + textLabel5 @@ -81,10 +81,10 @@ m_dept - + - contains + tqcontains @@ -101,10 +101,10 @@ m_userIdOperation - + - contains + tqcontains @@ -121,15 +121,15 @@ m_firstNameOperation - + m_dept - + - contains + tqcontains @@ -146,7 +146,7 @@ m_lastNameOperation - + textLabel2 @@ -157,7 +157,7 @@ m_lastName - + m_clear @@ -165,10 +165,10 @@ Cl&ear - + - contains + tqcontains @@ -185,17 +185,17 @@ m_deptOperation - + m_title - + m_lastName - + m_search @@ -206,10 +206,10 @@ true - + - contains + tqcontains @@ -242,7 +242,7 @@ Horizontal - + textLabel9 @@ -253,18 +253,18 @@ m_results - + - layout12 + tqlayout12 unnamed - + - Status + tqStatus true @@ -316,15 +316,15 @@ AllColumns - + - layout8 + tqlayout8 unnamed - + m_details @@ -345,7 +345,7 @@ Expanding - + 20 141 @@ -356,7 +356,7 @@ - + m_matchCount @@ -382,5 +382,5 @@ m_details m_firstNameOperation - + diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui index 43a9af15..366cb717 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -1,6 +1,6 @@ GroupWiseCustomStatusEdit - + GroupWiseCustomStatusEdit @@ -19,15 +19,15 @@ unnamed - + - layout3 + tqlayout3 unnamed - + m_name @@ -41,23 +41,23 @@ - + - m_cmbStatus + m_cmbtqStatus - + textLabel3 - &Status: + &tqStatus: comboBox1 - + textLabel2 @@ -68,7 +68,7 @@ lineEdit2 - + textLabel1 @@ -79,7 +79,7 @@ lineEdit1 - + m_awayMessage @@ -88,5 +88,5 @@ - + diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 8c69aa76..df25aaef 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -1,6 +1,6 @@ GroupWiseCustomStatusWidget - + GroupWiseCustomStatusWidget @@ -52,15 +52,15 @@ true - + - layout2 + tqlayout2 unnamed - + m_btnAdd @@ -68,7 +68,7 @@ &Add - + m_btnEdit @@ -76,7 +76,7 @@ &Edit - + m_btnRemove @@ -94,7 +94,7 @@ Expanding - + 20 41 @@ -105,7 +105,7 @@ - + klistview.h diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 7f049d7c..43ae480d 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "gweditaccountwidget.h" -GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* theAccount) -: TQWidget( parent ), KopeteEditAccountWidget( theAccount ) +GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* theAccount) +: TQWidget( tqparent ), KopeteEditAccountWidget( theAccount ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; m_layout = new TQVBoxLayout( this ); diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.h b/kopete/protocols/groupwise/ui/gweditaccountwidget.h index 42a0400a..24171353 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.h +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.h @@ -36,8 +36,9 @@ class GroupWiseAccountPreferences; class GroupWiseEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* account); + GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* account); ~GroupWiseEditAccountWidget(); diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 8b09cab6..13070437 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -1,6 +1,6 @@ GroupWisePrivacyWidget - + GroupWisePrivacyWidget @@ -16,7 +16,7 @@ unnamed - + textLabel1 @@ -24,23 +24,23 @@ Who can see my online status and send me messages: - + - layout11 + tqlayout11 unnamed - + - layout9 + tqlayout9 unnamed - + textLabel2 @@ -51,16 +51,16 @@ m_allowList - + m_allowList - + - layout8 + tqlayout8 @@ -76,14 +76,14 @@ Expanding - + 20 21 - + m_btnBlock @@ -91,7 +91,7 @@ &Block >> - + m_btnAllow @@ -109,14 +109,14 @@ Expanding - + 20 53 - + m_btnAdd @@ -124,7 +124,7 @@ A&dd... - + m_btnRemove @@ -142,7 +142,7 @@ Expanding - + 20 52 @@ -151,15 +151,15 @@ - + - layout10 + tqlayout10 unnamed - + textLabel3 @@ -170,7 +170,7 @@ m_denyList - + m_denyList @@ -179,7 +179,7 @@ - + m_status @@ -189,5 +189,5 @@ - + diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index f18d6737..462d53ee 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -36,7 +36,7 @@ #include "userdetailsmanager.h" #include "gwprivacydialog.h" -class PrivacyLBI : public QListBoxPixmap +class PrivacyLBI : public TQListBoxPixmap { public: PrivacyLBI( TQListBox * listBox, const TQPixmap & pixmap, const TQString & text, const TQString & dn ) @@ -48,8 +48,8 @@ private: TQString m_dn; }; -GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ), +GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0) { m_privacy = new GroupWisePrivacyWidget( this ); @@ -343,7 +343,7 @@ void GroupWisePrivacyDialog::commitChanges() void GroupWisePrivacyDialog::errorNotConnected() { KMessageBox::queuedMessageBox( this, KMessageBox::Information, - i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").arg( m_account->accountId() ) ); + i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").tqarg( m_account->accountId() ) ); } #include "gwprivacydialog.moc" diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.h b/kopete/protocols/groupwise/ui/gwprivacydialog.h index 27ead5d8..0211e85e 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.h +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.h @@ -34,8 +34,9 @@ Logic for the UI part managing the allow and deny lists, and the default privacy class GroupWisePrivacyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); + GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); ~GroupWisePrivacyDialog(); protected: void commitChanges(); diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 6005f61a..d8846bbd 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -33,8 +33,8 @@ #include "gwreceiveinvitationdialog.h" -ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name) - : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, parent, name, false ) +ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name) + : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, tqparent, name, false ) { m_account = account; m_guid = event.guid; @@ -50,7 +50,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co m_wid->m_contactName->setText( event.user ); m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) ); - m_wid->m_message->setText( TQString("%1").arg( event.message ) ); + m_wid->m_message->setText( TQString("%1").tqarg( event.message ) ); setMainWidget( m_wid ); } diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h index 529ceaa3..20cb28e6 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h @@ -31,8 +31,9 @@ This is the dialog that is shown when you receive an invitation to chat. class ReceiveInvitationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name ); + ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name ); ~ReceiveInvitationDialog(); signals: void invitationAccepted( bool, const GroupWise::ConferenceGuid & guid ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp index 885b6192..dc0788eb 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.cpp +++ b/kopete/protocols/groupwise/ui/gwsearch.cpp @@ -37,11 +37,11 @@ #include "gwsearch.h" -class GWSearchResultsLVI : public QListViewItem +class GWSearchResultsLVI : public TQListViewItem { public: - GWSearchResultsLVI( TQListView * parent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) - : TQListViewItem( parent, TQString::null, details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) + GWSearchResultsLVI( TQListView * tqparent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) + : TQListViewItem( tqparent, TQString(), details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) { setPixmap( 0, statusPM ); } @@ -56,8 +56,8 @@ public: int m_status; }; -GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *parent, const char *name) - : GroupWiseContactSearchWidget(parent, name), m_account( account ), m_onlineOnly( onlineOnly ) +GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *tqparent, const char *name) + : GroupWiseContactSearchWidget(tqparent, name), m_account( account ), m_onlineOnly( onlineOnly ) { m_results->setSelectionMode( mode ); m_results->setAllColumnsShowFocus( true ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.h b/kopete/protocols/groupwise/ui/gwsearch.h index ec57cfb1..c3aee10a 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.h +++ b/kopete/protocols/groupwise/ui/gwsearch.h @@ -33,9 +33,10 @@ Logic for searching for and displaying users and chat rooms using a GroupWiseCon class GroupWiseContactSearch : public GroupWiseContactSearchWidget { Q_OBJECT + TQ_OBJECT public: GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); ~GroupWiseContactSearch(); TQValueList< GroupWise::ContactDetails > selectedResults(); signals: @@ -46,7 +47,7 @@ protected slots: void slotClear(); void slotDoSearch(); void slotGotSearchResults(); - // shows a GroupWiseContactProperties for the selected contact. Dialog's parent is this instance + // shows a GroupWiseContactProperties for the selected contact. Dialog's tqparent is this instance void slotShowDetails(); void slotValidateSelection(); private: diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 28dd1a7d..08253705 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -1,6 +1,6 @@ ShowInvitationWidget - + ShowInvitationWidget @@ -19,15 +19,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -35,7 +35,7 @@ <p align="right">From:</p> - + textLabel3 @@ -43,7 +43,7 @@ <p align="right">Sent:</p> - + m_dateTime @@ -59,7 +59,7 @@ INVITE_DATE_TIME - + m_contactName @@ -69,7 +69,7 @@ - + m_message @@ -82,19 +82,19 @@ INVITE_MESSAGE - + WordBreak|AlignVCenter - + - layout14 + tqlayout14 unnamed - + textLabel6 @@ -112,7 +112,7 @@ Expanding - + 20 31 @@ -121,7 +121,7 @@ - + cb_dontShowAgain @@ -131,5 +131,5 @@ - + -- cgit v1.2.1