diff options
Diffstat (limited to 'kopete/kopete/contactlist')
23 files changed, 309 insertions, 301 deletions
diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp index 2f341426..95333c92 100644 --- a/kopete/kopete/contactlist/customnotificationprops.cpp +++ b/kopete/kopete/contactlist/customnotificationprops.cpp @@ -33,10 +33,10 @@ #include "customnotificationprops.h" -CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name ) -: TQObject( parent, name ) +CustomNotificationProps::CustomNotificationProps( TQWidget *tqparent, Kopete::NotifyDataObject* item, const char * name ) +: TQObject( tqparent, name ) { - m_notifyWidget = new CustomNotificationWidget( parent, "notificationWidget" ); + m_notifyWidget = new CustomNotificationWidget( tqparent, "notificationWidget" ); m_item = item; TQString path = "kopete/eventsrc"; @@ -47,12 +47,12 @@ CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::Noti TQStringList::Iterator end = m_eventList.end(); for ( ; it != end; ++it ) { - if ( !(*it).startsWith( TQString::fromLatin1( "kopete_contact_" ) ) ) + if ( !(*it).startsWith( TQString::tqfromLatin1( "kopete_contact_" ) ) ) continue; contactSpecificEvents.append( *it ); TQMap<TQString, TQString> entries = eventsfile.entryMap( *it ); eventsfile.setGroup( *it ); - TQString comment = eventsfile.readEntry( "Comment", TQString::fromLatin1( "Found nothing!" ) ); + TQString comment = eventsfile.readEntry( "Comment", TQString::tqfromLatin1( "Found nothing!" ) ); m_notifyWidget->cmbEvents->insertItem( comment ); } m_eventList = contactSpecificEvents; @@ -152,7 +152,7 @@ void CustomNotificationProps::storeCurrentCustoms() evt->setPresentation( Kopete::EventPresentation::Message, eventNotify ); // set chat attributes eventNotify = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, - TQString::null, + TQString(), m_notifyWidget->chkChatSS->isChecked(), m_notifyWidget->chkCustomChat->isChecked() ); evt->setPresentation( Kopete::EventPresentation::Chat, eventNotify ); diff --git a/kopete/kopete/contactlist/customnotificationprops.h b/kopete/kopete/contactlist/customnotificationprops.h index af1fc4f5..9008123d 100644 --- a/kopete/kopete/contactlist/customnotificationprops.h +++ b/kopete/kopete/contactlist/customnotificationprops.h @@ -27,11 +27,12 @@ namespace Kopete class NotifyDataObject; } -class CustomNotificationProps : public QObject +class CustomNotificationProps : public TQObject { Q_OBJECT + TQ_OBJECT public: - CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name = 0 ); + CustomNotificationProps( TQWidget *tqparent, Kopete::NotifyDataObject* item, const char * name = 0 ); ~CustomNotificationProps() {} void dumpData(); void resetEventWidgets(); diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index 86224af2..4f33add2 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CustomNotificationWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CustomNotificationWidget</cstring> </property> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -35,7 +35,7 @@ <cstring>cmbEvents</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cmbEvents</cstring> </property> @@ -45,9 +45,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> @@ -64,7 +64,7 @@ <string>Select the sound to play</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>chkCustomSound</cstring> </property> @@ -85,14 +85,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>chkCustomChat</cstring> </property> @@ -103,7 +103,7 @@ <string>Open a chat window with this contact when this event occurs for this contact</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>chkCustomMsg</cstring> </property> @@ -114,7 +114,7 @@ <string>Display a message on your screen when this event occurs for this contact</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>customMsg</cstring> </property> @@ -125,7 +125,7 @@ <string>Enter the message to display</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>chkMsgSS</cstring> </property> @@ -139,7 +139,7 @@ <string>Only display a message the next time the event occurs</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>chkSoundSS</cstring> </property> @@ -153,7 +153,7 @@ <string>Only play a sound the next time the event occurs</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>chkChatSS</cstring> </property> @@ -169,7 +169,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkSuppressCommon</cstring> </property> @@ -229,7 +229,7 @@ <tabstop>chkChatSS</tabstop> <tabstop>chkSuppressCommon</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kopete/kopete/contactlist/kabcexport.cpp b/kopete/kopete/contactlist/kabcexport.cpp index 0051f585..2e99c2a4 100644 --- a/kopete/kopete/contactlist/kabcexport.cpp +++ b/kopete/kopete/contactlist/kabcexport.cpp @@ -45,18 +45,18 @@ #include "kabcexport.h" -class ContactLVI : public QCheckListItem +class ContactLVI : public TQCheckListItem { public: - ContactLVI ( Kopete::MetaContact * mc, TQListView * parent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem( parent, text, tt ), mc( mc ) + ContactLVI ( Kopete::MetaContact * mc, TQListView * tqparent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem( tqparent, text, tt ), mc( mc ) { } Kopete::MetaContact * mc; TQString uid; }; // ctor populates the resource list and contact list, and enables the next button on the first page -KabcExportWizard::KabcExportWizard( TQWidget *parent, const char *name ) - : KabcExportWizard_Base( parent, name ) +KabcExportWizard::KabcExportWizard( TQWidget *tqparent, const char *name ) + : KabcExportWizard_Base( tqparent, name ) { connect( m_addrBooks, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( slotResourceSelectionChanged( TQListBoxItem * ) ) ); @@ -106,7 +106,7 @@ KabcExportWizard::KabcExportWizard( TQWidget *parent, const char *name ) TQCheckListItem * lvi = new ContactLVI( it.current(), m_contactList, it.current()->displayName(), TQCheckListItem::CheckBox ); lvi->setOn( false ); - if ( it.current()->metaContactId().contains(':') ) + if ( it.current()->metaContactId().tqcontains(':') ) { lvi->setOn( true ); lvi->setEnabled( true ); diff --git a/kopete/kopete/contactlist/kabcexport.h b/kopete/kopete/contactlist/kabcexport.h index 0ebfb75b..74029796 100644 --- a/kopete/kopete/contactlist/kabcexport.h +++ b/kopete/kopete/contactlist/kabcexport.h @@ -36,8 +36,9 @@ namespace KRES { class KabcExportWizard : public KabcExportWizard_Base { Q_OBJECT + TQ_OBJECT public: - KabcExportWizard( TQWidget *parent = 0, const char *name = 0 ); + KabcExportWizard( TQWidget *tqparent = 0, const char *name = 0 ); ~KabcExportWizard(); public slots: void accept(); diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui index 80ace5c6..367a474b 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/kabcexport_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KabcExportWizard_Base</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KabcExportWizard_Base</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Export Contacts</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -41,11 +41,11 @@ <property name="text"> <string>This wizard helps you export instant messaging contacts to the KDE address book.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -60,7 +60,7 @@ <property name="title"> <string>&Select Address Book</string> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>m_addrBooks</cstring> </property> @@ -84,7 +84,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -95,7 +95,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -111,7 +111,7 @@ <string>Selected contacts will be added to the KDE address book.</string> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Contact</string> @@ -133,15 +133,15 @@ <enum>AllColumns</enum> </property> </widget> - <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="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnSelectAll</cstring> </property> @@ -149,7 +149,7 @@ <string>Select &All</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_btnDeselectAll</cstring> </property> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -179,5 +179,5 @@ </vbox> </widget> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp index bcb9c434..eda83970 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp @@ -1,5 +1,5 @@ /* - kopeteaddrbookexport.cpp - Kopete Online Status + kopeteaddrbookexport.cpp - Kopete Online tqStatus Logic for exporting data acquired from messaging systems to the KDE address book @@ -35,10 +35,10 @@ #include "kopeteaddrbookexport.h" #include "kopeteaddrbookexportui.h" -KopeteAddressBookExport::KopeteAddressBookExport( TQWidget *parent, Kopete::MetaContact *mc ) : TQObject( parent ) +KopeteAddressBookExport::KopeteAddressBookExport( TQWidget *tqparent, Kopete::MetaContact *mc ) : TQObject( tqparent ) { // instantiate dialog and populate widgets - mParent = parent; + mParent = tqparent; mAddressBook = KABC::StdAddressBook::self(); mMetaContact = mc; } @@ -178,7 +178,7 @@ int KopeteAddressBookExport::showDialog() mUI = new AddressBookExportUI( mDialog ); mDialog->setMainWidget( mUI ); mDialog->setButtonOK( KGuiItem( i18n( "Export" ), - TQString::null, i18n( "Set address book fields using the selected data from Kopete" ) ) ); + TQString(), i18n( "Set address book fields using the selected data from Kopete" ) ) ); initLabels(); // fetch existing data from kabc diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.h b/kopete/kopete/contactlist/kopeteaddrbookexport.h index 131dad96..0bc79dbb 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.h +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.h @@ -1,5 +1,5 @@ /* - kopeteaddrbookexport.h - Kopete Online Status + kopeteaddrbookexport.h - Kopete Online tqStatus Logic for exporting data acquired from messaging systems to the KDE address book @@ -37,10 +37,10 @@ class Contact; class MetaContact; } -class KopeteAddressBookExport : public QObject +class KopeteAddressBookExport : public TQObject { public: - KopeteAddressBookExport( TQWidget *parent, Kopete::MetaContact *mc ); + KopeteAddressBookExport( TQWidget *tqparent, Kopete::MetaContact *mc ); ~KopeteAddressBookExport(); /** diff --git a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui index 9613d44f..b0728e8d 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui +++ b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddressBookExportUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddressBookExportUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>mLblFirstName</cstring> </property> @@ -30,7 +30,7 @@ <cstring>comboBox1</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>mLblHomePhone</cstring> </property> @@ -65,7 +65,7 @@ <enum>Extended</enum> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>mLblWorkPhone</cstring> </property> @@ -76,7 +76,7 @@ <cstring>mPhones_2</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>mLblMobilePhone</cstring> </property> @@ -87,7 +87,7 @@ <cstring>mPhones_3</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>mLblUrl</cstring> </property> @@ -98,22 +98,22 @@ <cstring>comboBox4</cstring> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <property name="name"> <cstring>mUrl</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>mFirstName</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>mLastName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mLblLastName</cstring> </property> @@ -132,7 +132,7 @@ <enum>Extended</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>mLblEmail</cstring> </property> @@ -145,5 +145,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 4e45f602..af5abcc2 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -120,7 +120,7 @@ public: protected: // work around TQListView design stupidity. - // GroupViewItem will be QListView-derived, or QListViewItem-derived. + // GroupViewItem will be TQListView-derived, or TQListViewItem-derived. template<typename GroupViewItem> void addMetaContactToGroupInner( Kopete::MetaContact *mc, GroupViewItem *gpi ) { @@ -198,7 +198,7 @@ public: { removeMetaContactFromGroupInner( mc, gpi ); - // update the group's display of its number of children. + // update the group's display of its number of tqchildren. // TODO: make the KopeteGroupViewItem not need this, by overriding insertItem and takeItem gpi->refreshDisplayName(); @@ -288,8 +288,8 @@ private: updateMetaContactInner( mc ); // FIXME: these items should do this for themselves... - m_onlineItem->setText(0,i18n("Online contacts (%1)").arg(m_onlineItem->childCount())); - m_offlineItem->setText(0,i18n("Offline contacts (%1)").arg(m_offlineItem->childCount())); + m_onlineItem->setText(0,i18n("Online contacts (%1)").tqarg(m_onlineItem->childCount())); + m_offlineItem->setText(0,i18n("Offline contacts (%1)").tqarg(m_offlineItem->childCount())); } void updateMetaContactInner( Kopete::MetaContact *mc ) { @@ -375,13 +375,13 @@ void KopeteContactListViewPrivate::updateViewStrategy( KListView *view ) } // returns the next item in a depth-first descent of the list view. -// much like QLVI::itemBelow but does not depend on visibility of items, etc. +// much like TQLVI::itemBelow but does not depend on visibility of items, etc. static TQListViewItem *nextItem( TQListViewItem *item ) { if ( TQListViewItem *it = item->firstChild() ) return it; while ( item && !item->nextSibling() ) - item = item->parent(); + item = item->tqparent(); if ( !item ) return 0; return item->nextSibling(); @@ -389,8 +389,8 @@ static TQListViewItem *nextItem( TQListViewItem *item ) -KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name ) - : Kopete::UI::ListView::ListView( parent, name ) +KopeteContactListView::KopeteContactListView( TQWidget *tqparent, const char *name ) + : Kopete::UI::ListView::ListView( tqparent, name ) { d = new KopeteContactListViewPrivate; m_undo=0L; @@ -461,49 +461,49 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name void KopeteContactListView::initActions( KActionCollection *ac ) { - actionUndo = KStdAction::undo( this , TQT_SLOT( slotUndo() ) , ac ); - actionRedo = KStdAction::redo( this , TQT_SLOT( slotRedo() ) , ac ); + actionUndo = KStdAction::undo( TQT_TQOBJECT(this) , TQT_SLOT( slotUndo() ) , ac ); + actionRedo = KStdAction::redo( TQT_TQOBJECT(this) , TQT_SLOT( slotRedo() ) , ac ); actionUndo->setEnabled(false); actionRedo->setEnabled(false); - new KAction( i18n( "Create New Group..." ), 0, 0, this, TQT_SLOT( addGroup() ), + new KAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), ac, "AddGroup" ); actionSendMessage = KopeteStdAction::sendMessage( - this, TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" ); - actionStartChat = KopeteStdAction::chat( this, TQT_SLOT( slotStartChat() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" ); + actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ), ac, "contactStartChat" ); - actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "editcut" ), - 0, this, TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" ); - actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "editcopy" ), 0, - this, TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); + actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::tqfromLatin1( "editcut" ), + 0, TQT_TQOBJECT(this), TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" ); + actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::tqfromLatin1( "editcopy" ), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); - actionRemove = KopeteStdAction::deleteContact( this, TQT_SLOT( slotRemove() ), + actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), ac, "contactRemove" ); - actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ), - 0, this, TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); + actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::tqfromLatin1( "mail_generic" ), + 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); /* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/ actionRename = new KAction( i18n( "Rename" ), "filesaveas", 0, - this, TQT_SLOT( slotRename() ), ac, "contactRename" ); - actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( slotSendFile() ), + TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" ); + actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), ac, "contactSendFile" ); actionAddContact = new KActionMenu( i18n( "&Add Contact" ), - TQString::fromLatin1( "add_user" ), ac , "contactAddContact" ); + TQString::tqfromLatin1( "add_user" ), ac , "contactAddContact" ); actionAddContact->popupMenu()->insertTitle( i18n("Select Account") ); actionAddTemporaryContact = new KAction( i18n( "Add to Your Contact List" ), "add_user", 0, - this, TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" ); connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) ); connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered( Kopete::Account* )), TQT_SLOT(slotAddSubContactActionNewAccount(Kopete::Account*))); connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *))); - actionProperties = new KAction( i18n( "&Properties" ), "edit_user", Qt::Key_Alt + Qt::Key_Return, - this, TQT_SLOT( slotProperties() ), ac, "contactProperties" ); + actionProperties = new KAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return, + TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), ac, "contactProperties" ); // Update enabled/disabled actions slotViewSelectionChanged(); @@ -516,7 +516,7 @@ KopeteContactListView::~KopeteContactListView() void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account) { - KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , this, TQT_SLOT(slotAddContact()), account); + KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account); m_accountAddContactMap.insert( account, action); actionAddContact->insert( action ); } @@ -524,7 +524,7 @@ void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* a void KopeteContactListView::slotAddSubContactActionAccountDeleted(const Kopete::Account *account) { kdDebug(14000) << k_funcinfo << endl; - if ( m_accountAddContactMap.contains( account ) ) + if ( m_accountAddContactMap.tqcontains( account ) ) { KAction *action = m_accountAddContactMap[account]; m_accountAddContactMap.remove( account ); @@ -659,7 +659,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, int nb = Kopete::ContactList::self()->selectedMetaContacts().count() + Kopete::ContactList::self()->selectedGroups().count(); - KMainWindow *window = dynamic_cast<KMainWindow *>(topLevelWidget()); + KMainWindow *window = dynamic_cast<KMainWindow *>(tqtopLevelWidget()); if ( !window ) { kdError( 14000 ) << k_funcinfo << "Main window not found, unable to display context-menu; " @@ -671,7 +671,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, { int px = mapFromGlobal( point ).x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( item->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = mapFromGlobal( point ).y() - itemRect( item ).y() - (header()->isVisible() ? header()->height() : 0) ; + int py = mapFromGlobal( point ).y() - tqitemRect( item ).y() - (header()->isVisible() ? header()->height() : 0) ; //kdDebug( 14000 ) << k_funcinfo << "x: " << px << ", y: " << py << endl; Kopete::Contact *c = metaLVI->contactForPoint( TQPoint( px, py ) ) ; @@ -691,7 +691,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, arg( metaLVI->metaContact()->displayName(), metaLVI->metaContact()->statusString() ); if ( title.length() > 43 ) - title = title.left( 40 ) + TQString::fromLatin1( "..." ); + title = title.left( 40 ) + TQString::tqfromLatin1( "..." ); if ( popup->title( 0 ).isNull() ) popup->insertTitle ( title, 0, 0 ); @@ -713,12 +713,12 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, connect( popup, TQT_SIGNAL( aboutToHide() ), contactMenu, TQT_SLOT( deleteLater() ) ); TQString nick=c->property(Kopete::Global::Properties::self()->nickName()).value().toString(); TQString text= nick.isEmpty() ? c->contactId() : i18n( "Translators: format: '<displayName> (<id>)'", "%2 <%1>" ). arg( c->contactId(), nick ); - text=text.replace("&","&&"); // cf BUG 115449 + text=text.tqreplace("&","&&"); // cf BUG 115449 if ( text.length() > 41 ) - text = text.left( 38 ) + TQString::fromLatin1( "..." ); + text = text.left( 38 ) + TQString::tqfromLatin1( "..." ); - popup->insertItem( c->onlineStatus().iconFor( c, 16 ), text , contactMenu ); + popup->insertItem( c->onlinetqStatus().iconFor( c, 16 ), text , contactMenu ); } popup->popup( point ); @@ -733,7 +733,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, { TQString title = groupvi->group()->displayName(); if ( title.length() > 32 ) - title = title.left( 30 ) + TQString::fromLatin1( "..." ); + title = title.left( 30 ) + TQString::tqfromLatin1( "..." ); if( popup->title( 0 ).isNull() ) popup->insertTitle( title, 0, 0 ); @@ -814,7 +814,7 @@ void KopeteContactListView::slotExecuted( TQListViewItem *item, const TQPoint &p { // Try if we are clicking a protocol icon. If so, open a direct // connection for that protocol - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); TQPoint relativePos( pos.x() - r.left() - ( treeStepSize() * ( item->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ), pos.y() - r.top() ); @@ -905,7 +905,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList } else if( e->provides("kopete/x-contact") ) { - TQString contactInfo = TQString::fromUtf8( e->encodedData("kopete/x-contact") ); + TQString contactInfo = TQString::fromUtf8( e->tqencodedData("kopete/x-contact") ); TQString protocolId = contactInfo.section( TQChar( 0xE000 ), 0, 0 ); TQString accountId = contactInfo.section( TQChar( 0xE000 ), 1, 1 ); TQString contactId = contactInfo.section( TQChar( 0xE000 ), 2 ); @@ -927,7 +927,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList for ( KURL::List::Iterator it = urlList.begin(); it != urlList.end(); ++it ) { KURL url = (*it); - if( url.protocol() == TQString::fromLatin1("kopetemessage") ) + if( url.protocol() == TQString::tqfromLatin1("kopetemessage") ) { //Add a contact addDraggedContactByInfo( url.queryItem("protocolId"), @@ -938,7 +938,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList TQPoint p = contentsToViewport(e->pos()); int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( dest_metaLVI->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - itemRect( dest_metaLVI ).y(); + int py = p.y() - tqitemRect( dest_metaLVI ).y(); Kopete::Contact *c = dest_metaLVI->contactForPoint( TQPoint( px, py ) ); @@ -987,7 +987,7 @@ void KopeteContactListView::addDraggedContactToGroup( Kopete::MetaContact *conta { int r=KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>%2</b>?</qt>" ) - .arg( contact->displayName(), group->displayName() ), + .tqarg( contact->displayName(), group->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); @@ -999,17 +999,17 @@ void KopeteContactListView::addDraggedContactToGroup( Kopete::MetaContact *conta } } -void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *parent ) +void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *tqparent ) { int r = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "<qt>Would you like to add <b>%1</b> to your contact list as a child contact of <b>%2</b>?</qt>" ) - .arg( contact->contactId(), parent->displayName() ), + .tqarg( contact->contactId(), tqparent->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); if( r == KMessageBox::Yes ) { - contact->setMetaContact(parent); + contact->setMetaContact(tqparent); UndoItem *u=new UndoItem; u->type=UndoItem::ContactAdd; @@ -1054,7 +1054,7 @@ void KopeteContactListView::addDraggedContactByInfo( const TQString &protocolId, { KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n("<qt>This contact is already on your contact list. It is a child contact of <b>%1</b></qt>") - .arg( source_contact->metaContact()->displayName() ) + .tqarg( source_contact->metaContact()->displayName() ) ); } } @@ -1064,13 +1064,13 @@ void KopeteContactListView::addDraggedContactByInfo( const TQString &protocolId, bool KopeteContactListView::acceptDrag(TQDropEvent *e) const { TQListViewItem *source=currentItem(); - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *afterme; // Due to a little design problem in KListView::findDrop() we can't // call it directly from a const method until KDE 4.0, but as the // method is in fact const we can of course get away with a // const_cast... - const_cast<KopeteContactListView *>( this )->findDrop( e->pos(), parent, afterme ); + const_cast<KopeteContactListView *>( this )->findDrop( e->pos(), tqparent, afterme ); KopeteMetaContactLVI *dest_metaLVI=dynamic_cast<KopeteMetaContactLVI*>(afterme); @@ -1116,14 +1116,14 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const return false; if(source_groupLVI->group() == Kopete::Group::temporary) return false; - if(source_groupLVI->group()->parentGroup() == dest_groupLVI->group() ) + if(source_groupLVI->group()->tqparentGroup() == dest_groupLVI->group() ) return false; - Kopete::Group *g=dest_groupLVI->group()->parentGroup(); + Kopete::Group *g=dest_groupLVI->group()->tqparentGroup(); while(g && g != Kopete::Group::toplevel) { if(g==source_groupLVI->group()) return false; - g=g->parentGroup(); + g=g->tqparentGroup(); } return true; } @@ -1131,7 +1131,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const { if(source_groupLVI->group() == Kopete::Group::temporary) return false; - if(source_groupLVI->group()->parentGroup() == Kopete::Group::toplevel) + if(source_groupLVI->group()->tqparentGroup() == Kopete::Group::toplevel) return false; return true; }*/ @@ -1146,7 +1146,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const TQPoint p=contentsToViewport(e->pos()); int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( dest_metaLVI->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - itemRect( dest_metaLVI ).y(); + int py = p.y() - tqitemRect( dest_metaLVI ).y(); Kopete::Contact *c = dest_metaLVI->contactForPoint( TQPoint( px, py ) ) ; if( c ? !c->isReachable() : !dest_metaLVI->metaContact()->isReachable() ) @@ -1168,7 +1168,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const for ( KURL::List::Iterator it = urlList.begin(); it != urlList.end(); ++it ) { - if( (*it).protocol() != TQString::fromLatin1("kopetemessage") && (*it).isLocalFile() ) + if( (*it).protocol() != TQString::tqfromLatin1("kopetemessage") && (*it).isLocalFile() ) return false; //we can't send links if a locale file is in link } @@ -1191,12 +1191,12 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const return false; } -void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, +void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after) { //Since KDE 3.1.1 , the original find Drop return 0L for afterme if the group is open. //This woraround allow us to keep the highlight of the item, and give always a correct position - parent=0L; + tqparent=0L; TQPoint p (contentsToViewport(pos)); after=itemAt(p); } @@ -1205,7 +1205,7 @@ void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e ) { KListView::contentsMousePressEvent( e ); - if (e->button() == LeftButton ) + if (e->button() == Qt::LeftButton ) { TQPoint p=contentsToViewport(e->pos()); TQListViewItem *i=itemAt( p ); @@ -1216,7 +1216,7 @@ void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e ) int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( i->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - itemRect( i ).y(); + int py = p.y() - tqitemRect( i ).y(); m_startDragPos = TQPoint( px , py ); } @@ -1272,7 +1272,7 @@ TQDragObject *KopeteContactListView::dragObject() d->setEncodedData( TQString( c->protocol()->pluginId() +TQChar( 0xE000 )+ c->account()->accountId() +TQChar( 0xE000 )+ c->contactId() ).utf8() ); drag->addDragObject( d ); - pm = c->onlineStatus().iconFor( c, 12 ); // FIXME: fixed icon scaling + pm = c->onlinetqStatus().iconFor( c, 12 ); // FIXME: fixed icon scaling } else // dragging a metacontact { @@ -1326,14 +1326,14 @@ void KopeteContactListView::slotViewSelectionChanged() if(metaLVI) { m_selectedContacts.append( metaLVI ); - if(!contacts.contains(metaLVI->metaContact())) + if(!contacts.tqcontains(metaLVI->metaContact())) contacts.append( metaLVI->metaContact() ); } KopeteGroupViewItem *groupLVI=dynamic_cast<KopeteGroupViewItem*>(item); if(groupLVI) { m_selectedGroups.append( groupLVI ); - if(!groups.contains(groupLVI->group())) + if(!groups.tqcontains(groupLVI->group())) groups.append( groupLVI->group() ); } @@ -1362,7 +1362,7 @@ void KopeteContactListView::updateActionsForSelection( if(singleContactSelected) { TQString kabcid=contacts.first()->metaContactId(); - inkabc= !kabcid.isEmpty() && !kabcid.contains(":"); + inkabc= !kabcid.isEmpty() && !kabcid.tqcontains(":"); } actionSendFile->setEnabled( singleContactSelected && contacts.first()->canAcceptFiles()); @@ -1443,7 +1443,7 @@ void KopeteContactListView::slotSendFile() kdDebug( 14000 ) << "Email: " << emailAddr << "!" << endl; if ( !emailAddr.isEmpty() ) - kapp->invokeMailer( emailAddr, TQString::null ); + kapp->invokeMailer( emailAddr, TQString() ); else KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "There is no email address set for this contact in the KDE address book." ), i18n( "No Email Address in Address Book" ) ); } @@ -1482,7 +1482,7 @@ void KopeteContactListView::slotMoveToGroup() insertUndoItem( new UndoItem( UndoItem::MetaContactAdd , m ) ); } } - else if( !m->groups().contains( to ) ) + else if( !m->groups().tqcontains( to ) ) { m->moveToGroup( g, to ); @@ -1515,7 +1515,7 @@ void KopeteContactListView::slotCopyToGroup() if( m->isTemporary() ) return; - if( !m->groups().contains( to ) ) + if( !m->groups().tqcontains( to ) ) { m->addToGroup( to ); @@ -1555,13 +1555,13 @@ void KopeteContactListView::slotRemove() { msg = i18n( "<qt>Are you sure you want to remove the contact <b>%1</b>" \ " from your contact list?</qt>" ) - .arg( contacts.first()->displayName() ) ; + .tqarg( contacts.first()->displayName() ) ; } else if( !groups.isEmpty() ) { msg = i18n( "<qt>Are you sure you want to remove the group <b>%1</b> " \ "and all contacts that are contained within it?</qt>" ) - .arg( groups.first()->displayName() ); + .tqarg( groups.first()->displayName() ); } else return; // this should never happen @@ -1676,7 +1676,7 @@ void KopeteContactListView::slotAddContact() Kopete::ContactList::self()->selectedMetaContacts().first(); Kopete::Group *group = Kopete::ContactList::self()->selectedGroups().first(); - Kopete::Account *account = dynamic_cast<Kopete::Account*>( sender()->parent() ); + Kopete::Account *account = dynamic_cast<Kopete::Account*>( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent() ); if ( ( metacontact && metacontact->isTemporary() ) || (group && group->type()!=Kopete::Group::Normal ) ) @@ -1772,7 +1772,7 @@ void KopeteContactListView::slotProperties() { } */ - metaLVI->repaint(); + metaLVI->tqrepaint(); } else if(groupLVI) { diff --git a/kopete/kopete/contactlist/kopetecontactlistview.h b/kopete/kopete/contactlist/kopetecontactlistview.h index 4c5a8d37..ff4d523d 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.h +++ b/kopete/kopete/contactlist/kopetecontactlistview.h @@ -59,9 +59,10 @@ class MessageEvent; class KopeteContactListView : public Kopete::UI::ListView::ListView { Q_OBJECT + TQ_OBJECT public: - KopeteContactListView( TQWidget *parent = 0, const char *name = 0 ); + KopeteContactListView( TQWidget *tqparent = 0, const char *name = 0 ); ~KopeteContactListView(); /** @@ -106,7 +107,7 @@ protected: * Since KDE 3.1.1 , the original find Drop return 0L for afterme if the group is open. * This woraround allow us to keep the highlight of the item, and give always a correct position */ - virtual void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after); + virtual void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after); /** * The selected items have changed; update our actions to show what's possible. @@ -149,7 +150,7 @@ private slots: void slotContactStatusChanged( Kopete::MetaContact *mc ); - void slotDropped(TQDropEvent *e, TQListViewItem *parent, TQListViewItem*); + void slotDropped(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem*); void slotShowAddContactDialog(); void slotNewMessageEvent(Kopete::MessageEvent *); @@ -208,7 +209,7 @@ private: void moveDraggedContactToGroup( Kopete::MetaContact *contact, Kopete::Group *from, Kopete::Group *to ); void addDraggedContactToGroup( Kopete::MetaContact *contact, Kopete::Group *group ); - void addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *parent ); + void addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *tqparent ); void addDraggedContactByInfo( const TQString &protocolId, const TQString &accountId, const TQString &contactId, TQListViewItem *after ); diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp index 802df117..1e415884 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp +++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp @@ -30,8 +30,8 @@ #include "kopetegroup.h" KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQString &pix, const KShortcut &cut, const TQObject *receiver, - const char *slot, TQObject *parent, const char *name ) -: KListAction( text, pix, cut, parent, name ) + const char *slot, TQObject *tqparent, const char *name ) +: KListAction( text, pix, cut, tqparent, name ) { connect( this, TQT_SIGNAL( activated() ), receiver, slot ); @@ -58,7 +58,7 @@ void KopeteGroupListAction::slotUpdateList() } groupList.sort(); - groupList.prepend(TQString::null); //add a separator; + groupList.prepend(TQString()); //add a separator; groupList.prepend( i18n("Top Level") ); //the top-level group, with the id 0 setItems( groupList ); } diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.h b/kopete/kopete/contactlist/kopetegrouplistaction.h index 2b852632..1b1846e1 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.h +++ b/kopete/kopete/contactlist/kopetegrouplistaction.h @@ -29,6 +29,7 @@ class KopeteGroupListAction : public KListAction { Q_OBJECT + TQ_OBJECT public: KopeteGroupListAction( const TQString &, const TQString &, const KShortcut &, diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index b28b7cb3..75508159 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.cpp - Kopete Online Status + kopeteonlinestatus.cpp - Kopete Online tqStatus Copyright (c) 2002-2004 by Olivier Goffart <ogoffart @ kde.org> Copyright (c) 2003 by Martijn Klingens <[email protected]> @@ -68,15 +68,15 @@ private: } // END namespace UI } // END namespace Kopete -KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListView *parent, const char *name ) -: Kopete::UI::ListView::Item( parent, group_, name ) +KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListView *tqparent, const char *name ) +: Kopete::UI::ListView::Item( tqparent, group_, name ) { m_group = group_; initLVI(); } -KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListViewItem *parent, const char *name ) - : Kopete::UI::ListView::Item( parent, group_, name ) +KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListViewItem *tqparent, const char *name ) + : Kopete::UI::ListView::Item( tqparent, group_, name ) { m_group = group_; initLVI(); @@ -167,7 +167,7 @@ void KopeteGroupViewItem::refreshDisplayName() d->name->setText( m_group->displayName() ); d->count->setText( i18n( "(NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)", "(%1/%2)" ) - .arg( TQString::number( onlineMemberCount ), TQString::number( totalMemberCount ) ) ); + .tqarg( TQString::number( onlineMemberCount ), TQString::number( totalMemberCount ) ) ); updateVisibility(); diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.h b/kopete/kopete/contactlist/kopetegroupviewitem.h index 8891f992..091e791d 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.h +++ b/kopete/kopete/contactlist/kopetegroupviewitem.h @@ -35,9 +35,10 @@ class Group; class KopeteGroupViewItem : public Kopete::UI::ListView::Item { Q_OBJECT + TQ_OBJECT public: - KopeteGroupViewItem( Kopete::Group *group , TQListView *parent, const char *name = 0 ); - KopeteGroupViewItem( Kopete::Group *group , TQListViewItem *parent, const char *name = 0 ); + KopeteGroupViewItem( Kopete::Group *group , TQListView *tqparent, const char *name = 0 ); + KopeteGroupViewItem( Kopete::Group *group , TQListViewItem *tqparent, const char *name = 0 ); ~KopeteGroupViewItem(); Kopete::Group * group() const; diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui index 4dbb1599..23621b37 100644 --- a/kopete/kopete/contactlist/kopetegvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KopeteGVIPropsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopeteGVIPropsWidget</cstring> </property> @@ -19,11 +19,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,15 +34,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblDisplayName</cstring> </property> @@ -53,14 +53,14 @@ <cstring>edtDisplayName</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>edtDisplayName</cstring> </property> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpIcons</cstring> </property> @@ -79,7 +79,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblOpen</cstring> </property> @@ -90,7 +90,7 @@ <cstring>icnbOpen</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblClosed</cstring> </property> @@ -109,7 +109,7 @@ <string></string> </property> </widget> - <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>chkUseCustomIcons</cstring> </property> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -148,7 +148,7 @@ <tabstop>icnbOpen</tabstop> <tabstop>icnbClosed</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kicondialog.h</includehint> <includehint>kicondialog.h</includehint> diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index 1867dea5..f3c727ec 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -65,8 +65,8 @@ const char MC_AW[] = "metacontact_away"; const char MC_UNK[] = "metacontact_unknown"; -KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Properties of Group %1").arg(gvi->group()->displayName()), Ok|Cancel, Ok, false) +KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *tqparent, const char *name) +: KDialogBase(tqparent, name, true, i18n("Properties of Group %1").tqarg(gvi->group()->displayName()), Ok|Cancel, Ok, false) { mainWidget = new KopeteGVIPropsWidget(this, "mainWidget"); mainWidget->icnbOpen->setIconSize(KIcon::SizeSmall); @@ -145,8 +145,8 @@ void KopeteGVIProps::slotIconChanged() // ============================================================================= -KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Properties of Meta Contact %1").arg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) +KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *tqparent, const char *name) +: KDialogBase(tqparent, name, true, i18n("Properties of Meta Contact %1").tqarg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) { m_countPhotoCapable = 0; mainWidget = new KopeteMetaLVIPropsWidget( this, "mainWidget" ); @@ -157,10 +157,10 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare mNotificationProps = new CustomNotificationProps( this, lvi->metaContact() ); // add a button to the notification props to get the sound from KABC - // the widget's vert box layout, horiz box layout containing button, spacer, followed by a spacer - TQBoxLayout * vb = static_cast<TQVBoxLayout*>( mNotificationProps->widget()->layout() ); + // the widget's vert box tqlayout, horiz box tqlayout containing button, spacer, followed by a spacer + TQBoxLayout * vb = static_cast<TQVBoxLayout*>( mNotificationProps->widget()->tqlayout() ); - TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABClayout" ); + TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABCtqlayout" ); mFromKABC = new TQPushButton( i18n( "Sync KABC..." ), mNotificationProps->widget(), "getSoundFromKABC" ); hb->addWidget( mFromKABC ); // [ [Button] <-xxxxx-> ] hb->addStretch(); @@ -187,19 +187,19 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare TQString offlineName = item->metaContact()->icon( Kopete::ContactListElement::Offline ); if(offlineName.isEmpty()) - offlineName = TQString::fromLatin1(MC_OFF); // Default + offlineName = TQString::tqfromLatin1(MC_OFF); // Default TQString onlineName = item->metaContact()->icon( Kopete::ContactListElement::Online ); if(onlineName.isEmpty()) - onlineName = TQString::fromLatin1(MC_ON); // Default + onlineName = TQString::tqfromLatin1(MC_ON); // Default TQString awayName = item->metaContact()->icon( Kopete::ContactListElement::Away ); if(awayName.isEmpty()) - awayName = TQString::fromLatin1(MC_AW); // Default + awayName = TQString::tqfromLatin1(MC_AW); // Default TQString unknownName = item->metaContact()->icon( Kopete::ContactListElement::Unknown ); if(unknownName.isEmpty()) - unknownName = TQString::fromLatin1(MC_UNK); // Default + unknownName = TQString::tqfromLatin1(MC_UNK); // Default mainWidget->icnbOffline->setIcon( offlineName ); mainWidget->icnbOnline->setIcon( onlineName ); @@ -372,7 +372,7 @@ void KopeteMetaLVIProps::slotEnableAndDisableWidgets() break; } if( !photo.isNull() ) - mainWidget->photoLabel->setPixmap(TQPixmap(photo.smoothScale( 64, 92, TQImage::ScaleMin ))); + mainWidget->photoLabel->setPixmap(TQPixmap(photo.smoothScale( 64, 92, TQ_ScaleMin ))); else mainWidget->photoLabel->setPixmap( TQPixmap() ); } @@ -489,7 +489,7 @@ void KopeteMetaLVIProps::slotAddresseeChanged( const KABC::Addressee & a ) { mainWidget->btnExportKABC->setEnabled( false ); mainWidget->btnImportKABC->setEnabled( false ); - mAddressBookUid = TQString::null; + mAddressBookUid = TQString(); mainWidget->radioNameContact->setChecked( true ); mainWidget->radioPhotoContact->setChecked( true ); } @@ -560,7 +560,7 @@ void KopeteMetaLVIProps::slotClearPhotoClicked() #if KDE_IS_VERSION(3,4,0) mainWidget->cmbPhotoUrl->setKURL( KURL() ); #else - mainWidget->cmbPhotoUrl->setURL( TQString::null ); + mainWidget->cmbPhotoUrl->setURL( TQString() ); #endif item->metaContact()->setPhoto( KURL() ); diff --git a/kopete/kopete/contactlist/kopetelviprops.h b/kopete/kopete/contactlist/kopetelviprops.h index 54ff2540..d674f0ad 100644 --- a/kopete/kopete/contactlist/kopetelviprops.h +++ b/kopete/kopete/contactlist/kopetelviprops.h @@ -43,9 +43,10 @@ namespace Kopete { class Contact; } class KopeteGVIProps: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name=0L); + KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *tqparent, const char *name=0L); ~KopeteGVIProps(); private: @@ -64,9 +65,10 @@ class KopeteGVIProps: public KDialogBase class KopeteMetaLVIProps: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopeteMetaLVIProps(KopeteMetaContactLVI *gvi, TQWidget *parent, const char *name=0L); + KopeteMetaLVIProps(KopeteMetaContactLVI *gvi, TQWidget *tqparent, const char *name=0L); ~KopeteMetaLVIProps(); private: diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 7d4cb12a..dc7fec18 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -82,18 +82,18 @@ public: { // We begin with the meta contact display name at the top of the tooltip - TQString toolTip = TQString::fromLatin1("<qt><table cellpadding=\"0\" cellspacing=\"1\">"); + TQString toolTip = TQString::tqfromLatin1("<qt><table cellpadding=\"0\" cellspacing=\"1\">"); - toolTip += TQString::fromLatin1("<tr><td>"); + toolTip += TQString::tqfromLatin1("<tr><td>"); if ( ! metaContact->photo().isNull() ) { - TQString photoName = TQString::fromLatin1("kopete-metacontact-photo:%1").arg( KURL::encode_string( metaContact->metaContactId() )); + TQString photoName = TQString::tqfromLatin1("kopete-metacontact-photo:%1").tqarg( KURL::encode_string( metaContact->metaContactId() )); //TQMimeSourceFactory::defaultFactory()->setImage( "contactimg", metaContact->photo() ); - toolTip += TQString::fromLatin1("<img src=\"%1\">").arg( photoName ); + toolTip += TQString::tqfromLatin1("<img src=\"%1\">").tqarg( photoName ); } - toolTip += TQString::fromLatin1("</td><td>"); + toolTip += TQString::tqfromLatin1("</td><td>"); TQString displayName; Kopete::Emoticons *e = Kopete::Emoticons::self(); @@ -110,32 +110,32 @@ public: } } - toolTip += TQString::fromLatin1("<b><font size=\"+1\">%1</font></b><br><br>").arg( displayName ); + toolTip += TQString::tqfromLatin1("<b><font size=\"+1\">%1</font></b><br><br>").tqarg( displayName ); TQPtrList<Contact> contacts = metaContact->contacts(); if ( contacts.count() == 1 ) { - return toolTip + contacts.first()->toolTip() + TQString::fromLatin1("</td></tr></table></qt>"); + return toolTip + contacts.first()->toolTip() + TQString::tqfromLatin1("</td></tr></table></qt>"); } - toolTip += TQString::fromLatin1("<table>"); + toolTip += TQString::tqfromLatin1("<table>"); // We are over a metacontact with > 1 child contacts, and not over a specific contact - // Iterate through children and display a summary tooltip + // Iterate through tqchildren and display a summary tooltip for(Contact *c = contacts.first(); c; c = contacts.next()) { - TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") - .arg( KURL::encode_string( c->protocol()->pluginId() ), + TQString iconName = TQString::tqfromLatin1("kopete-contact-icon:%1:%2:%3") + .tqarg( KURL::encode_string( c->protocol()->pluginId() ), KURL::encode_string( c->account()->accountId() ), KURL::encode_string( c->contactId() ) ); toolTip += i18n("<tr><td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td><td>STATUS DESCRIPTION</td></tr>", "<tr><td><img src=\"%1\"> <nobr><b>%2</b></nobr> <nobr>(%3)</nobr></td><td align=\"right\"><nobr>%4</nobr></td></tr>") - .arg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlineStatus().description() ); + .tqarg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlinetqStatus().description() ); } - return toolTip + TQString::fromLatin1("</table></td></tr></table></qt>"); + return toolTip + TQString::tqfromLatin1("</table></td></tr></table></qt>"); } private: MetaContact *metaContact; @@ -167,22 +167,22 @@ public: TQPtrList<Kopete::MessageEvent> events; }; -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent ) -: ListView::Item( parent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *tqparent ) +: ListView::Item( tqparent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) { m_metaContact = contact; m_isTopLevel = false; - m_parentGroup = parent; + m_parentGroup = tqparent; m_parentView = 0L; initLVI(); - parent->refreshDisplayName(); + tqparent->refreshDisplayName(); } -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent ) -: ListView::Item( parent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *tqparent ) +: ListView::Item( tqparent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) { m_metaContact = contact; @@ -193,15 +193,15 @@ KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQList initLVI(); } -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent ) -: ListView::Item( parent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *tqparent ) +: ListView::Item( tqparent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) { m_metaContact = contact; m_isTopLevel = true; m_parentGroup = 0L; - m_parentView = parent; + m_parentView = tqparent; initLVI(); } @@ -212,7 +212,7 @@ void KopeteMetaContactLVI::initLVI() d->toolTipSource.reset( new ListView::MetaContactToolTipSource( m_metaContact ) ); - m_oldStatus = m_metaContact->status(); + m_oldtqStatus = m_metaContact->status(); connect( m_metaContact, TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), TQT_SLOT( slotDisplayNameChanged() ) ); @@ -254,7 +254,7 @@ void KopeteMetaContactLVI::initLVI() mIsBlinkIcon = false; //if ( !mBlinkIcon ) - // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) ); + // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "newmsg" ), KIcon::Small ) ); slotConfigChanged(); // this calls slotIdleStateChanged(), which sets up the constituent components, spacing, fonts and indirectly, the contact icon slotDisplayNameChanged(); @@ -280,13 +280,13 @@ void KopeteMetaContactLVI::movedToDifferentGroup() // create a spacer if wanted // I assume that the safety property that allows the delete in slotConfigChanged holds here - Will delete d->spacerBox->component( 0 ); - if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && + if ( KListViewItem::tqparent() && KopetePrefs::prefs()->contactListIndentContacts() && !KopetePrefs::prefs()->treeView() ) { new ListView::SpacerComponent( d->spacerBox, 20, 0 ); } - KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(KListViewItem::parent()); + KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(KListViewItem::tqparent()); if ( group_item ) { m_isTopLevel = false; @@ -363,18 +363,18 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) // multiple times if the user is in multiple groups - Jason // comparing the status of the previous and new preferred contact is the determining factor in deciding to notify - Kopete::OnlineStatus newStatus; + Kopete::OnlineStatus newtqStatus; if ( m_metaContact->preferredContact() ) - newStatus = m_metaContact->preferredContact()->onlineStatus(); + newtqStatus = m_metaContact->preferredContact()->onlinetqStatus(); else { // the last child contact has gone offline or otherwise unreachable, so take the changed contact's online status - newStatus = c->onlineStatus(); + newtqStatus = c->onlinetqStatus(); } // ensure we are not suppressing notifications, because connecting or disconnected if ( !(c->account()->suppressStatusNotification() - || ( c->account()->myself()->onlineStatus().status() == Kopete::OnlineStatus::Connecting ) + || ( c->account()->myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Connecting ) || !c->account()->isConnected() ) ) { if ( !c->account()->isAway() || KopetePrefs::prefs()->soundIfAway() ) @@ -382,47 +382,47 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) //int winId = KopeteSystemTray::systemTray() ? KopeteSystemTray::systemTray()->winId() : 0; TQString text = i18n( "<qt><i>%1</i> is now %2.</qt>" ) - .arg( Kopete::Emoticons::parseEmoticons( TQStyleSheet::escape(m_metaContact->displayName()) ) , - TQStyleSheet::escape(c->onlineStatus().description())); + .tqarg( Kopete::Emoticons::parseEmoticons( TQStyleSheet::escape(m_metaContact->displayName()) ) , + TQStyleSheet::escape(c->onlinetqStatus().description())); // figure out what's happened - enum ChangeType { noChange, noEvent, signedIn, changedStatus, signedOut }; + enum ChangeType { noChange, noEvent, signedIn, changedtqStatus, signedOut }; ChangeType t = noChange; //kdDebug( 14000 ) << k_funcinfo << m_metaContact->displayName() << - //" - Old MC Status: " << m_oldStatus.status() << ", New MC Status: " << newStatus.status() << endl; + //" - Old MC tqStatus: " << m_oldtqStatus.status() << ", New MC tqStatus: " << newtqStatus.status() << endl; // first, exclude changes due to blocking or subscription changes at the protocol level - if ( ( m_oldStatus.status() == Kopete::OnlineStatus::Unknown - || newStatus.status() == Kopete::OnlineStatus::Unknown ) ) + if ( ( m_oldtqStatus.status() == Kopete::OnlineStatus::Unknown + || newtqStatus.status() == Kopete::OnlineStatus::Unknown ) ) t = noEvent; // This means the contact's changed from or to unknown - due to a protocol state change, not a contact state change else // we're dealing with a genuine contact state change { - if ( m_oldStatus.status() == Kopete::OnlineStatus::Offline ) + if ( m_oldtqStatus.status() == Kopete::OnlineStatus::Offline ) { - if ( newStatus.status() != Kopete::OnlineStatus::Offline ) + if ( newtqStatus.status() != Kopete::OnlineStatus::Offline ) { //kdDebug( 14000 ) << "signed in" << endl; t = signedIn; // contact has gone from offline to something else, it's a sign-in } } - else if ( m_oldStatus.status() == Kopete::OnlineStatus::Online - || m_oldStatus.status() == Kopete::OnlineStatus::Away - || m_oldStatus.status() == Kopete::OnlineStatus::Invisible) + else if ( m_oldtqStatus.status() == Kopete::OnlineStatus::Online + || m_oldtqStatus.status() == Kopete::OnlineStatus::Away + || m_oldtqStatus.status() == Kopete::OnlineStatus::Invisible) { - if ( newStatus.status() == Kopete::OnlineStatus::Offline ) + if ( newtqStatus.status() == Kopete::OnlineStatus::Offline ) { //kdDebug( 14000 ) << "signed OUT" << endl; t = signedOut; // contact has gone from an online state to an offline state, it's a sign out } - else if ( m_oldStatus > newStatus || m_oldStatus < newStatus ) // operator!= is useless because it's an identity operator, not an equivalence operator + else if ( m_oldtqStatus > newtqStatus || m_oldtqStatus < newtqStatus ) // operator!= is useless because it's an identity operator, not an equivalence operator { // contact has changed online states, it's a status change, // and the preferredContact changed status, or there is a new preferredContacat // so it's worth notifying //kdDebug( 14000 ) << "changed status" << endl; - t = changedStatus; + t = changedtqStatus; } } - else if ( m_oldStatus != newStatus ) + else if ( m_oldtqStatus != newtqStatus ) { //kdDebug( 14000 ) << "non-event" << endl; // catch-all for any other status change we don't know about @@ -441,7 +441,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) connect(KNotification::event(m_metaContact, "kopete_contact_online", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() ) ); break; - case changedStatus: + case changedtqStatus: connect(KNotification::event(m_metaContact, "kopete_contact_status_change", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() )); break; @@ -468,7 +468,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) } // make a note of the current status for the next time we get a status change - m_oldStatus = newStatus; + m_oldtqStatus = newtqStatus; if ( m_parentGroup ) m_parentGroup->refreshDisplayName(); @@ -521,7 +521,7 @@ void KopeteMetaContactLVI::slotPhotoChanged() { int photoSize = d->iconSize; - photoImg = photoImg.smoothScale( photoSize, photoSize, TQImage::ScaleMin ); + photoImg = photoImg.smoothScale( photoSize, photoSize, TQ_ScaleMin ); KImageEffect *effect = 0L; switch ( m_metaContact->status() ) @@ -530,17 +530,17 @@ void KopeteMetaContactLVI::slotPhotoChanged() break; case Kopete::OnlineStatus::Away: effect = new KImageEffect(); - effect->fade(photoImg, 0.5, Qt::white); + effect->fade(photoImg, 0.5, TQt::white); break; case Kopete::OnlineStatus::Offline: effect = new KImageEffect(); - effect->fade(photoImg, 0.4, Qt::white); + effect->fade(photoImg, 0.4, TQt::white); effect->toGray(photoImg); break; case Kopete::OnlineStatus::Unknown: default: effect = new KImageEffect(); - effect->fade(photoImg, 0.8, Qt::white); + effect->fade(photoImg, 0.8, TQt::white); } delete effect; @@ -611,7 +611,7 @@ void KopeteMetaContactLVI::slotMoveToGroup() else { Kopete::Group *to = Kopete::ContactList::self()->getGroup( m_actionMove->currentText() ); - if ( !m_metaContact->groups().contains( to ) ) + if ( !m_metaContact->groups().tqcontains( to ) ) m_metaContact->moveToGroup( group(), to ); } } @@ -658,7 +658,7 @@ void KopeteMetaContactLVI::slotConfigChanged() // create a spacer if wanted delete d->spacerBox->component( 0 ); - if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && + if ( KListViewItem::tqparent() && KopetePrefs::prefs()->contactListIndentContacts() && !KopetePrefs::prefs()->treeView() ) { new ListView::SpacerComponent( d->spacerBox, 20, 0 ); @@ -802,9 +802,9 @@ void KopeteMetaContactLVI::updateVisibility() void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, const TQString &key, const TQVariant &old, const TQVariant &newVal ) { -// if ( key == TQString::fromLatin1("awayMessage") ) +// if ( key == TQString::tqfromLatin1("awayMessage") ) // kdDebug( 14000 ) << k_funcinfo << "contact=" << contact->contactId() << ", isonline=" << contact->isOnline() << ", alloffline=" << !m_metaContact->isOnline() << ", oldvalue=" << old.toString() << ", newvalue=" << newVal.toString() << endl; - if ( key == TQString::fromLatin1("awayMessage") && d->extraText && old != newVal ) + if ( key == TQString::tqfromLatin1("awayMessage") && d->extraText && old != newVal ) { bool allOffline = !m_metaContact->isOnline(); if ( newVal.toString().isEmpty() || ( !contact->isOnline() && !allOffline ) ) @@ -829,7 +829,7 @@ void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, } } if ( allAwayMessagesEmpty ) - d->extraText->setText( TQString::null ); + d->extraText->setText( TQString() ); } else { @@ -839,7 +839,7 @@ void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, d->extraText->setText( newVal.toString() ); } } // wtf? KopeteMetaContact also connects this signals and emits photoChanged! why no connect photoChanged to slotPhotoChanged? - /*else if ( key == TQString::fromLatin1("photo") && (m_metaContact->photoSourceContact() == contact) && (m_metaContact->photoSource() == Kopete::MetaContact::SourceContact)) + /*else if ( key == TQString::tqfromLatin1("photo") && (m_metaContact->photoSourceContact() == contact) && (m_metaContact->photoSource() == Kopete::MetaContact::SourceContact)) { slotPhotoChanged(); }*/ @@ -855,8 +855,8 @@ void KopeteMetaContactLVI::slotContactAdded( Kopete::Contact *c ) updateContactIcon( c ); - slotContactPropertyChanged( c, TQString::fromLatin1("awayMessage"), - TQVariant(), c->property( TQString::fromLatin1("awayMessage") ).value() ); + slotContactPropertyChanged( c, TQString::tqfromLatin1("awayMessage"), + TQVariant(), c->property( TQString::tqfromLatin1("awayMessage") ).value() ); } void KopeteMetaContactLVI::slotContactRemoved( Kopete::Contact *c ) @@ -870,8 +870,8 @@ void KopeteMetaContactLVI::slotContactRemoved( Kopete::Contact *c ) if ( ListView::Component *comp = contactComponent( c ) ) delete comp; - slotContactPropertyChanged( c, TQString::fromLatin1("awayMessage"), - c->property( TQString::fromLatin1("awayMessage") ).value(), TQVariant() ); + slotContactPropertyChanged( c, TQString::tqfromLatin1("awayMessage"), + c->property( TQString::tqfromLatin1("awayMessage") ).value(), TQVariant() ); } void KopeteMetaContactLVI::updateContactIcons() @@ -884,9 +884,9 @@ void KopeteMetaContactLVI::updateContactIcons() void KopeteMetaContactLVI::updateContactIcon( Kopete::Contact *c ) { - KGlobal::config()->setGroup( TQString::fromLatin1("ContactList") ); + KGlobal::config()->setGroup( TQString::tqfromLatin1("ContactList") ); bool bHideOffline = KGlobal::config()->readBoolEntry( - TQString::fromLatin1("HideOfflineContacts"), false ); + TQString::tqfromLatin1("HideOfflineContacts"), false ); if ( KopetePrefs::prefs()->showOffline() ) bHideOffline = false; diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h index 02b16be4..e9629df4 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.h +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h @@ -53,11 +53,12 @@ class KopeteGroupViewItem; class KopeteMetaContactLVI : public Kopete::UI::ListView::Item { Q_OBJECT + TQ_OBJECT public: - KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent ); - KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent ); - KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *tqparent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *tqparent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *tqparent ); ~KopeteMetaContactLVI(); /** @@ -72,14 +73,14 @@ public: bool isTopLevel() const; /** - * parent when top-level + * tqparent when top-level */ - TQListView *parentView() const { return m_parentView; }; + TQListView *tqparentView() const { return m_parentView; }; /** - * parent when not top-level + * tqparent when not top-level */ - KopeteGroupViewItem *parentGroup() const { return m_parentGroup; }; + KopeteGroupViewItem *tqparentGroup() const { return m_parentGroup; }; /** * call this when the item has been moved to a different group @@ -170,7 +171,7 @@ private: int m_pixelWide; - Kopete::OnlineStatus m_oldStatus; + Kopete::OnlineStatus m_oldtqStatus; TQPixmap m_oldStatusIcon; TQPixmap m_originalBlinkIcon; diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui index e191d4b9..6c28f40a 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KopeteMetaLVIPropsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopeteMetaLVIPropsWidget</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>grpAddressbook</cstring> </property> @@ -58,15 +58,15 @@ <cstring>widAddresseeLink</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnExportKABC</cstring> </property> @@ -90,14 +90,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>107</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnImportKABC</cstring> </property> @@ -115,7 +115,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -126,7 +126,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioNameKABC</cstring> </property> @@ -134,15 +134,15 @@ <string>Use addressbook &name (needs 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"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioNameContact</cstring> </property> @@ -160,14 +160,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cmbAccountName</cstring> </property> @@ -185,15 +185,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioNameCustom</cstring> </property> @@ -211,14 +211,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>edtDisplayName</cstring> </property> @@ -227,7 +227,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -238,17 +238,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1" rowspan="3" colspan="1"> + <widget class="TQLabel" row="0" column="1" rowspan="3" colspan="1"> <property name="name"> <cstring>photoLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>92</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>64</width> <height>32767</height> @@ -267,7 +267,7 @@ <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioPhotoKABC</cstring> </property> @@ -275,15 +275,15 @@ <string>U&se addressbook photo (needs addressbook link)</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioPhotoContact</cstring> </property> @@ -301,14 +301,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cmbAccountPhoto</cstring> </property> @@ -326,15 +326,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioPhotoCustom</cstring> </property> @@ -352,7 +352,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -376,7 +376,7 @@ <property name="name"> <cstring>btnClearPhoto</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -390,7 +390,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>chkSyncPhoto</cstring> </property> @@ -400,7 +400,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -411,7 +411,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpIcons</cstring> </property> @@ -422,7 +422,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblAway</cstring> </property> @@ -433,7 +433,7 @@ <cstring>icnbAway</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblOnline</cstring> </property> @@ -444,7 +444,7 @@ <cstring>icnbOnline</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>chkUseCustomIcons</cstring> </property> @@ -487,7 +487,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lblOffline</cstring> </property> @@ -498,7 +498,7 @@ <cstring>icnbOffline</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>lblUnknown</cstring> </property> @@ -519,7 +519,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -538,7 +538,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>170</height> @@ -570,7 +570,7 @@ <header>addressbooklinkwidget.h</header> </customwidget> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>addressbooklinkwidget.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp b/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp index 6595e237..b4dc9569 100644 --- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> #include "kopetestatusgroupviewitem.h" -KopeteStatusGroupViewItem::KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *parent, const char *name ) - : TQListViewItem(parent,name) +KopeteStatusGroupViewItem::KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *tqparent, const char *name ) + : TQListViewItem(tqparent,name) { m_status = status_; } diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h index 2f4f08b3..d3cc8281 100644 --- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h +++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h @@ -27,10 +27,10 @@ *@author Duncan Mac-Vicar Prett <[email protected]> */ - class KopeteStatusGroupViewItem : public QListViewItem + class KopeteStatusGroupViewItem : public TQListViewItem { public: - KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *parent, const char *name=0); + KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *tqparent, const char *name=0); ~KopeteStatusGroupViewItem(); private: |