diff options
Diffstat (limited to 'kopete/kopete/contactlist')
-rw-r--r-- | kopete/kopete/contactlist/customnotificationprops.cpp | 4 | ||||
-rw-r--r-- | kopete/kopete/contactlist/customnotifications.ui | 6 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kabcexport_base.ui | 6 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopeteaddrbookexport.cpp | 2 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopeteaddrbookexport.h | 2 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetecontactlistview.cpp | 56 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetegroupviewitem.cpp | 4 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetegvipropswidget.ui | 4 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetelviprops.cpp | 20 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 92 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetemetacontactlvi.h | 2 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetemetalvipropswidget.ui | 30 |
12 files changed, 114 insertions, 114 deletions
diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp index f8e2bb85..8c9deb30 100644 --- a/kopete/kopete/contactlist/customnotificationprops.cpp +++ b/kopete/kopete/contactlist/customnotificationprops.cpp @@ -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; diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index 45f15dad..b3b578d8 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui index fa147a52..c9b8f883 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/kabcexport_base.ui @@ -41,7 +41,7 @@ <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> @@ -135,7 +135,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp index 11ec93d0..b3b6d630 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 diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.h b/kopete/kopete/contactlist/kopeteaddrbookexport.h index 62f1858d..0190e8b7 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 diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index d86a4f67..d3459c07 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -28,7 +28,7 @@ #include <tqcursor.h> #include <tqdragobject.h> #include <tqheader.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqtimer.h> #include <tqtooltip.h> #include <tqguardedptr.h> @@ -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 ) { @@ -475,14 +475,14 @@ void KopeteContactListView::initActions( KActionCollection *ac ) actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ), ac, "contactStartChat" ); - actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "editcut" ), + 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::fromLatin1( "editcopy" ), 0, + actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::tqfromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), ac, "contactRemove" ); - actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ), + 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, @@ -491,7 +491,7 @@ void KopeteContactListView::initActions( KActionCollection *ac ) 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, @@ -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 ); @@ -716,9 +716,9 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, text=text.replace("&","&&"); // 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" ); @@ -1003,7 +1003,7 @@ void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *con { 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(), parent->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); @@ -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() ) ); } } @@ -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 } @@ -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 { @@ -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 @@ -1772,7 +1772,7 @@ void KopeteContactListView::slotProperties() { } */ - metaLVI->repaint(); + metaLVI->tqrepaint(); } else if(groupLVI) { diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index b28b7cb3..d952e728 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 <klingens@kde.org> @@ -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/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui index 6e13abba..f336b240 100644 --- a/kopete/kopete/contactlist/kopetegvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui @@ -36,7 +36,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index f9c7cbbc..b1047dff 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -26,7 +26,7 @@ #include <tqapplication.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqtabwidget.h> @@ -66,7 +66,7 @@ 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) +: KDialogBase(parent, 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); @@ -146,7 +146,7 @@ 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) +: KDialogBase(parent, 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 ); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 4bc67acd..2afe4fe9 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -22,7 +22,7 @@ #include <tqtimer.h> #include <tqvariant.h> #include <tqmime.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include "knotification.h" #include <kdebug.h> @@ -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; @@ -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(); @@ -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 Status: " << m_oldtqStatus.status() << ", New MC Status: " << 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(); @@ -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 ) ) @@ -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 fc755158..9dcdcc4f 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.h +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h @@ -171,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 718a3ae9..da5b2d99 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>107</width> <height>20</height> @@ -136,7 +136,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -242,13 +242,13 @@ <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> @@ -277,7 +277,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -301,7 +301,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -328,7 +328,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -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> |