diff options
Diffstat (limited to 'kopete/libkopete/ui')
45 files changed, 444 insertions, 428 deletions
diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp index 345e9ab4..e1f31900 100644 --- a/kopete/libkopete/ui/accountselector.cpp +++ b/kopete/libkopete/ui/accountselector.cpp @@ -32,8 +32,8 @@ class AccountListViewItem : public KListViewItem Kopete::Account *mAccount; public: - AccountListViewItem(TQListView *parent, Kopete::Account *acc) - : KListViewItem(parent) + AccountListViewItem(TQListView *tqparent, Kopete::Account *acc) + : KListViewItem(tqparent) { if (acc==0) return; @@ -62,8 +62,8 @@ class AccountSelectorPrivate }; -AccountSelector::AccountSelector(TQWidget *parent, const char *name) - : TQWidget(parent, name) +AccountSelector::AccountSelector(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { //kdDebug(14010) << k_funcinfo << "for no special protocol" << endl; d = new AccountSelectorPrivate; @@ -72,8 +72,8 @@ AccountSelector::AccountSelector(TQWidget *parent, const char *name) } -AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *parent, - const char *name) : TQWidget(parent, name) +AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent, + const char *name) : TQWidget(tqparent, name) { //kdDebug(14010) << k_funcinfo << " for protocol " << proto->pluginId() << endl; d = new AccountSelectorPrivate; @@ -95,7 +95,7 @@ void AccountSelector::initUI() (new TQVBoxLayout(this))->setAutoAdd(true); d->lv = new KListView(this); d->lv->setFullWidth(true); - d->lv->addColumn(TQString::fromLatin1("")); + d->lv->addColumn(TQString::tqfromLatin1("")); d->lv->header()->hide(); if(d->proto != 0) diff --git a/kopete/libkopete/ui/accountselector.h b/kopete/libkopete/ui/accountselector.h index c812453d..bdb4c888 100644 --- a/kopete/libkopete/ui/accountselector.h +++ b/kopete/libkopete/ui/accountselector.h @@ -28,27 +28,28 @@ class TQListViewItem; * \brief widget to select an account, based on KListView * @author Stefan Gehn <metz AT gehn.net> */ -class KOPETE_EXPORT AccountSelector : public QWidget +class KOPETE_EXPORT AccountSelector : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor. * - * The parameters @p parent and @p name are handled by + * The parameters @p tqparent and @p name are handled by * KListView. */ - AccountSelector(TQWidget *parent=0, const char *name=0); + AccountSelector(TQWidget *tqparent=0, const char *name=0); /** * Constructor for a list of accounts for one protocol only * - * The parameters @p parent and @p name are handled by + * The parameters @p tqparent and @p name are handled by * KListView. @p proto defines the protocol whose accounts are * shown in the list */ - AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0); + AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent=0, const char *name=0); /** * Destructor. diff --git a/kopete/libkopete/ui/addcontactpage.cpp b/kopete/libkopete/ui/addcontactpage.cpp index 846815f2..4916b955 100644 --- a/kopete/libkopete/ui/addcontactpage.cpp +++ b/kopete/libkopete/ui/addcontactpage.cpp @@ -17,7 +17,7 @@ #include "addcontactpage.h" -AddContactPage::AddContactPage(TQWidget *parent, const char *name ) : TQWidget(parent,name) +AddContactPage::AddContactPage(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) { } diff --git a/kopete/libkopete/ui/addcontactpage.h b/kopete/libkopete/ui/addcontactpage.h index d72e2fd1..f215f3b0 100644 --- a/kopete/libkopete/ui/addcontactpage.h +++ b/kopete/libkopete/ui/addcontactpage.h @@ -29,12 +29,13 @@ * (in the case of jabber, i need to translate the legacy id to a JID) * this could also be usefull in the case of MLSN to check if no error (and also jabber) */ -class KOPETE_EXPORT AddContactPage : public QWidget +class KOPETE_EXPORT AddContactPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AddContactPage(TQWidget *parent=0, const char *name=0); + AddContactPage(TQWidget *tqparent=0, const char *name=0); virtual ~AddContactPage(); //Kopete::Protocol *protocol; diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp index 0d544d27..e34518b7 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -38,9 +38,9 @@ namespace Kopete { namespace UI { -AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 ) +AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * tqparent, const char * name ) : AddressBookLinkWidgetBase( tqparent, name ), mMetaContact( 0 ) { - btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) ); + btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) ); connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) ); connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) ); } @@ -66,7 +66,7 @@ void AddressBookLinkWidget::slotClearAddressee() edtAddressee->clear(); btnClear->setEnabled( false ); KABC::Addressee mrEmpty; - mSelectedUid = TQString::null; + mSelectedUid = TQString(); emit addresseeChanged( mrEmpty ); } @@ -74,11 +74,11 @@ void AddressBookLinkWidget::slotSelectAddressee() { TQString message; if ( mMetaContact ) - message = i18n("Choose the corresponding entry for '%1'" ).arg( mMetaContact->displayName() ); + message = i18n("Choose the corresponding entry for '%1'" ).tqarg( mMetaContact->displayName() ); else message = i18n("Choose the corresponding entry in the address book" ); - Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString::null ), this ); + Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString() ), this ); int result = dialog.exec(); KABC::Addressee addr; @@ -88,7 +88,7 @@ void AddressBookLinkWidget::slotSelectAddressee() edtAddressee->setText( addr.realName() ); btnClear->setEnabled( !addr.isEmpty() ); - mSelectedUid = ( addr.isEmpty() ? TQString::null : addr.uid() ); + mSelectedUid = ( addr.isEmpty() ? TQString() : addr.uid() ); emit addresseeChanged( addr ); } } diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h index fa44d530..31d90a8c 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.h +++ b/kopete/libkopete/ui/addressbooklinkwidget.h @@ -43,8 +43,9 @@ namespace UI { class AddressBookLinkWidget : public AddressBookLinkWidgetBase { Q_OBJECT + TQ_OBJECT public: - AddressBookLinkWidget( TQWidget * parent, const char * name ); + AddressBookLinkWidget( TQWidget * tqparent, const char * name ); ~AddressBookLinkWidget() {} /** * Set the currently selected addressee diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui index 4656459c..652e292a 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui +++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AddressBookLinkWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddressBookLinkWidgetBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -52,7 +52,7 @@ <string>Clear</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnSelectAddressee</cstring> </property> @@ -70,7 +70,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp index 44f42e2a..5133b4ee 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.cpp +++ b/kopete/libkopete/ui/addressbookselectordialog.cpp @@ -30,7 +30,7 @@ namespace Kopete namespace UI { -AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent, const char *name, bool modal ) : KDialogBase(parent, name, modal, title, Help|Ok|Cancel, Ok, true ) +AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent, const char *name, bool modal ) : KDialogBase(tqparent, name, modal, title, Help|Ok|Cancel, Ok, true ) { TQVBox *vbox=new TQVBox(this); m_addressBookSelectorWidget= new AddressBookSelectorWidget(vbox); @@ -52,9 +52,9 @@ AddressBookSelectorDialog::~AddressBookSelectorDialog() { } -KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent) +KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent) { - AddressBookSelectorDialog dialog(title, message, preSelectUid, parent); + AddressBookSelectorDialog dialog(title, message, preSelectUid, tqparent); int result = dialog.exec(); KABC::Addressee adr; diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h index 470f3407..db676a3c 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.h +++ b/kopete/libkopete/ui/addressbookselectordialog.h @@ -47,11 +47,12 @@ class AddressBookSelectorWidget; class KOPETE_EXPORT AddressBookSelectorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * The constructor of an empty AddressBookSelectorWidget */ - AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent=0L, const char *name=0L, bool modal = false ); + AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog */ @@ -71,7 +72,7 @@ public: * @returns the selected contact, or a null addressee if the user * pressed the Cancel button. Optionally */ - static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent = 0L ); + static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent = 0L ); protected slots: virtual void accept(); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index 4b106315..d67c3671 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -54,8 +54,8 @@ namespace Kopete namespace UI { -AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const char *name ) - : AddressBookSelectorWidget_Base( parent, name ) +AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *tqparent, const char *name ) + : AddressBookSelectorWidget_Base( tqparent, name ) { m_addressBook = Kopete::KABCPersistence::self()->addressBook(); @@ -74,7 +74,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch //We should add a clear KAction here. But we can't really do that with a designer file :\ this sucks - addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email")); + addresseeListView->setColumnText(2, SmallIconSet(TQString::tqfromLatin1("email")), i18n("Email")); kListViewSearchLine->setListView(addresseeListView); slotLoadAddressees(); @@ -144,7 +144,7 @@ void AddressBookSelectorWidget::setLabelMessage( const TQString &msg ) void AddressBookSelectorWidget::slotAddAddresseeClicked() { // Pop up add addressee dialog - TQString addresseeName = KInputDialog::getText( i18n( "New Address Book Entry" ), i18n( "Name the new entry:" ), TQString::null, 0, this ); + TQString addresseeName = KInputDialog::getText( i18n( "New Address Book Entry" ), i18n( "Name the new entry:" ), TQString(), 0, this ); if ( !addresseeName.isEmpty() ) { @@ -154,7 +154,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked() Kopete::KABCPersistence::self()->writeAddressBook( 0 ); slotLoadAddressees(); // select the addressee we just added - TQListViewItem * added = addresseeListView->findItem( addresseeName, 1 ); + TQListViewItem * added = addresseeListView->tqfindItem( addresseeName, 1 ); kListViewSearchLine->clear(); kListViewSearchLine->updateSearch(); addresseeListView->setSelected( added, true ); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h index 3b26cece..028e6d6c 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.h +++ b/kopete/libkopete/ui/addressbookselectorwidget.h @@ -48,8 +48,9 @@ namespace UI class KOPETE_EXPORT AddressBookSelectorWidget : public AddressBookSelectorWidget_Base { Q_OBJECT + TQ_OBJECT public: - AddressBookSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); + AddressBookSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); ~AddressBookSelectorWidget(); KABC::Addressee addressee(); /** diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui index d5e2e6f2..f67300df 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AddressBookSelectorWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddressBookSelectorWidget_Base</cstring> </property> @@ -40,14 +40,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>405</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>addAddresseeButton</cstring> </property> @@ -126,15 +126,15 @@ <string>Select the contact you want to communicate with via Instant Messaging</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblSearch</cstring> </property> @@ -165,8 +165,8 @@ <includes> <include location="global" impldecl="in declaration">klistviewsearchline.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>klistview.h</includehint> diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp index 9fa9f023..382693ea 100644 --- a/kopete/libkopete/ui/addresseeitem.cpp +++ b/kopete/libkopete/ui/addresseeitem.cpp @@ -27,8 +27,8 @@ #include "addresseeitem.h" -AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) : - KListViewItem( parent ), +AddresseeItem::AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee) : + KListViewItem( tqparent ), mAddressee( addressee ) { //We can't save showphoto because we don't have a d pointer @@ -49,7 +49,7 @@ TQString AddresseeItem::key( int column, bool ) const { if (column == Email) { TQString value = text(Email); - TQRegExp emailRe(TQString::fromLatin1("<\\S*>")); + TQRegExp emailRe(TQString::tqfromLatin1("<\\S*>")); int match = emailRe.search(value); if (match > -1) value = value.mid(match + 1, emailRe.matchedLength() - 2); diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h index 36d1d284..695ea6c2 100644 --- a/kopete/libkopete/ui/addresseeitem.h +++ b/kopete/libkopete/ui/addresseeitem.h @@ -46,10 +46,10 @@ class AddresseeItem : public KListViewItem /** Constructor. - @param parent The parent listview. + @param tqparent The tqparent listview. @param addressee The associated addressee. */ - AddresseeItem( TQListView *parent, const KABC::Addressee &addressee ); + AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee ); /** Returns the addressee. diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp index 9084bd39..e5fd81b4 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.cpp +++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp @@ -71,9 +71,9 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->account=account; d->contactId=contactId; d->widget->m_label->setText(i18n("<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added you to his/her contactlist. (Account %3)</qt>") - .arg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":") + .tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::tqfromLatin1(":") + KURL::encode_string( account->accountId() ) , - contactNick.isEmpty() ? contactId : contactNick + TQString::fromLatin1(" < ") + contactId + TQString::fromLatin1(" >") , + contactNick.isEmpty() ? contactId : contactNick + TQString::tqfromLatin1(" < ") + contactId + TQString::tqfromLatin1(" >") , account->accountLabel() ) ); if( hide & InfoButton) d->widget->m_infoButton->hide() ; @@ -100,7 +100,7 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->widget->m_groupList->insertItem(groupname); } } - d->widget->m_groupList->setCurrentText(TQString::null); //default to top-level + d->widget->m_groupList->setCurrentText(TQString()); //default to top-level connect( d->widget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const KABC::Addressee& ) ), this, TQT_SLOT( slotAddresseeSelected( const KABC::Addressee& ) ) ); connect( d->widget->m_infoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotInfoClicked() ) ); diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h index be5349a4..e4fe5a61 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.h +++ b/kopete/libkopete/ui/contactaddednotifydialog.h @@ -43,7 +43,7 @@ namespace UI { * @code Kopete::UI::ContactAddedNotifyDialog *dialog = - new ContactAddedNotifyDialog(contactId, TQString::null,account); + new ContactAddedNotifyDialog(contactId, TQString(),account); TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogApplied())); TQObject::connect(dialog,TQT_SIGNAL(infoClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogInfo())); dialog->show(); @@ -70,6 +70,7 @@ namespace UI { class KOPETE_EXPORT ContactAddedNotifyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * All widget in the dialog that may be hidden. @@ -90,10 +91,10 @@ public: * @param contactId the contactId of the contact which just added the user * @param contactNick the nickname of the contact if available. * @param account is used to display the account icon and informaiton about the account - * @param hide a bitmask of HideWidget used to hide some widget. By default, everything is shown. + * @param hide a bittqmask of HideWidget used to hide some widget. By default, everything is shown. * */ - ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString::null, + ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString(), Kopete::Account *account=0L, uint hide=0x00); /** @@ -152,7 +153,7 @@ signals: * signal to a slot which show a dialog with more info about the * contact. * - * hint: you can use sender() as parent of the new dialog + * hint: you can use sender() as tqparent of the new dialog * @param contactId is the id of the contact passed in the constructor. */ void infoClicked(const TQString &contactId); diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 47d3f070..6517c1e0 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ContactAddedNotifyWidget</class> <author>Olivier Goffart</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -17,20 +17,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_label</cstring> </property> <property name="text"> <string>The contact XXX added you in his contactlist</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>20</height> @@ -63,7 +63,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_authorizeCb</cstring> </property> @@ -74,7 +74,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_addCb</cstring> </property> @@ -85,7 +85,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_contactInfoBox</cstring> </property> @@ -96,15 +96,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -133,15 +133,15 @@ Leave it empty if you want to see the contact nickname as display name.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -173,7 +173,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -181,9 +181,9 @@ Leave it empty if you want to see the contact nickname as display name.</string> <string>Addressbook link:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -199,7 +199,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -225,7 +225,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -248,7 +248,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <header>addressbooklinkwidget.h</header> </customwidget> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui index 3d697b0f..412ea20e 100644 --- a/kopete/libkopete/ui/fileconfirmbase.ui +++ b/kopete/libkopete/ui/fileconfirmbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>FileConfirmBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FileConfirmBase</cstring> </property> @@ -25,18 +25,18 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>A user is trying to send you a file. The file will only be downloaded if you accept this dialog. If you do not wish to receive it, please click 'Refuse'. This file will never be executed by Kopete at any point during or after the transfer.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -44,7 +44,7 @@ <string>From:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -65,7 +65,7 @@ <string>&Browse...</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel11</cstring> </property> @@ -73,7 +73,7 @@ <string>Size:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -81,7 +81,7 @@ <string>Description:</string> </property> </widget> - <widget class="QTextEdit" row="3" column="1" rowspan="2" colspan="2"> + <widget class="TQTextEdit" row="3" column="1" rowspan="2" colspan="2"> <property name="name"> <cstring>m_description</cstring> </property> @@ -99,14 +99,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel13</cstring> </property> @@ -140,7 +140,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets index 7c441d0f..14a6b4e6 100644 --- a/kopete/libkopete/ui/kopete.widgets +++ b/kopete/libkopete/ui/kopete.widgets @@ -13,12 +13,12 @@ Group=Views (Kopete) ToolTip=List View Search Line (Kopete) WhatsThis=Search line able to use Kopete custom list View. IncludeFile=kopetelistviewsearchline.h -ConstructorArgs=(parent, 0, name) +ConstructorArgs=(tqparent, 0, name) Group=Input (Kopete) [Kopete::UI::AddressBookLinkWidget] ToolTip=Address Book Link Widget (Kopete) WhatsThis=KABC::Addressee display/selector IncludeFile=addressbooklinkwidget.h -ConstructorArgs=(parent, name) +ConstructorArgs=(tqparent, name) Group=Input (Kopete) diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui index 783fe4da..26eb3590 100644 --- a/kopete/libkopete/ui/kopeteawaydialogbase.ui +++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KopeteAwayDialog_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopeteAwayDialog_Base</cstring> </property> @@ -19,14 +19,14 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>Please specify an away message, or choose a predefined one.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -81,5 +81,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp index cc6754d2..c3938aff 100644 --- a/kopete/libkopete/ui/kopetecontactaction.cpp +++ b/kopete/libkopete/ui/kopetecontactaction.cpp @@ -22,9 +22,9 @@ #include "kopeteonlinestatus.h" KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver, - const char *slot, KAction *parent ) -: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), KShortcut(), - parent, contact->contactId().latin1() ) + const char *slot, KAction *tqparent ) +: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().iconFor( contact ) ), KShortcut(), + tqparent, contact->contactId().latin1() ) { m_contact = contact; diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h index ba170ebb..73c39bb7 100644 --- a/kopete/libkopete/ui/kopetecontactaction.h +++ b/kopete/libkopete/ui/kopetecontactaction.h @@ -32,12 +32,13 @@ class Contact; class KOPETE_EXPORT KopeteContactAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Create a new KopeteContactAction */ - KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* parent ); + KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* tqparent ); ~KopeteContactAction(); Kopete::Contact * contact() const; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index fffeec66..bf456663 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -31,8 +31,8 @@ #include "kopetemetacontact.h" #include "kopetecontact.h" -KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *parent, const char *name ) -: KDialogBase( parent, name, false, i18n( "A User Would Like to Send You a File" ), +KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *tqparent, const char *name ) +: KDialogBase( tqparent, name, false, i18n( "A User Would Like to Send You a File" ), KDialogBase::User1 | KDialogBase::User2, KDialogBase::User1, true, i18n( "&Refuse" ), i18n( "&Accept" ) ), m_info( info ) { @@ -40,15 +40,15 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo m_emited=false; m_view=new FileConfirmBase(this, "FileConfirmView"); - m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) + - info.contact()->contactId() + TQString::fromLatin1( "> " ) ); + m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::tqfromLatin1( " <" ) + + info.contact()->contactId() + TQString::tqfromLatin1( "> " ) ); m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); m_view->m_description->setText( description ); m_view->m_filename->setText( info.file() ); KGlobal::config()->setGroup("File Transfer"); const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); - m_view->m_saveto->setText(defaultPath + TQString::fromLatin1( "/" ) + info.file() ); + m_view->m_saveto->setText(defaultPath + TQString::tqfromLatin1( "/" ) + info.file() ); setMainWidget(m_view); @@ -61,7 +61,7 @@ KopeteFileConfirmDialog::~KopeteFileConfirmDialog() void KopeteFileConfirmDialog::slotBrowsePressed() { - TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::fromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); + TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::tqfromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); if ( !saveFileName.isNull()) { m_view->m_saveto->setText(saveFileName); @@ -83,7 +83,7 @@ void KopeteFileConfirmDialog::slotUser2() if(TQFile(m_view->m_saveto->text()).exists()) { - int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").arg(m_view->m_saveto->text()) , + int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").tqarg(m_view->m_saveto->text()) , i18n("Overwrite File") , KStdGuiItem::save()); if(ret==KMessageBox::Cancel) return; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.h b/kopete/libkopete/ui/kopetefileconfirmdialog.h index ac5d19a4..0292f4d7 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.h +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.h @@ -31,9 +31,10 @@ class FileConfirmBase; class KopeteFileConfirmDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString::null, TQWidget *parent=0, const char* name=0); + KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *tqparent=0, const char* name=0); ~KopeteFileConfirmDialog(); private: diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index 9630592c..eb755f29 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -41,13 +41,13 @@ namespace ListView { /* Custom TQToolTip for the list view. The decision whether or not to show tooltips is taken in - maybeTip(). See also the TQListView sources from Qt itself. + maybeTip(). See also the TQListView sources from TQt itself. Delegates to the list view items. */ -class ToolTip : public QToolTip +class ToolTip : public TQToolTip { public: - ToolTip( TQWidget *parent, ListView *lv ); + ToolTip( TQWidget *tqparent, ListView *lv ); virtual ~ToolTip(); void maybeTip( const TQPoint &pos ); @@ -56,8 +56,8 @@ private: ListView *m_listView; }; -ToolTip::ToolTip( TQWidget *parent, ListView *lv ) - : TQToolTip( parent ) +ToolTip::ToolTip( TQWidget *tqparent, ListView *lv ) + : TQToolTip( tqparent ) { m_listView = lv; } @@ -68,19 +68,19 @@ ToolTip::~ToolTip() void ToolTip::maybeTip( const TQPoint &pos ) { - if( !parentWidget() || !m_listView ) + if( !tqparentWidget() || !m_listView ) return; if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) ) { - TQRect itemRect = m_listView->itemRect( item ); + TQRect tqitemRect = m_listView->tqitemRect( item ); uint leftMargin = m_listView->treeStepSize() * ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + m_listView->itemMargin(); - uint xAdjust = itemRect.left() + leftMargin; - uint yAdjust = itemRect.top(); + uint xAdjust = tqitemRect.left() + leftMargin; + uint yAdjust = tqitemRect.top(); TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); std::pair<TQString,TQRect> toolTip = item->toolTip( relativePos ); @@ -88,7 +88,7 @@ void ToolTip::maybeTip( const TQPoint &pos ) return; toolTip.second.moveBy( xAdjust, yAdjust ); -// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: itemRect: " +// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: tqitemRect: " // << toolTip.second << ", tooltip: " << toolTip.first << endl; tip( toolTip.second, toolTip.first ); } @@ -102,8 +102,8 @@ struct ListView::Private Private() {} }; -ListView::ListView( TQWidget *parent, const char *name ) - : KListView( parent, name ), d( new Private ) +ListView::ListView( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ), d( new Private ) { connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) ); @@ -120,9 +120,9 @@ ListView::ListView( TQWidget *parent, const char *name ) clearWFlags( WStaticContents ); setWFlags( WNoAutoErase ); - // clear the appropriate flags from the viewport - qt docs say we have to mask + // clear the appropriate flags from the viewport - qt docs say we have to tqmask // these flags out of the TQListView to make weirdly painted list items work, but - // that doesn't do the job. masking them out of the viewport does. + // that doesn't do the job. tqmasking them out of the viewport does. // class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; }; // static_cast<MyWidget*>( viewport() )->clearWFlags( WStaticContents ); // static_cast<MyWidget*>( viewport() )->setWFlags( WNoAutoErase ); @@ -174,7 +174,7 @@ void ListView::setShowTreeLines( bool bShowAsTree ) setRootIsDecorated( false ); setTreeStepSize( 0 ); } - // TODO: relayout all items. their width may have changed, but they won't know about it. + // TODO: retqlayout all items. their width may have changed, but they won't know about it. } /* This is a small hack ensuring that only F2 triggers inline @@ -188,12 +188,12 @@ void ListView::setShowTreeLines( bool bShowAsTree ) void ListView::keyPressEvent( TQKeyEvent *e ) { TQListViewItem *item = currentItem(); - if ( (e->key() == Qt::Key_F2) && item && item->isVisible() ) + if ( (e->key() == TQt::Key_F2) && item && item->isVisible() ) rename( item, 0 ); - else if ( (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) && item && item->isVisible() ) + else if ( (e->key() == TQt::Key_Enter || e->key() == TQt::Key_Return) && item && item->isVisible() ) { // must provide a point within the item; emitExecute checks for this - TQPoint p = viewport()->mapToGlobal(itemRect(item).center()); + TQPoint p = viewport()->mapToGlobal(tqitemRect(item).center()); emitExecute( currentItem(), p, 0 ); } else diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h index 2e065212..05102e53 100644 --- a/kopete/libkopete/ui/kopetelistview.h +++ b/kopete/libkopete/ui/kopetelistview.h @@ -32,9 +32,10 @@ namespace ListView { class ListView : public KListView { Q_OBJECT + TQ_OBJECT public: - ListView( TQWidget *parent = 0, const char *name = 0 ); + ListView( TQWidget *tqparent = 0, const char *name = 0 ); ~ListView(); /** diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index e02b14b3..1b1f7b6c 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -1,5 +1,5 @@ /* - kopetelistviewitem.cpp - Kopete's modular QListViewItems + kopetelistviewitem.cpp - Kopete's modular TQListViewItems Copyright (c) 2005 by Engin AYDOGAN <engin@bzzzt.biz> Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk> @@ -76,7 +76,7 @@ Component *ComponentBase::componentAt( const TQPoint &pt ) { for ( uint n = 0; n < components(); ++n ) { - if ( component( n )->rect().contains( pt ) ) + if ( component( n )->rect().tqcontains( pt ) ) { if ( Component *comp = component( n )->componentAt( pt ) ) return comp; @@ -117,10 +117,10 @@ void ComponentBase::componentResized( Component * ) std::pair<TQString,TQRect> ComponentBase::toolTip( const TQPoint &relativePos ) { for ( uint n = 0; n < components(); ++n ) - if ( component( n )->rect().contains( relativePos ) ) + if ( component( n )->rect().tqcontains( relativePos ) ) return component( n )->toolTip( relativePos ); - return std::make_pair( TQString::null, TQRect() ); + return std::make_pair( TQString(), TQRect() ); } void ComponentBase::updateAnimationPosition( int p, int s ) @@ -144,13 +144,13 @@ void ComponentBase::updateAnimationPosition( int p, int s ) class Component::Private { public: - Private( ComponentBase *parent ) - : parent( parent ), minWidth( 0 ), minHeight( 0 ) + Private( ComponentBase *tqparent ) + : tqparent( tqparent ), minWidth( 0 ), minHeight( 0 ) , growHoriz( false ), growVert( false ) , tipSource( 0 ) { } - ComponentBase *parent; + ComponentBase *tqparent; TQRect rect; TQRect startRect, targetRect; int minWidth, minHeight; @@ -159,10 +159,10 @@ public: ToolTipSource *tipSource; }; -Component::Component( ComponentBase *parent ) - : d( new Private( parent ) ) +Component::Component( ComponentBase *tqparent ) + : d( new Private( tqparent ) ) { - d->parent->componentAdded( this ); + d->tqparent->componentAdded( this ); d->show = true; } @@ -170,7 +170,7 @@ int Component::RTTI = Rtti_Component; Component::~Component() { - d->parent->componentRemoved( this ); + d->tqparent->componentRemoved( this ); delete d; } @@ -224,7 +224,7 @@ bool Component::setMinWidth( int width ) if ( d->minWidth == width ) return false; d->minWidth = width; - d->parent->componentResized( this ); + d->tqparent->componentResized( this ); return true; } bool Component::setMinHeight( int height ) @@ -232,11 +232,11 @@ bool Component::setMinHeight( int height ) if ( d->minHeight == height ) return false; d->minHeight = height; - d->parent->componentResized( this ); + d->tqparent->componentResized( this ); return true; } -void Component::layout( const TQRect &newRect ) +void Component::tqlayout( const TQRect &newRect ) { if ( rect().isNull() ) d->startRect = TQRect( newRect.topLeft(), newRect.topLeft() ); @@ -253,7 +253,7 @@ void Component::setRect( const TQRect &rect ) void Component::paint( TQPainter *painter, const TQColorGroup &cg ) { - /*painter->setPen( Qt::red ); + /*painter->setPen( TQt::red ); painter->drawRect( rect() );*/ for ( uint n = 0; n < components(); ++n ) { @@ -262,26 +262,26 @@ void Component::paint( TQPainter *painter, const TQColorGroup &cg ) } } -void Component::repaint() +void Component::tqrepaint() { - d->parent->repaint(); + d->tqparent->tqrepaint(); } -void Component::relayout() +void Component::retqlayout() { - d->parent->relayout(); + d->tqparent->retqlayout(); } void Component::componentAdded( Component *component ) { ComponentBase::componentAdded( component ); - //update( Relayout ); + //update( Retqlayout ); } void Component::componentRemoved( Component *component ) { ComponentBase::componentRemoved( component ); - //update( Relayout ); + //update( Retqlayout ); } // BoxComponent -------- @@ -295,8 +295,8 @@ public: static const int padding = 0; }; -BoxComponent::BoxComponent( ComponentBase *parent, Direction dir ) - : Component( parent ), d( new Private( dir ) ) +BoxComponent::BoxComponent( ComponentBase *tqparent, Direction dir ) + : Component( tqparent ), d( new Private( dir ) ) { } @@ -309,11 +309,11 @@ BoxComponent::~BoxComponent() int BoxComponent::widthForHeight( int height ) { - if ( d->direction != Horizontal ) + if ( d->direction !=Qt::Horizontal ) { int width = 0; for ( uint n = 0; n < components(); ++n ) - width = QMAX( width, component( n )->widthForHeight( height ) ); + width = TQMAX( width, component( n )->widthForHeight( height ) ); return width; } else @@ -327,11 +327,11 @@ int BoxComponent::widthForHeight( int height ) int BoxComponent::heightForWidth( int width ) { - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { int height = 0; for ( uint n = 0; n < components(); ++n ) - height = QMAX( height, component( n )->heightForWidth( width ) ); + height = TQMAX( height, component( n )->heightForWidth( width ) ); return height; } else @@ -349,20 +349,20 @@ void BoxComponent::calcMinSize() for ( uint n = 0; n < components(); ++n ) { Component *comp = component( n ); - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { - max = QMAX( max, comp->minHeight() ); + max = TQMAX( max, comp->minHeight() ); sum += comp->minWidth(); } else { - max = QMAX( max, comp->minWidth() ); + max = TQMAX( max, comp->minWidth() ); sum += comp->minHeight(); } } bool sizeChanged = false; - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { if ( setMinWidth( sum ) ) sizeChanged = true; if ( setMinHeight( max ) ) sizeChanged = true; @@ -374,16 +374,16 @@ void BoxComponent::calcMinSize() } if ( sizeChanged ) - repaint(); + tqrepaint(); else - relayout(); + retqlayout(); } -void BoxComponent::layout( const TQRect &rect ) +void BoxComponent::tqlayout( const TQRect &rect ) { - Component::layout( rect ); + Component::tqlayout( rect ); - bool horiz = (d->direction == Horizontal); + bool horiz = (d->direction ==Qt::Horizontal); int fixedSize = 0; for ( uint n = 0; n < components(); ++n ) { @@ -402,9 +402,9 @@ void BoxComponent::layout( const TQRect &rect ) // that cases we should pretend that we're wide/high enough. int total; if ( horiz ) - total = QMAX( rect.width(), minWidth() ); + total = TQMAX( rect.width(), minWidth() ); else - total = QMAX( rect.height(), minHeight() ); + total = TQMAX( rect.height(), minHeight() ); int remaining = total - fixedSize - padding * (components() - 1); @@ -422,7 +422,7 @@ void BoxComponent::layout( const TQRect &rect ) rc.setHeight( rect.height() ); int minWidth = comp->minWidth(); int desiredWidth = comp->widthForHeight( rect.height() ); - rc.setWidth( QMIN( remaining + minWidth, desiredWidth ) ); + rc.setWidth( TQMIN( remaining + minWidth, desiredWidth ) ); pos += rc.width(); remaining -= rc.width() - minWidth; } @@ -433,11 +433,11 @@ void BoxComponent::layout( const TQRect &rect ) rc.setWidth( rect.width() ); int minHeight = comp->minHeight(); int desiredHeight = comp->heightForWidth( rect.width() ); - rc.setHeight( QMIN( remaining + minHeight, desiredHeight ) ); + rc.setHeight( TQMIN( remaining + minHeight, desiredHeight ) ); pos += rc.height(); remaining -= rc.height() - minHeight; } - comp->layout( rc & rect ); + comp->tqlayout( rc & rect ); pos += padding; } } @@ -482,8 +482,8 @@ public: TQPixmap bottom_pixmap; }; -ContactBoxComponent::ContactBoxComponent(ComponentBase *parent, Direction dir) - : BoxComponent(parent, dir), d(new Private()) +ContactBoxComponent::ContactBoxComponent(ComponentBase *tqparent, Direction dir) + : BoxComponent(tqparent, dir), d(new Private()) {} ContactBoxComponent::~ContactBoxComponent() @@ -518,7 +518,7 @@ void ContactBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void ContactBoxComponent::layout(const TQRect &rect) +void ContactBoxComponent::tqlayout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -529,8 +529,8 @@ void ContactBoxComponent::layout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::layout(d->sub); - Component::layout(rect); + BoxComponent::tqlayout(d->sub); + Component::tqlayout(rect); } int ContactBoxComponent::widthForHeight(int height) @@ -620,8 +620,8 @@ public: TQPixmap bottom_pixmap; }; -GroupBoxComponent::GroupBoxComponent(ComponentBase *parent, Direction dir) - : BoxComponent(parent, dir), d(new Private()) +GroupBoxComponent::GroupBoxComponent(ComponentBase *tqparent, Direction dir) + : BoxComponent(tqparent, dir), d(new Private()) {} GroupBoxComponent::~GroupBoxComponent() @@ -661,7 +661,7 @@ void GroupBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void GroupBoxComponent::layout(const TQRect &rect) +void GroupBoxComponent::tqlayout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -672,8 +672,8 @@ void GroupBoxComponent::layout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::layout(d->sub); - Component::layout(rect); + BoxComponent::tqlayout(d->sub); + Component::tqlayout(rect); } int GroupBoxComponent::widthForHeight(int height) @@ -746,19 +746,19 @@ public: TQPixmap image; }; -ImageComponent::ImageComponent( ComponentBase *parent ) - : Component( parent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *tqparent ) + : Component( tqparent ), d( new Private ) { } int ImageComponent::RTTI = Rtti_ImageComponent; -ImageComponent::ImageComponent( ComponentBase *parent, int minW, int minH ) - : Component( parent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *tqparent, int minW, int minH ) + : Component( tqparent ), d( new Private ) { setMinWidth( minW ); setMinHeight( minH ); - repaint(); + tqrepaint(); } ImageComponent::~ImageComponent() @@ -777,7 +777,7 @@ void ImageComponent::setPixmap( const TQPixmap &img, bool) setMinWidth(d->image.width()); setMinHeight(d->image.height()); - repaint(); + tqrepaint(); } void ImageComponent::paint( TQPainter *painter, const TQColorGroup & ) @@ -790,7 +790,7 @@ void ImageComponent::paint( TQPainter *painter, const TQColorGroup & ) painter->drawPixmap( rc & ourRc, d->image ); } -void ImageComponent::scale( int w, int h, TQImage::ScaleMode mode ) +void ImageComponent::scale( int w, int h, TQ_ScaleMode mode ) { TQImage im = d->image.convertToImage(); setPixmap( TQPixmap( im.smoothScale( w, h, mode ) ) ); @@ -814,7 +814,7 @@ void FaceComponent::setPixmap(const TQPixmap &img, bool) setMinHeight(d->image.height() + 4); } - repaint(); + tqrepaint(); } static TQPoint operator+(const TQPoint &pt, const TQSize &sz) @@ -858,8 +858,8 @@ public: TQFont font; }; -TextComponent::TextComponent( ComponentBase *parent, const TQFont &font, const TQString &text ) - : Component( parent ), d( new Private ) +TextComponent::TextComponent( ComponentBase *tqparent, const TQFont &font, const TQString &text ) + : Component( tqparent ), d( new Private ) { setFont( font ); setText( text ); @@ -881,7 +881,7 @@ void TextComponent::setText( const TQString &text ) { if ( text == d->text ) return; d->text = text; - relayout(); + retqlayout(); calcMinSize(); } @@ -906,7 +906,7 @@ void TextComponent::calcMinSize() else setMinHeight( 0 ); - repaint(); + tqrepaint(); } int TextComponent::widthForHeight( int ) @@ -927,13 +927,13 @@ void TextComponent::setColor( const TQColor &color ) { d->color = color; d->customColor = true; - repaint(); + tqrepaint(); } void TextComponent::setDefaultColor() { d->customColor = false; - repaint(); + tqrepaint(); } void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg ) @@ -944,7 +944,7 @@ void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg ) painter->setPen( cg.text() ); TQString dispStr = KStringHandler::rPixelSqueeze( d->text, TQFontMetrics( font() ), rect().width() ); painter->setFont( font() ); - painter->drawText( rect(), Qt::SingleLine, dispStr ); + painter->drawText( rect(), TQt::SingleLine, dispStr ); } // DisplayNameComponent @@ -956,8 +956,8 @@ public: TQFont font; }; -DisplayNameComponent::DisplayNameComponent( ComponentBase *parent ) - : BoxComponent( parent ), d( new Private ) +DisplayNameComponent::DisplayNameComponent( ComponentBase *tqparent ) + : BoxComponent( tqparent ), d( new Private ) { } @@ -968,9 +968,9 @@ DisplayNameComponent::~DisplayNameComponent() delete d; } -void DisplayNameComponent::layout( const TQRect &rect ) +void DisplayNameComponent::tqlayout( const TQRect &rect ) { - Component::layout( rect ); + Component::tqlayout( rect ); // finally, lay everything out TQRect rc; @@ -989,7 +989,7 @@ void DisplayNameComponent::layout( const TQRect &rect ) if ( comp->rtti() == Rtti_TextComponent ) { comp->show(); - comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), totalWidth - usedWidth, comp->heightForWidth( totalWidth - usedWidth ) ) ); } else { @@ -999,7 +999,7 @@ void DisplayNameComponent::layout( const TQRect &rect ) else { comp->show(); - comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), comp->widthForHeight( rect.height() ), comp->heightForWidth( rect.width() ) ) ); } @@ -1052,7 +1052,7 @@ void DisplayNameComponent::redraw() case Kopete::Emoticons::Image: ic = new ImageComponent( this ); ic->setPixmap( TQPixmap( (*token).picPath ) ); - ic->scale( INT_MAX, fontHeight, TQImage::ScaleMin ); + ic->scale( INT_MAX, fontHeight, TQ_ScaleMin ); break; default: kdDebug( 14010 ) << k_funcinfo << "This should have not happened!" << endl; @@ -1092,8 +1092,8 @@ TQString DisplayNameComponent::text() // HSpacerComponent -------- -HSpacerComponent::HSpacerComponent( ComponentBase *parent ) - : Component( parent ) +HSpacerComponent::HSpacerComponent( ComponentBase *tqparent ) + : Component( tqparent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1108,8 +1108,8 @@ int HSpacerComponent::widthForHeight( int ) // VSpacerComponent -------- -VSpacerComponent::VSpacerComponent( ComponentBase *parent ) - : Component( parent ) +VSpacerComponent::VSpacerComponent( ComponentBase *tqparent ) + : Component( tqparent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1131,7 +1131,7 @@ public: int iconSize; }; -ContactComponent::ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int) : ImageComponent( parent ) , d( new Private ) +ContactComponent::ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int) : ImageComponent( tqparent ) , d( new Private ) { d->contact = contact; d->iconSize = 12; // size of the image is fixed to 12 pixels @@ -1145,7 +1145,7 @@ ContactComponent::~ContactComponent() void ContactComponent::updatePixmap() { - setPixmap( contact()->onlineStatus().iconFor( contact(), d->iconSize ) ); + setPixmap( contact()->onlinetqStatus().iconFor( contact(), d->iconSize ) ); } Kopete::Contact *ContactComponent::contact() { @@ -1160,7 +1160,7 @@ std::pair<TQString,TQRect> ContactComponent::toolTip( const TQPoint &/*relativeP ////////////////// SpacerComponent ///////////////////////// -SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Component( parent ) +SpacerComponent::SpacerComponent( ComponentBase *tqparent, int w, int h ) : Component( tqparent ) { setMinWidth(w); setMinHeight(h); @@ -1172,7 +1172,7 @@ SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Compon * A periodic timer intended to be shared amongst multiple objects. Will run only * if an object is attached to it. */ -class SharedTimer : private QTimer +class SharedTimer : private TQTimer { int period; int users; @@ -1227,17 +1227,17 @@ class Item::Private { public: Private( Item *item ) - : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) + : tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) , animateLayout( true ), opacity( 1.0 ) , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) ) , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true ) { } - TQTimer layoutTimer; + TQTimer tqlayoutTimer; - //TQTimer layoutAnimateTimer; - SharedTimerRef layoutAnimateTimer; + //TQTimer tqlayoutAnimateTimer; + SharedTimerRef tqlayoutAnimateTimer; SharedTimer &theLayoutAnimateTimer() { static SharedTimer timer( 10 ); @@ -1245,8 +1245,8 @@ public: } bool animateLayout; - int layoutAnimateSteps; - static const int layoutAnimateStepsTotal = 10; + int tqlayoutAnimateSteps; + static const int tqlayoutAnimateStepsTotal = 10; float opacity; @@ -1279,14 +1279,14 @@ bool Item::Private::animateChanges = true; bool Item::Private::fadeVisibility = true; bool Item::Private::foldVisibility = true; -Item::Item( TQListViewItem *parent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) +Item::Item( TQListViewItem *tqparent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) { initLVI(); } -Item::Item( TQListView *parent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) +Item::Item( TQListView *tqparent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) { initLVI(); } @@ -1306,8 +1306,8 @@ void Item::setEffects( bool animation, bool fading, bool folding ) void Item::initLVI() { connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) ); - connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); - //connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); + connect( &d->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); + //connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); //connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) ); setVisible( false ); setTargetVisibility( true ); @@ -1316,20 +1316,20 @@ void Item::initLVI() void Item::slotColumnResized() { scheduleLayout(); - // if we've been resized, don't animate the layout + // if we've been resized, don't animate the tqlayout d->animateLayout = false; } void Item::scheduleLayout() { - // perform a delayed layout in order to speed it all up - if ( ! d->layoutTimer.isActive() ) - d->layoutTimer.start( 30, true ); + // perform a delayed tqlayout in order to speed it all up + if ( ! d->tqlayoutTimer.isActive() ) + d->tqlayoutTimer.start( 30, true ); } void Item::slotLayoutItems() { - d->layoutTimer.stop(); + d->tqlayoutTimer.stop(); for ( uint n = 0; n < components(); ++n ) { @@ -1341,20 +1341,20 @@ void Item::slotLayoutItems() } int height = component( n )->heightForWidth( width ); - component( n )->layout( TQRect( 0, 0, width, height ) ); + component( n )->tqlayout( TQRect( 0, 0, width, height ) ); //kdDebug(14000) << k_funcinfo << "Component " << n << " is " << width << " x " << height << endl; } if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() ) { - d->layoutAnimateTimer.start(); - //if ( !d->layoutAnimateTimer.isActive() ) - // d->layoutAnimateTimer.start( 10 ); - d->layoutAnimateSteps = 0; + d->tqlayoutAnimateTimer.start(); + //if ( !d->tqlayoutAnimateTimer.isActive() ) + // d->tqlayoutAnimateTimer.start( 10 ); + d->tqlayoutAnimateSteps = 0; } else { - d->layoutAnimateSteps = Private::layoutAnimateStepsTotal; + d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal; d->animateLayout = true; } slotLayoutAnimateItems(); @@ -1362,15 +1362,15 @@ void Item::slotLayoutItems() void Item::slotLayoutAnimateItems() { - if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal ) - d->layoutAnimateTimer.stop(); + if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal ) + d->tqlayoutAnimateTimer.stop(); - const int s = Private::layoutAnimateStepsTotal; - const int p = QMIN( d->layoutAnimateSteps, s ); + const int s = Private::tqlayoutAnimateStepsTotal; + const int p = TQMIN( d->tqlayoutAnimateSteps, s ); updateAnimationPosition( p, s ); setHeight(0); - repaint(); + tqrepaint(); } float Item::opacity() @@ -1382,7 +1382,7 @@ void Item::setOpacity( float opacity ) { if ( d->opacity == opacity ) return; d->opacity = opacity; - repaint(); + tqrepaint(); } void Item::setSearchMatch( bool match ) @@ -1411,7 +1411,7 @@ void Item::setTargetVisibility( bool vis ) { if ( d->visibilityTarget == vis ) { - // in case we're getting called because our parent was shown and + // in case we're getting called because our tqparent was shown and // we need to be rehidden if ( !d->visibilityTimer.isActive() ) setVisible( vis && d->searchMatch ); @@ -1451,18 +1451,18 @@ void Item::slotUpdateVisibility() setVisible( false ); } setHeight( 0 ); - repaint(); + tqrepaint(); } -void Item::repaint() +void Item::tqrepaint() { - // if we're about to relayout, don't bother painting yet. - if ( d->layoutTimer.isActive() ) + // if we're about to retqlayout, don't bother painting yet. + if ( d->tqlayoutTimer.isActive() ) return; - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); } -void Item::relayout() +void Item::retqlayout() { scheduleLayout(); } @@ -1477,11 +1477,11 @@ void Item::setHeight( int ) { int minHeight = 0; for ( uint n = 0; n < components(); ++n ) - minHeight = QMAX( minHeight, component( n )->rect().height() ); + minHeight = TQMAX( minHeight, component( n )->rect().height() ); //kdDebug(14000) << k_funcinfo << "Height is " << minHeight << endl; if ( Private::foldVisibility && d->visibilityTimer.isActive() ) { - int vis = QMIN( d->visibilityLevel, Private::visibilityFoldSteps ); + int vis = TQMIN( d->visibilityLevel, Private::visibilityFoldSteps ); minHeight = (minHeight * vis) / Private::visibilityFoldSteps; } KListViewItem::setHeight( minHeight ); @@ -1489,7 +1489,7 @@ void Item::setHeight( int ) int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const { - // Qt computes the itemRect from this. we want the whole item to be + // TQt computes the tqitemRect from this. we want the whole item to be // clickable, so we return the widest we could possibly be. return lv->header()->sectionSize( c ); } @@ -1503,11 +1503,11 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt // set the alternate cell background colour if necessary TQColorGroup _cg = cg; if (isAlternate()) - if (listView()->viewport()->backgroundMode()==Qt::FixedColor) + if (listView()->viewport()->backgroundMode()==TQt::FixedColor) _cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); else _cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); - // PASTED FROM QLISTVIEWITEM + // PASTED FROM TQLISTVIEWITEM { TQPainter *p = &paint; @@ -1519,7 +1519,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt // any text we render is done by the Components, not by this class, so make sure we've nothing to write TQString t; - // removed text truncating code from Qt - we do that differently, further on + // removed text truncating code from TQt - we do that differently, further on int marg = lv->itemMargin(); int r = marg; @@ -1528,20 +1528,20 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), _cg.brush( crole ) ); else { // all copied from TQListView::paintEmptyArea //lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); - TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and QHeader + TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and TQHeader TQStyle::SFlags how = TQStyle::Style_Default; if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->style().drawComplexControl( TQStyle::CC_ListView, - p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), + lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, + p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); } @@ -1552,20 +1552,20 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt (column == 0 || lv->allColumnsShowFocus()) ) { p->fillRect( r - marg, 0, width - r + marg, height(), _cg.brush( TQColorGroup::Highlight ) ); - // removed text pen setting code from Qt + // removed text pen setting code from TQt } - // removed icon drawing code from Qt + // removed icon drawing code from TQt // draw the tree gubbins if ( multiLinesEnabled() && column == 0 && isOpen() && childCount() ) { int textheight = fm.size( align, t ).height() + 2 * lv->itemMargin(); - textheight = QMAX( textheight, TQApplication::globalStrut().height() ); + textheight = TQMAX( textheight, TQApplication::globalStrut().height() ); if ( textheight % 2 > 0 ) textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, + lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default, TQStyle::SC_ListViewExpand, @@ -1589,7 +1589,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt float opac = 1.0; if ( d->visibilityTimer.isActive() && Private::fadeVisibility ) { - int vis = QMAX( d->visibilityLevel - Private::visibilityFoldSteps, 0 ); + int vis = TQMAX( d->visibilityLevel - Private::visibilityFoldSteps, 0 ); opac = float(vis) / Private::visibilityFadeSteps; } opac *= opacity(); diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h index 77d06540..ac19c4b8 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.h +++ b/kopete/libkopete/ui/kopetelistviewitem.h @@ -1,5 +1,5 @@ /* - kopetelistviewitem.h - Kopete's modular QListViewItems + kopetelistviewitem.h - Kopete's modular TQListViewItems Copyright (c) 2005 by Engin AYDOGAN <engin@bzzzt.biz> Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk> @@ -44,9 +44,9 @@ public: Component *componentAt( const TQPoint &pt ); /** Repaint this item */ - virtual void repaint() = 0; - /** Relayout this item */ - virtual void relayout() = 0; + virtual void tqrepaint() = 0; + /** Retqlayout this item */ + virtual void retqlayout() = 0; /** * Get the tool tip string and rectangle for a tip request at position @@ -64,7 +64,7 @@ protected: virtual void componentRemoved( Component *component ); /** A child item has been resized */ virtual void componentResized( Component *component ); - /** Remove all children */ + /** Remove all tqchildren */ virtual void clear(); /** @internal animate items */ @@ -102,7 +102,7 @@ public: class Component : public ComponentBase { protected: - Component( ComponentBase *parent ); + Component( ComponentBase *tqparent ); public: virtual ~Component() = 0; @@ -110,18 +110,18 @@ public: * Set the size and position of this item relative to the list view item. Should * only be called by the containing item. * @param rect the new rectangle this component will paint in, relative to the painter - * passed to the paint() function by the parent item. + * passed to the paint() function by the tqparent item. */ - virtual void layout( const TQRect &rect ); + virtual void tqlayout( const TQRect &rect ); /** * Paint this item, inside the rectangle returned by rect(). - * The default implementation calls paint on all children. + * The default implementation calls paint on all tqchildren. */ virtual void paint( TQPainter *painter, const TQColorGroup &cg ); - void repaint(); - void relayout(); + void tqrepaint(); + void retqlayout(); /** * @return the rect this component was allocated last time it was laid out @@ -181,8 +181,8 @@ public: /** * RTTI: Runtime Type Information - * Exactly the same as Qt's approach to identify types of - * QCanvasItems. + * Exactly the same as TQt's approach to identify types of + * TQCanvasItems. */ enum RttiValues { @@ -196,20 +196,20 @@ public: protected: /** * Change the minimum width, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your layout() function. + * to be at all useful. Note: do not call this from your tqlayout() function. * @param width the minimum width * @return true if the size has actually changed, false if it's been set to - * the existing values. if it returns true, you do not need to relayout, - * since the parent component will do that for you. + * the existing values. if it returns true, you do not need to retqlayout, + * since the tqparent component will do that for you. */ bool setMinWidth( int width ); /** * Change the minimum height, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your layout() function. + * to be at all useful. Note: do not call this from your tqlayout() function. * @param height the minimum height * @return true if the size has actually changed, false if it's been set to - * the existing values. If it returns true, you do not need to relayout, - * since the parent component will do that for you. + * the existing values. If it returns true, you do not need to retqlayout, + * since the tqparent component will do that for you. */ bool setMinHeight( int height ); @@ -232,11 +232,11 @@ private: class BoxComponent : public Component { public: - enum Direction { Horizontal, Vertical }; - BoxComponent( ComponentBase *parent, Direction dir = Horizontal ); + enum Direction {Horizontal,Vertical }; + BoxComponent( ComponentBase *tqparent, Direction dir =Horizontal ); ~BoxComponent(); - virtual void layout( const TQRect &rect ); + virtual void tqlayout( const TQRect &rect ); virtual int widthForHeight( int height ); virtual int heightForWidth( int width ); @@ -262,12 +262,12 @@ private: class ContactBoxComponent : public BoxComponent { public: - ContactBoxComponent(ComponentBase *parent, Direction dir = Horizontal); + ContactBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); ~ContactBoxComponent(); virtual void reloadTheme(); - virtual void layout(const TQRect &rect); + virtual void tqlayout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -285,12 +285,12 @@ private: class GroupBoxComponent : public BoxComponent { public: - GroupBoxComponent(ComponentBase *parent, Direction dir = Horizontal); + GroupBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); ~GroupBoxComponent(); virtual void reloadTheme(); - virtual void layout(const TQRect &rect); + virtual void tqlayout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -305,7 +305,7 @@ private: class TextComponent : public Component { public: - TextComponent( ComponentBase *parent, const TQFont &font = TQFont(), const TQString &text = TQString::null ); + TextComponent( ComponentBase *tqparent, const TQFont &font = TQFont(), const TQString &text = TQString() ); ~TextComponent(); TQString text(); @@ -335,8 +335,8 @@ private: class ImageComponent : public Component { public: - ImageComponent( ComponentBase *parent ); - ImageComponent( ComponentBase *parent, int minW, int minH ); + ImageComponent( ComponentBase *tqparent ); + ImageComponent( ComponentBase *tqparent, int minW, int minH ); ~ImageComponent(); virtual void setPixmap( const TQPixmap &img, bool adjustSize = true); @@ -344,7 +344,7 @@ public: virtual void paint( TQPainter *painter, const TQColorGroup &cg ); - virtual void scale( int w, int h, TQImage::ScaleMode ); + virtual void scale( int w, int h, TQ_ScaleMode ); static int RTTI; virtual int rtti() const { return RTTI; } protected: @@ -358,8 +358,8 @@ protected: class FaceComponent : public ImageComponent { public: - FaceComponent(ComponentBase *parent): ImageComponent(parent) {} - FaceComponent(ComponentBase *parent, int minW, int minH): ImageComponent(parent, minH, minW) {} + FaceComponent(ComponentBase *tqparent): ImageComponent(tqparent) {} + FaceComponent(ComponentBase *tqparent, int minW, int minH): ImageComponent(tqparent, minH, minW) {} void setPixmap(const TQPixmap &img, bool adjustSize = true); void paint(TQPainter *painter, const TQColorGroup &cg); @@ -371,7 +371,7 @@ public: class ContactComponent : public ImageComponent { public: - ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int iconSize); + ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int iconSize); ~ContactComponent(); void updatePixmap(); Kopete::Contact *contact(); @@ -387,7 +387,7 @@ protected: class SpacerComponent : public Component { public: - SpacerComponent( ComponentBase *parent, int w, int h ); + SpacerComponent( ComponentBase *tqparent, int w, int h ); }; /** @@ -400,13 +400,13 @@ public: /** * Constructor */ - DisplayNameComponent( ComponentBase *parent ); + DisplayNameComponent( ComponentBase *tqparent ); /** * Dtor */ ~DisplayNameComponent(); - void layout( const TQRect& rect ); + void tqlayout( const TQRect& rect ); TQString text(); void setText( const TQString& text ); @@ -428,7 +428,7 @@ private: class HSpacerComponent : public Component { public: - HSpacerComponent( ComponentBase *parent ); + HSpacerComponent( ComponentBase *tqparent ); int widthForHeight( int ); static int RTTI; @@ -438,7 +438,7 @@ public: class VSpacerComponent : public Component { public: - VSpacerComponent( ComponentBase *parent ); + VSpacerComponent( ComponentBase *tqparent ); int heightForWidth( int ); static int RTTI; @@ -454,13 +454,14 @@ public: class Item : public TQObject, public KListViewItem, public ComponentBase { Q_OBJECT + TQ_OBJECT public: - Item( TQListView *parent, TQObject *owner = 0, const char *name = 0 ); - Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListViewItem *tqparent, TQObject *owner = 0, const char *name = 0 ); ~Item(); - void repaint(); - void relayout(); + void tqrepaint(); + void retqlayout(); void setup(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp index edb63ffc..1ab9c398 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.cpp +++ b/kopete/libkopete/ui/kopetelistviewsearchline.cpp @@ -24,13 +24,13 @@ namespace Kopete { namespace UI { namespace ListView { -SearchLine::SearchLine( TQWidget *parent, ListView *listView, const char *name ) - : KListViewSearchLine( parent, listView, name ) +SearchLine::SearchLine( TQWidget *tqparent, ListView *listView, const char *name ) + : KListViewSearchLine( tqparent, listView, name ) { } -SearchLine::SearchLine(TQWidget *parent, const char *name) - : KListViewSearchLine( parent, 0, name ) +SearchLine::SearchLine(TQWidget *tqparent, const char *name) + : KListViewSearchLine( tqparent, 0, name ) { } @@ -67,7 +67,7 @@ void SearchLine::updateSearch( const TQString &s ) for( TQListViewItemIterator it(listView(), TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); it.current() && !currentItem; ++it ) { - if( listView()->itemRect( it.current() ).isValid() ) + if( listView()->tqitemRect( it.current() ).isValid() ) currentItem = it.current(); } } diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h index be7fc317..799337e8 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.h +++ b/kopete/libkopete/ui/kopetelistviewsearchline.h @@ -29,6 +29,7 @@ class ListView; class SearchLine : public KListViewSearchLine { Q_OBJECT + TQ_OBJECT public: /** * Constructs a SearchLine with \a listView being the @@ -37,12 +38,12 @@ public: * If \a listView is null then the widget will be disabled until a listview * is set with setListView(). */ - SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 ); + SearchLine( TQWidget *tqparent, ListView *listView = 0, const char *name = 0 ); /** * Constructs a SearchLine without any ListView to filter. The * KListView object has to be set later with setListView(). */ - SearchLine(TQWidget *parent, const char *name); + SearchLine(TQWidget *tqparent, const char *name); /** * Destroys the SearchLine. */ diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui index 7ba4dff9..40a94ca8 100644 --- a/kopete/libkopete/ui/kopetepassworddialog.ui +++ b/kopete/libkopete/ui/kopetepassworddialog.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KopetePasswordDialog</class> <author>Olivier Goffart</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopetePasswordDialog</cstring> </property> @@ -17,15 +17,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_image</cstring> </property> @@ -48,15 +48,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -74,7 +74,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_save_passwd</cstring> </property> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -105,5 +105,5 @@ <tabstop>m_password</tabstop> <tabstop>m_save_passwd</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp index 52921b16..dd798363 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.cpp +++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp @@ -28,8 +28,8 @@ public: uint maxLength; }; -Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *parent, const char *name, Kopete::Password *from ) - : KopetePasswordWidgetBase( parent, name ), d( new Private ) +Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *tqparent, const char *name, Kopete::Password *from ) + : KopetePasswordWidgetBase( tqparent, name ), d( new Private ) { load( from ); } @@ -49,7 +49,7 @@ void Kopete::UI::PasswordWidget::load( Kopete::Password *source ) { mRemembered->setTristate(); mRemembered->setNoChange(); - source->requestWithoutPrompt( this, TQT_SLOT( receivePassword( const TQString & ) ) ); + source->requestWithoutPrompt( TQT_TQOBJECT(this), TQT_SLOT( receivePassword( const TQString & ) ) ); } else { diff --git a/kopete/libkopete/ui/kopetepasswordwidget.h b/kopete/libkopete/ui/kopetepasswordwidget.h index 72834bff..e8c45a90 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.h +++ b/kopete/libkopete/ui/kopetepasswordwidget.h @@ -37,15 +37,16 @@ namespace UI class KOPETE_EXPORT PasswordWidget : public KopetePasswordWidgetBase { Q_OBJECT + TQ_OBJECT public: /** * Creates a Kopete::PasswordWidget. - * @param parent The widget to nest this one inside - * @param name The name of this QObject + * @param tqparent The widget to nest this one inside + * @param name The name of this TQObject * @param from The password to load the data for this widget from, or 0 if none */ - PasswordWidget( TQWidget *parent, const char *name = 0, Kopete::Password *from = 0 ); + PasswordWidget( TQWidget *tqparent, const char *name = 0, Kopete::Password *from = 0 ); ~PasswordWidget(); /** diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui index 5f6b665a..ecdfda7a 100644 --- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui +++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KopetePasswordWidgetBase</class> <author>Richard Smith <kde@metafoo.co.uk></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopetePasswordWidgetBase</cstring> </property> @@ -28,7 +28,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mRemembered</cstring> </property> @@ -49,14 +49,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -91,7 +91,7 @@ <tabstops> <tabstop>mRemembered</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpassdlg.h</includehint> </includehints> diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp index f1595f4e..cd8f2326 100644 --- a/kopete/libkopete/ui/kopetestdaction.cpp +++ b/kopete/libkopete/ui/kopetestdaction.cpp @@ -36,12 +36,12 @@ KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L; -KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const char *name ) +KopetePreferencesAction::KopetePreferencesAction( KActionCollection *tqparent, const char *name ) #if KDE_IS_VERSION( 3, 3, 90 ) -: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name ) +: KAction( KStdGuiItem::configure(), 0, 0, 0, tqparent, name ) #else : KAction( KGuiItem( i18n( "&Configure Kopete..." ), - TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name ) + TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, tqparent, name ) #endif { connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) ); @@ -63,64 +63,64 @@ void KopetePreferencesAction::slotShowPreferences() KWin::activateWindow( s_settingsDialog->dialog()->winId() ); } -KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *name ) +KAction * KopeteStdAction::preferences( KActionCollection *tqparent, const char *name ) { - return new KopetePreferencesAction( parent, name ); + return new KopetePreferencesAction( tqparent, name ); } -KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), Qt::Key_Delete, recvr, slot, parent, name ); + return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) +KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) { - return new KAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) +KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) { - return new KAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, tqparent, name ); } #include "kopetestdaction.moc" diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h index bd323943..06bb40eb 100644 --- a/kopete/libkopete/ui/kopetestdaction.h +++ b/kopete/libkopete/ui/kopetestdaction.h @@ -35,64 +35,64 @@ public: * Standard action to start a chat */ static KAction *chat( const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0 ); + TQObject* tqparent, const char *name = 0 ); /** * Standard action to send a single message */ static KAction *sendMessage(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to open a user info dialog */ static KAction *contactInfo(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to open a history dialog or something similar */ static KAction *viewHistory(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to initiate sending a file to a contact */ static KAction *sendFile(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to change a contacts @ref Kopete::MetaContact */ static KAction *changeMetaContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to add a group */ static KAction *addGroup(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to delete a contact */ static KAction *deleteContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to change a contact alias/nickname in your contactlist */ static KAction *changeAlias(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to block a contact */ static KAction *blockContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to unblock a contact */ static KAction *unblockContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Return an action to change the Kopete preferences. * * The object has no signal/slot, the prefs are automatically shown */ - static KAction *preferences(KActionCollection *parent, const char *name = 0); + static KAction *preferences(KActionCollection *tqparent, const char *name = 0); }; @@ -104,9 +104,10 @@ namespace KSettings class KOPETE_EXPORT KopetePreferencesAction : public KAction { Q_OBJECT + TQ_OBJECT public: - KopetePreferencesAction( KActionCollection *parent, const char *name = 0 ); + KopetePreferencesAction( KActionCollection *tqparent, const char *name = 0 ); ~KopetePreferencesAction(); protected slots: diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h index c54b1dba..99655e39 100644 --- a/kopete/libkopete/ui/kopeteview.h +++ b/kopete/libkopete/ui/kopeteview.h @@ -31,7 +31,7 @@ namespace Kopete /** * @author Jason Keirstead * - * Abstract parent class for all types of views used for messaging.These view objects + * Abstract tqparent class for all types of views used for messaging.These view objects * are provided by a @ref Kopete::ViewPlugin * * @see Kopete::ViewPlugin @@ -42,7 +42,7 @@ class KOPETE_EXPORT KopeteView /** * constructor */ - KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *parent ); + KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *tqparent ); virtual ~KopeteView(); /** diff --git a/kopete/libkopete/ui/kopeteviewplugin.cpp b/kopete/libkopete/ui/kopeteviewplugin.cpp index 843fe939..d1d0375e 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.cpp +++ b/kopete/libkopete/ui/kopeteviewplugin.cpp @@ -16,8 +16,8 @@ #include "kopeteviewplugin.h" -Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *parent, const char *name ) : - Kopete::Plugin( instance, parent, name ) +Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *tqparent, const char *name ) : + Kopete::Plugin( instance, tqparent, name ) { } diff --git a/kopete/libkopete/ui/kopeteviewplugin.h b/kopete/libkopete/ui/kopeteviewplugin.h index 25ce704b..ccef3950 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.h +++ b/kopete/libkopete/ui/kopeteviewplugin.h @@ -41,7 +41,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin /** * @brief Create and initialize the plugin */ - ViewPlugin( KInstance *instance, TQObject *parent = 0L, const char *name = 0L ); + ViewPlugin( KInstance *instance, TQObject *tqparent = 0L, const char *name = 0L ); /** * @brief Creates a view to be associated with the passed in session diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp index 916b0faf..e424dc45 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -13,7 +13,7 @@ #include <kstandarddirs.h> #endif -class KopeteWidgets : public QWidgetPlugin +class KopeteWidgets : public TQWidgetPlugin { public: KopeteWidgets(); @@ -28,7 +28,7 @@ public: return result; } - virtual TQWidget *create(const TQString &key, TQWidget *parent = 0, const char *name = 0); + virtual TQWidget *create(const TQString &key, TQWidget *tqparent = 0, const char *name = 0); virtual TQIconSet iconSet(const TQString &key) const { @@ -36,7 +36,7 @@ public: TQPixmap pix(m_widgets[key].iconSet); #else TQPixmap pix(locate( "data", - TQString::fromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); + TQString::tqfromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); #endif return TQIconSet(pix); } @@ -71,41 +71,41 @@ KopeteWidgets::KopeteWidgets() { WidgetInfo widget; - widget.group = TQString::fromLatin1("Input (Kopete)"); + widget.group = TQString::tqfromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__addressbooklinkwidget_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__addressbooklinkwidget.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__addressbooklinkwidget.png"); #endif - widget.includeFile = TQString::fromLatin1("addressbooklinkwidget.h"); - widget.toolTip = TQString::fromLatin1("Address Book Link Widget (Kopete)"); - widget.whatsThis = TQString::fromLatin1("KABC::Addressee display/selector"); + widget.includeFile = TQString::tqfromLatin1("addressbooklinkwidget.h"); + widget.toolTip = TQString::tqfromLatin1("Address Book Link Widget (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("KABC::Addressee display/selector"); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); - widget.group = TQString::fromLatin1("Views (Kopete)"); + widget.group = TQString::tqfromLatin1("Views (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__listview_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__listview__listview.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__listview.png"); #endif - widget.includeFile = TQString::fromLatin1("kopetelistview.h"); - widget.toolTip = TQString::fromLatin1("List View (Kopete)"); - widget.whatsThis = TQString::fromLatin1("A component capable list view widget."); + widget.includeFile = TQString::tqfromLatin1("kopetelistview.h"); + widget.toolTip = TQString::tqfromLatin1("List View (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("A component capable list view widget."); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::ListView"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::ListView"), widget); - widget.group = TQString::fromLatin1("Input (Kopete)"); + widget.group = TQString::tqfromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__searchline_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__listview__searchline.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__searchline.png"); #endif - widget.includeFile = TQString::fromLatin1("kopetelistviewsearchline.h"); - widget.toolTip = TQString::fromLatin1("List View Search Line (Kopete)"); - widget.whatsThis = TQString::fromLatin1("Search line able to use Kopete custom list View."); + widget.includeFile = TQString::tqfromLatin1("kopetelistviewsearchline.h"); + widget.toolTip = TQString::tqfromLatin1("List View Search Line (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("Search line able to use Kopete custom list View."); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"), widget); new KInstance("kopetewidgets"); } @@ -113,19 +113,19 @@ KopeteWidgets::~KopeteWidgets() { } -TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *parent, const char *name) +TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *tqparent, const char *name) { - if (key == TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget")) - return new Kopete::UI::AddressBookLinkWidget(parent, name); + if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget")) + return new Kopete::UI::AddressBookLinkWidget(tqparent, name); - if (key == TQString::fromLatin1("Kopete::UI::ListView::ListView")) - return new Kopete::UI::ListView::ListView(parent, name); + if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView")) + return new Kopete::UI::ListView::ListView(tqparent, name); - if (key == TQString::fromLatin1("Kopete::UI::ListView::SearchLine")) - return new Kopete::UI::ListView::SearchLine(parent, 0, name); + if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine")) + return new Kopete::UI::ListView::SearchLine(tqparent, 0, name); return 0; } -KDE_Q_EXPORT_PLUGIN(KopeteWidgets) +KDE_TQ_EXPORT_PLUGIN(KopeteWidgets) diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 34a4c35c..61a4f14e 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -68,7 +68,7 @@ public: }; -MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(parent, owner, name) , d( new Private() ) +MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(tqparent, owner, name) , d( new Private() ) { d->metaContact = mc; d->photoSize = 60; @@ -112,12 +112,12 @@ void MetaContactSelectorWidgetLVI::slotPhotoChanged() { int photoSize = d->photoSize; - photoImg = photoImg.smoothScale( photoSize, photoSize, TQImage::ScaleMin ) ; + photoImg = photoImg.smoothScale( photoSize, photoSize, TQ_ScaleMin ) ; // draw a 1 pixel black border photoPixmap = photoImg; TQPainter p(&photoPixmap); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawLine(0, 0, photoPixmap.width()-1, 0); p.drawLine(0, photoPixmap.height()-1, photoPixmap.width()-1, photoPixmap.height()-1); p.drawLine(0, 0, 0, photoPixmap.height()-1); @@ -181,8 +181,8 @@ public: }; -MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), d( new Private() ) +MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), d( new Private() ) { TQBoxLayout *l = new TQVBoxLayout(this); d->widget = new MetaContactSelectorWidget_Base(this); @@ -244,7 +244,7 @@ void MetaContactSelectorWidget::selectMetaContact( Kopete::MetaContact *mc ) void MetaContactSelectorWidget::excludeMetaContact( Kopete::MetaContact *mc ) { - if( d->excludedMetaContacts.findIndex(mc) == -1 ) + if( d->excludedMetaContacts.tqfindIndex(mc) == -1 ) { d->excludedMetaContacts.append(mc); } @@ -264,7 +264,7 @@ void MetaContactSelectorWidget::slotLoadMetaContacts() TQPtrList<Kopete::MetaContact> metaContacts = Kopete::ContactList::self()->metaContacts(); for( Kopete::MetaContact *mc = metaContacts.first(); mc ; mc = metaContacts.next() ) { - if( !mc->isTemporary() && (d->excludedMetaContacts.findIndex(mc) == -1) ) + if( !mc->isTemporary() && (d->excludedMetaContacts.tqfindIndex(mc) == -1) ) { new MetaContactSelectorWidgetLVI(mc, d->widget->metaContactListView); } diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h index a265f665..cc30f83f 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.h +++ b/kopete/libkopete/ui/metacontactselectorwidget.h @@ -35,11 +35,12 @@ namespace UI * This class provides a widget which allows easy selection * of available Kopete metacontacts. */ -class KOPETE_EXPORT MetaContactSelectorWidget : public QWidget +class KOPETE_EXPORT MetaContactSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - MetaContactSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); + MetaContactSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); ~MetaContactSelectorWidget(); Kopete::MetaContact* metaContact(); /** @@ -80,8 +81,9 @@ private: class MetaContactSelectorWidgetLVI : public Kopete::UI::ListView::Item { Q_OBJECT + TQ_OBJECT public: - MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner = 0, const char *name = 0 ); + MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); Kopete::MetaContact* metaContact(); virtual TQString text ( int column ) const; protected slots: diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui index bc1a38eb..1fd35317 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui +++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MetaContactSelectorWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MetaContactSelectorWidget_Base</cstring> </property> @@ -40,15 +40,15 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblSearch</cstring> </property> @@ -95,10 +95,10 @@ <includes> <include location="local" impldecl="in declaration">kopetelistviewsearchline.h</include> <include location="local" impldecl="in declaration">kopetelistview.h</include> - <include location="global" impldecl="in declaration">qheader.h</include> + <include location="global" impldecl="in declaration">tqheader.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kopetelistviewsearchline.h</includehint> diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp index 0ad7d9c2..0b642e7b 100644 --- a/kopete/libkopete/ui/userinfodialog.cpp +++ b/kopete/libkopete/ui/userinfodialog.cpp @@ -59,7 +59,7 @@ struct UserInfoDialog::UserInfoDialogPrivate { }; UserInfoDialog::UserInfoDialog( const TQString& descr ) -: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).arg( descr ), KDialogBase::Ok ) +: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).tqarg( descr ), KDialogBase::Ok ) { d = new UserInfoDialogPrivate; d->page = new TQWidget( this ); @@ -93,7 +93,7 @@ void UserInfoDialog::setAwayMessage( const TQString& msg ) d->awayMessage = msg; } -void UserInfoDialog::setStatus( const TQString& status ) +void UserInfoDialog::settqStatus( const TQString& status ) { d->status = status; } @@ -138,7 +138,7 @@ TQHBox* UserInfoDialog::addLabelEdit( const TQString& label, const TQString& tex TQHBox *box = new TQHBox( d->page ); new TQLabel( label, box ); edit = new KLineEdit( box ); - edit->setAlignment( Qt::AlignHCenter ); + edit->tqsetAlignment( TQt::AlignHCenter ); edit->setText( text ); edit->setReadOnly( true ); return box; @@ -182,7 +182,7 @@ void UserInfoDialog::fillHTML() } if ( d->status.isEmpty() ) { - text.append( "<div id=\"status\"><b>" + i18n("Status : ") + "</b>" ); + text.append( "<div id=\"status\"><b>" + i18n("tqStatus : ") + "</b>" ); text.append( d->status + "</div><br>" ); } @@ -214,7 +214,7 @@ void UserInfoDialog::fillWidgets() } if ( !d->status.isEmpty() ) { - d->topLayout->addWidget( addLabelEdit( i18n("Status:"), d->status, d->statusEdit ) ); + d->topLayout->addWidget( addLabelEdit( i18n("tqStatus:"), d->status, d->statusEdit ) ); } if ( !d->warningLevel.isEmpty() ) { diff --git a/kopete/libkopete/ui/userinfodialog.h b/kopete/libkopete/ui/userinfodialog.h index 246d15ec..5926ab5a 100644 --- a/kopete/libkopete/ui/userinfodialog.h +++ b/kopete/libkopete/ui/userinfodialog.h @@ -30,6 +30,7 @@ namespace Kopete { class KOPETE_EXPORT UserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UserInfoDialog( const TQString& descr ); virtual ~UserInfoDialog(); @@ -49,7 +50,7 @@ namespace Kopete { void setName( const TQString& name ); void setId( const TQString& id ); void setAwayMessage( const TQString& msg ); - void setStatus( const TQString& status ); + void settqStatus( const TQString& status ); void setWarningLevel(const TQString& level ); void setOnlineSince( const TQString& since ); void setInfo( const TQString& info ); |