summaryrefslogtreecommitdiffstats
path: root/kaddressbook/editors/imeditorwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/editors/imeditorwidget.cpp')
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 533b7d4b7..0e7357ea0 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -25,7 +25,7 @@
#include <tqlistview.h>
#include <tqstringlist.h>
#include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfont.h>
#include <tqpainter.h>
@@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const
}
void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
if ( mPreferred ) {
TQFont font = p->font();
@@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
p->setFont( font );
}
- KListViewItem::paintCell( p, cg, column, width, tqalignment );
+ KListViewItem::paintCell( p, cg, column, width, alignment );
}
void IMAddressLVI::setAddress( const TQString &address )
@@ -85,7 +85,7 @@ void IMAddressLVI::setAddress( const TQString &address )
else {
TQString nickname = address.section( TQChar( 0xE120 ), 0, 0 );
setText( 1, i18n( "<nickname> on <server>","%1 on %2" )
- .tqarg( nickname ).tqarg( serverOrGroup ) );
+ .arg( nickname ).arg( serverOrGroup ) );
}
mAddress = address;
@@ -167,7 +167,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
//mWidget->btnDown->setEnabled( false );
mPreferred = preferredIM;
mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
- mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );
+ mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
// order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
TQMap<TQString, KPluginInfo *> protocolMap;
@@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr )
TQString app, name, value;
splitField( *it, app, name, value );
- if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) {
- if ( name == TQString::tqfromLatin1( "All" ) ) {
+ if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) {
+ if ( name == TQString::fromLatin1( "All" ) ) {
KPluginInfo *protocol = protocolFromString( app );
if ( protocol ) {
TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value );
@@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr )
TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString();
if ( !lst.isEmpty() )
- addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
+ addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
else
- addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) );
+ addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) );
}
}