From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/groupwise/gwprotocol.cpp | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'kopete/protocols/groupwise/gwprotocol.cpp') diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 6eb489a2..176a4b92 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -41,12 +41,12 @@ K_EXPORT_COMPONENT_FACTORY( kopete_groupwise, GroupWiseProtocolFactory( "kopete_ GroupWiseProtocol *GroupWiseProtocol::s_protocol = 0L; -GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ ) - : Kopete::Protocol( GroupWiseProtocolFactory::instance(), parent, name ), +GroupWiseProtocol::GroupWiseProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ ) + : Kopete::Protocol( GroupWiseProtocolFactory::instance(), tqparent, name ), /* initialise Kopete::OnlineStatus that should be user selectable in the user interface */ - groupwiseOffline ( Kopete::OnlineStatus::Offline, 0, this, GroupWise::Offline, TQString::null, + groupwiseOffline ( Kopete::OnlineStatus::Offline, 0, this, GroupWise::Offline, TQString(), i18n( "Offline" ), i18n( "O&ffline" ), Kopete::OnlineStatusManager::Offline ), - groupwiseAvailable ( Kopete::OnlineStatus::Online, 25, this, GroupWise::Available, TQString::null, + groupwiseAvailable ( Kopete::OnlineStatus::Online, 25, this, GroupWise::Available, TQString(), i18n( "Online" ), i18n( "&Online" ), Kopete::OnlineStatusManager::Online ), groupwiseBusy ( Kopete::OnlineStatus::Away, 18, this, GroupWise::Busy, "contact_busy_overlay", i18n( "Busy" ), i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), @@ -61,15 +61,15 @@ GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const groupwiseUnknown ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Unknown, "status_unknown", i18n( "Unknown" ) ), groupwiseInvalid ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Invalid, "status_unknown", - i18n( "Invalid Status" ) ), + i18n( "Invalid tqStatus" ) ), groupwiseConnecting ( Kopete::OnlineStatus::Connecting, 25, this, 99, "groupwise_connecting", i18n( "Connecting" ) ), propGivenName( Kopete::Global::Properties::self()->firstName() ), propLastName( Kopete::Global::Properties::self()->lastName() ), propFullName( Kopete::Global::Properties::self()->fullName() ), propAwayMessage( Kopete::Global::Properties::self()->awayMessage() ), - propAutoReply( "groupwiseAutoReply", i18n( "Auto Reply Message" ), TQString::null, false, false ), - propCN( "groupwiseCommonName", i18n( "Common Name" ), TQString::null, true, false ), + propAutoReply( "groupwiseAutoReply", i18n( "Auto Reply Message" ), TQString(), false, false ), + propCN( "groupwiseCommonName", i18n( "Common Name" ), TQString(), true, false ), propPhoneWork( Kopete::Global::Properties::self()->workPhone() ), propPhoneMobile( Kopete::Global::Properties::self()->privateMobilePhone() ), propEmail( Kopete::Global::Properties::self()->emailAddress() ) @@ -94,7 +94,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( TQString accountId = serializedData[ "accountId" ]; TQString displayName = serializedData[ "displayName" ]; int objectId = serializedData[ "objectId" ].toInt(); - int parentId = serializedData[ "parentId" ].toInt(); + int tqparentId = serializedData[ "tqparentId" ].toInt(); int sequence = serializedData[ "sequenceNumber" ].toInt(); TQDict accounts = Kopete::AccountManager::self()->accounts( this ); @@ -107,19 +107,19 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( } // FIXME: creating a contact with a userId here - return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence ); + return new GroupWiseContact(account, dn, metaContact, objectId, tqparentId, sequence ); } -AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * account ) +AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account ) { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Creating Add Contact Page" << endl; - return new GroupWiseAddContactPage( account, parent, "addcontactpage"); + return new GroupWiseAddContactPage( account, tqparent, "addcontactpage"); } -KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) +KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << "Creating Edit Account Page" << endl; - return new GroupWiseEditAccountWidget( parent, account ); + return new GroupWiseEditAccountWidget( tqparent, account ); } Kopete::Account *GroupWiseProtocol::createNewAccount( const TQString &accountId ) @@ -173,7 +173,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) // of multi-byte UTF-8 characters 2 to 6 bytes long (with first byte > 0x7f), these are recoded as 32 bit values, escaped as \u? strings // vanilla RTF "envelope" that doesn't say much but causes other clients to accept the message - TQString rtfTemplate = TQString::fromLatin1("{\\rtf1\\ansi\n" + TQString rtfTemplate = TQString::tqfromLatin1("{\\rtf1\\ansi\n" "{\\fonttbl{\\f0\\fnil Unknown;}}\n" "{\\colortbl ;\\red0\\green0\\blue0;}\n" "\\uc1\\cf1\\f0\\fs18 %1\\par\n}"); @@ -182,7 +182,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) uint index = 0; // current char to transcode while ( index < plainUtf8.length() ) { - Q_UINT8 current = plainUtf8.data()[ index ]; + TQ_UINT8 current = plainUtf8.data()[ index ]; if ( current <= 0x7F ) { switch ( current ) @@ -190,7 +190,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) case '{': case '}': case '\\': - outputText.append( TQString( "\\%1" ).arg( TQChar( current ) ) ); + outputText.append( TQString( "\\%1" ).tqarg( TQChar( current ) ) ); break; case '\n': outputText.append( "\\par " ); @@ -203,7 +203,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) } else { - Q_UINT32 ucs4Char; + TQ_UINT32 ucs4Char; int bytesEncoded; TQString escapedUnicodeChar; if ( current <= 0xDF ) @@ -253,18 +253,18 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) bytesEncoded = 1; } index += bytesEncoded; - escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "unicode escaped char: " << escapedUnicodeChar << endl; + escapedUnicodeChar = TQString("\\u%1?").tqarg( ucs4Char ); + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl; outputText.append( escapedUnicodeChar ); } } - return rtfTemplate.arg( outputText ); + return rtfTemplate.tqarg( outputText ); } TQString GroupWiseProtocol::dnToDotted( const TQString & dn ) { TQRegExp rx("[a-zA-Z]*=(.*)$", false ); - if( !dn.find( '=' ) ) // if it's not a DN, return it unprocessed + if( !dn.tqfind( '=' ) ) // if it's not a DN, return it unprocessed return dn; // split the dn into elements -- cgit v1.2.1