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/oscar/aim/aimaccount.cpp | 110 ++++++++++----------- kopete/protocols/oscar/aim/aimaccount.h | 12 ++- kopete/protocols/oscar/aim/aimchatsession.h | 3 +- kopete/protocols/oscar/aim/aimcontact.cpp | 106 ++++++++++---------- kopete/protocols/oscar/aim/aimcontact.h | 5 +- kopete/protocols/oscar/aim/aimjoinchat.cpp | 4 +- kopete/protocols/oscar/aim/aimjoinchat.h | 3 +- kopete/protocols/oscar/aim/aimprotocol.cpp | 60 +++++------ kopete/protocols/oscar/aim/aimprotocol.h | 7 +- kopete/protocols/oscar/aim/aimuserinfo.cpp | 16 +-- kopete/protocols/oscar/aim/aimuserinfo.h | 3 +- .../protocols/oscar/aim/ui/aimaddcontactpage.cpp | 4 +- kopete/protocols/oscar/aim/ui/aimaddcontactpage.h | 3 +- kopete/protocols/oscar/aim/ui/aimaddcontactui.ui | 14 +-- kopete/protocols/oscar/aim/ui/aimeditaccountui.ui | 88 ++++++++--------- .../oscar/aim/ui/aimeditaccountwidget.cpp | 4 +- .../protocols/oscar/aim/ui/aimeditaccountwidget.h | 3 +- kopete/protocols/oscar/aim/ui/aiminfobase.ui | 50 +++++----- kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui | 20 ++-- 19 files changed, 262 insertions(+), 253 deletions(-) (limited to 'kopete/protocols/oscar/aim') diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 9a6ec9de..1f0269c8 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -118,7 +118,7 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio return; //okay, now we need to change the message.escapedBody from real HTML to aimhtml. //looking right now for docs on that "format". - //looks like everything except for alignment codes comes in the format of spans + //looks like everything except for tqalignment codes comes in the format of spans //font-style:italic -> //font-weight:600 -> (anything > 400 should be , 400 is not bold) @@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio //font-size:xxpt -> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::fromLatin1("([^<]*)")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("\\2")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); - s.replace ( TQRegExp ( TQString::fromLatin1("")), TQString::fromLatin1("
") ); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -200,13 +200,13 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio } -AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name) - : OscarAccount(parent, accountID, name, false) +AIMAccount::AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name) + : OscarAccount(tqparent, accountID, name, false) { kdDebug(14152) << k_funcinfo << accountID << ": Called."<< endl; AIMMyselfContact* mc = new AIMMyselfContact( this ); setMyself( mc ); - myself()->setOnlineStatus( static_cast( parent )->statusOffline ); + myself()->setOnlineStatus( static_cast( tqparent )->statusOffline ); TQString profile = configGroup()->readEntry( "Profile", i18n( "Visit the Kopete website at http://kopete.kde.org") ); mc->setOwnProfile( profile ); @@ -235,9 +235,9 @@ AIMAccount::~AIMAccount() { } -OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) +OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) { - AIMContact* contact = new AIMContact( this, contactId, parentContact, TQString::null, ssiItem ); + AIMContact* contact = new AIMContact( this, contactId, tqparentContact, TQString(), ssiItem ); if ( !ssiItem.alias().isEmpty() ) contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() ); @@ -280,7 +280,7 @@ TQString AIMAccount::sanitizedMessage( const TQString& message ) continue; if ( fontEl.hasAttribute( "back" ) ) { - kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to replace. Doing replacement" << endl; + kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to tqreplace. Doing replacement" << endl; TQString backgroundColor = fontEl.attribute( "back" ); backgroundColor.insert( 0, "background-color: " ); backgroundColor.append( ';' ); @@ -300,13 +300,13 @@ KActionMenu* AIMAccount::actionMenu() // mActionMenu is managed by Kopete::Account. It is deleted when // it is no longer shown, so we can (safely) just make a new one here. KActionMenu *mActionMenu = new KActionMenu(accountId(), - myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); + myself()->onlinetqStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); AIMProtocol *p = AIMProtocol::protocol(); TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString(); - mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - i18n( "%2 <%1>" ).arg( accountId(), accountNick )); + mActionMenu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + i18n( "%2 <%1>" ).tqarg( accountId(), accountNick )); mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); @@ -322,7 +322,7 @@ KActionMenu* AIMAccount::actionMenu() mActionMenu->insert( mActionOffline ); mActionMenu->popupMenu()->insertSeparator(); - KAction* m_joinChatAction = new KAction( i18n( "Join Chat..." ), TQString::null, 0, this, + KAction* m_joinChatAction = new KAction( i18n( "Join Chat..." ), TQString(), 0, this, TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); mActionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, @@ -344,16 +344,16 @@ void AIMAccount::setAway(bool away, const TQString &awayReason) // kdDebug(14152) << k_funcinfo << accountId() << "reason is " << awayReason << endl; if ( away ) { - engine()->setStatus( Client::Away, awayReason ); + engine()->settqStatus( Client::Away, awayReason ); AIMMyselfContact* me = static_cast ( myself() ); me->setLastAwayMessage(awayReason); me->setProperty( Kopete::Global::Properties::self()->awayMessage(), awayReason ); } else { - engine()->setStatus( Client::Online ); + engine()->settqStatus( Client::Online ); AIMMyselfContact* me = static_cast ( myself() ); - me->setLastAwayMessage(TQString::null); + me->setLastAwayMessage(TQString()); me->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); } } @@ -374,7 +374,7 @@ void AIMAccount::setUserProfile(const TQString &profile) AIMMyselfContact* aimmc = dynamic_cast( myself() ); if ( aimmc ) aimmc->setOwnProfile( profile ); - configGroup()->writeEntry( TQString::fromLatin1( "Profile" ), profile ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Profile" ), profile ); } void AIMAccount::slotEditInfo() @@ -451,7 +451,7 @@ void AIMAccount::slotBuddyIconChanged() iconFile.open( IO_ReadOnly ); KMD5 iconHash; - iconHash.update( iconFile ); + iconHash.update( *TQT_TQIODEVICE(&iconFile) ); kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "hash is :" << iconHash.hexDigest() << endl; //find old item, create updated item @@ -532,13 +532,13 @@ void AIMAccount::slotJoinChat() void AIMAccount::slotGoOnline() { - if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) + if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) { kdDebug(14152) << k_funcinfo << accountId() << " was away. welcome back." << endl; - engine()->setStatus( Client::Online ); + engine()->settqStatus( Client::Online ); myself()->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); } - else if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) + else if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) { kdDebug(14152) << k_funcinfo << accountId() << " was offline. time to connect" << endl; OscarAccount::connect(); @@ -597,16 +597,16 @@ void AIMAccount::disconnected( DisconnectReason reason ) void AIMAccount::messageReceived( const Oscar::Message& message ) { kdDebug(14152) << k_funcinfo << " Got a message, calling OscarAccount::messageReceived" << endl; - // Want to call the parent to do everything else + // Want to call the tqparent to do everything else if ( message.type() != 0x0003 ) { OscarAccount::messageReceived(message); // Check to see if our status is away, and send an away message - // Might be duplicate code from the parent class to get some needed information + // Might be duplicate code from the tqparent class to get some needed information // Perhaps a refactoring is needed. kdDebug(14152) << k_funcinfo << "Checking to see if I'm online.." << endl; - if( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) + if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) { TQString sender = Oscar::normalize( message.sender() ); AIMContact* aimSender = static_cast ( contacts()[sender] ); //should exist now @@ -759,7 +759,7 @@ void AIMAccount::connectWithPassword( const TQString & ) // Get the screen name for this account TQString screenName = accountId(); - TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) ); + TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) ); uint port = configGroup()->readNumEntry( "Port", 5190 ); Connection* c = setupConnection( server, port ); @@ -771,7 +771,7 @@ void AIMAccount::connectWithPassword( const TQString & ) << "AIM network because no password was specified in the " << "preferences." << endl; } - else if ( myself()->onlineStatus() == static_cast( protocol() )->statusOffline ) + else if ( myself()->onlinetqStatus() == static_cast( protocol() )->statusOffline ) { kdDebug(14152) << k_funcinfo << "Logging in as " << accountId() << endl ; updateVersionUpdaterStamp(); @@ -895,7 +895,7 @@ void AIMAccount::setPrivacySettings( int privacy ) void AIMAccount::setPrivacyTLVs( BYTE privacy, DWORD userClasses ) { SSIManager* ssi = engine()->ssiManager(); - Oscar::SSI item = ssi->findItem( TQString::null, ROSTER_VISIBILITY ); + Oscar::SSI item = ssi->findItem( TQString(), ROSTER_VISIBILITY ); TQValueList tList; @@ -905,7 +905,7 @@ void AIMAccount::setPrivacyTLVs( BYTE privacy, DWORD userClasses ) if ( !item ) { kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Adding new privacy TLV item" << endl; - Oscar::SSI s( TQString::null, 0, ssi->nextContactId(), ROSTER_VISIBILITY, tList ); + Oscar::SSI s( TQString(), 0, ssi->nextContactId(), ROSTER_VISIBILITY, tList ); engine()->modifySSIItem( item, s ); } else diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index 2df309b6..35c7adb5 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -53,6 +53,7 @@ class OscarVisibilityDialog; class AIMMyselfContact : public OscarMyselfContact { Q_OBJECT + TQ_OBJECT public: AIMMyselfContact( AIMAccount *acct ); void userInfoUpdated(); @@ -62,7 +63,7 @@ public: TQString lastAwayMessage() { return m_lastAwayMessage; }; virtual Kopete::ChatSession* manager( Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate, - WORD exchange = 0, const TQString& room = TQString::null); + WORD exchange = 0, const TQString& room = TQString()); public slots: void sendMessage( Kopete::Message&, Kopete::ChatSession* session ); @@ -83,15 +84,16 @@ private: class AIMAccount : public OscarAccount { Q_OBJECT + TQ_OBJECT public: - AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name=0L); + AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name=0L); virtual ~AIMAccount(); // Accessor method for the action menu virtual KActionMenu* actionMenu(); - void setAway(bool away, const TQString &awayReason = TQString::null ); + void setAway(bool away, const TQString &awayReason = TQString() ); virtual void connectWithPassword( const TQString &password ); @@ -101,7 +103,7 @@ public: public slots: /** Reimplementation from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status, const TQString& reason = TQString::null ); + void setOnlineStatus( const Kopete::OnlineStatus& status, const TQString& reason = TQString() ); void slotEditInfo(); void slotGoOnline(); @@ -131,7 +133,7 @@ protected: * Implement virtual method from OscarAccount * This allows OscarAccount to take care of adding new contacts */ - OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ); + OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ); TQString sanitizedMessage( const TQString& message ); diff --git a/kopete/protocols/oscar/aim/aimchatsession.h b/kopete/protocols/oscar/aim/aimchatsession.h index 9ce3ce1f..0634d02a 100644 --- a/kopete/protocols/oscar/aim/aimchatsession.h +++ b/kopete/protocols/oscar/aim/aimchatsession.h @@ -27,10 +27,11 @@ class Client; class AIMChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: AIMChatSession( const Kopete::Contact* contact, Kopete::ContactPtrList others, Kopete::Protocol* protocol, Oscar::WORD exchange = 0, - const TQString& room = TQString::null ); + const TQString& room = TQString() ); virtual ~AIMChatSession(); /** diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index b32a5305..7f14d3ba 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -43,9 +43,9 @@ #include "aimcontact.h" #include "aimaccount.h" -AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::MetaContact* parent, +AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::MetaContact* tqparent, const TQString& icon, const Oscar::SSI& ssiItem ) -: OscarContact(account, name, parent, icon, ssiItem ) +: OscarContact(account, name, tqparent, icon, ssiItem ) { mProtocol=static_cast(protocol()); setOnlineStatus( mProtocol->statusOffline ); @@ -56,7 +56,7 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete:: m_haveAwayMessage = false; m_mobile = false; // Set the last autoresponse time to the current time yesterday - m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1); + m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime().addDays(-1); TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); @@ -66,8 +66,8 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete:: this, TQT_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) ); TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), this, TQT_SLOT( updateProfile( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userWarned( const TQString&, Q_UINT16, Q_UINT16 ) ), - this, TQT_SLOT( gotWarning( const TQString&, Q_UINT16, Q_UINT16 ) ) ); + TQObject::connect( mAccount->engine(), TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), + this, TQT_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); TQObject::connect( mAccount->engine(), TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), this, TQT_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); TQObject::connect( mAccount->engine(), TQT_SIGNAL( iconServerConnected() ), @@ -127,16 +127,16 @@ void AIMContact::setAwayMessage(const TQString &message) kdDebug(14152) << k_funcinfo << "Called for '" << contactId() << "', away msg='" << message << "'" << endl; TQString filteredMessage = message; - filteredMessage.replace( - TQRegExp(TQString::fromLatin1("<[hH][tT][mM][lL].*>(.*)")), - TQString::fromLatin1("\\1")); - filteredMessage.replace( - TQRegExp(TQString::fromLatin1("<[bB][oO][dD][yY].*>(.*)")), - TQString::fromLatin1("\\1") ); - TQRegExp fontRemover( TQString::fromLatin1("<[fF][oO][nN][tT].*>(.*)") ); + filteredMessage.tqreplace( + TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)")), + TQString::tqfromLatin1("\\1")); + filteredMessage.tqreplace( + TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)")), + TQString::tqfromLatin1("\\1") ); + TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)") ); fontRemover.setMinimal(true); - while ( filteredMessage.find( fontRemover ) != -1 ) - filteredMessage.replace( fontRemover, TQString::fromLatin1("\\1") ); + while ( filteredMessage.tqfind( fontRemover ) != -1 ) + filteredMessage.tqreplace( fontRemover, TQString::tqfromLatin1("\\1") ); setProperty(mProtocol->awayMessage, filteredMessage); } @@ -148,7 +148,7 @@ int AIMContact::warningLevel() const void AIMContact::updateSSIItem() { if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false && - onlineStatus() == Kopete::OnlineStatus::Unknown ) + onlinetqStatus() == Kopete::OnlineStatus::Unknown ) { //make sure they're offline setOnlineStatus( static_cast( protocol() )->statusOffline ); @@ -302,7 +302,7 @@ void AIMContact::updateProfile( const TQString& contact, const TQString& profile emit updatedProfile(); } -void AIMContact::gotWarning( const TQString& contact, Q_UINT16 increase, Q_UINT16 newLevel ) +void AIMContact::gotWarning( const TQString& contact, TQ_UINT16 increase, TQ_UINT16 newLevel ) { //somebody just got bitchslapped! :O Q_UNUSED( increase ); @@ -351,11 +351,11 @@ void AIMContact::warnUser() "(Warning a user on AIM will result in a \"Warning Level\"" \ " increasing for the user you warn. Once this level has reached a" \ " certain point, they will not be able to sign on. Please do not abuse" \ - " this function, it is meant for legitimate practices.)" ).arg( nick ); + " this function, it is meant for legitimate practices.)" ).tqarg( nick ); int result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), message, - i18n( "Warn User %1?" ).arg( nick ), + i18n( "Warn User %1?" ).tqarg( nick ), i18n( "Warn Anonymously" ), i18n( "Warn" ) ); if ( result == KMessageBox::Yes ) @@ -383,7 +383,7 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) return; //okay, now we need to change the message.escapedBody from real HTML to aimhtml. //looking right now for docs on that "format". - //looks like everything except for alignment codes comes in the format of spans + //looks like everything except for tqalignment codes comes in the format of spans //font-style:italic -> //font-weight:600 -> (anything > 400 should be , 400 is not bold) @@ -392,59 +392,59 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) //font-size:xxpt -> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::fromLatin1("([^<]*)")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("\\2")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); // strip left over line break - s.remove(TQRegExp(TQString::fromLatin1("]*>$"))); + s.remove(TQRegExp(TQString::tqfromLatin1("]*>$"))); - s.replace ( TQRegExp ( TQString::fromLatin1("")), TQString::fromLatin1("
") ); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); // strip left over line break - s.remove( TQRegExp( TQString::fromLatin1( "
$" ) ) ); + s.remove( TQRegExp( TQString::tqfromLatin1( "
$" ) ) ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -475,9 +475,9 @@ void AIMContact::updateFeatures() void AIMContact::sendAutoResponse(Kopete::Message& msg) { // The target time is 2 minutes later than the last message - int delta = m_lastAutoresponseTime.secsTo( TQDateTime::currentDateTime() ); + int delta = m_lastAutoresponseTime.secsTo( TQDateTime::tqcurrentDateTime() ); kdDebug(14152) << k_funcinfo << "Last autoresponse time: " << m_lastAutoresponseTime << endl; - kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::currentDateTime() << endl; + kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::tqcurrentDateTime() << endl; kdDebug(14152) << k_funcinfo << "Difference: " << delta << endl; // Check to see if we're past that time if(delta > 120) @@ -509,7 +509,7 @@ void AIMContact::sendAutoResponse(Kopete::Message& msg) manager(Kopete::Contact::CanCreate)->appendMessage(msg); manager(Kopete::Contact::CanCreate)->messageSucceeded(); // Update the last autoresponse time - m_lastAutoresponseTime = TQDateTime::currentDateTime(); + m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime(); } else { diff --git a/kopete/protocols/oscar/aim/aimcontact.h b/kopete/protocols/oscar/aim/aimcontact.h index a246c029..37be084d 100644 --- a/kopete/protocols/oscar/aim/aimcontact.h +++ b/kopete/protocols/oscar/aim/aimcontact.h @@ -35,10 +35,11 @@ class AIMUserInfoDialog; class AIMContact : public OscarContact { Q_OBJECT + TQ_OBJECT public: AIMContact( Kopete::Account*, const TQString&, Kopete::MetaContact*, - const TQString& icon = TQString::null, const Oscar::SSI& ssiItem = Oscar::SSI() ); + const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() ); virtual ~AIMContact(); bool isReachable(); @@ -68,7 +69,7 @@ public slots: void userOffline( const TQString& userId ); void updateAwayMessage( const TQString& userId, const TQString& message ); void updateProfile( const TQString& contact, const TQString& profile ); - void gotWarning( const TQString& contact, Q_UINT16, Q_UINT16 ); + void gotWarning( const TQString& contact, TQ_UINT16, TQ_UINT16 ); signals: void updatedProfile(); diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp index 2ccec9b2..98a68361 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.cpp +++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp @@ -27,8 +27,8 @@ #include "aimaccount.h" AIMJoinChatUI::AIMJoinChatUI( AIMAccount* account, bool modal, - TQWidget* parent, const char* name ) - : KDialogBase( parent, name, modal, i18n( "Join AIM Chat Room" ), + TQWidget* tqparent, const char* name ) + : KDialogBase( tqparent, name, modal, i18n( "Join AIM Chat Room" ), Cancel | User1, User1, true, i18n( "Join" ) ) { diff --git a/kopete/protocols/oscar/aim/aimjoinchat.h b/kopete/protocols/oscar/aim/aimjoinchat.h index a6e493d4..13dab708 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.h +++ b/kopete/protocols/oscar/aim/aimjoinchat.h @@ -30,8 +30,9 @@ class AIMJoinChatBase; class AIMJoinChatUI : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* parent = 0, + AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* tqparent = 0, const char* name = 0 ); ~AIMJoinChatUI(); diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 779c63c8..0808fde9 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -46,7 +46,7 @@ AIMProtocol* AIMProtocol::protocolStatic_ = 0L; AIMProtocolHandler::AIMProtocolHandler() : Kopete::MimeTypeHandler(false) { - registerAsProtocolHandler(TQString::fromLatin1("aim")); + registerAsProtocolHandler(TQString::tqfromLatin1("aim")); } void AIMProtocolHandler::handleURL(const KURL &url) const @@ -81,54 +81,54 @@ void AIMProtocolHandler::handleURL(const KURL &url) const TQString command = url.path(); TQString realCommand, firstParam, secondParam; bool needContactAddition = false; - if ( command.find( "goim", 0, false ) != -1 ) + if ( command.tqfind( "goim", 0, false ) != -1 ) { realCommand = "goim"; kdDebug(14152) << k_funcinfo << "Handling send IM request" << endl; command.remove(0,4); - if ( command.find( "?screenname=", 0, false ) == -1 ) + if ( command.tqfind( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove( 0, 12 ); - int andSign = command.find( "&" ); + int andSign = command.tqfind( "&" ); if ( andSign > 0 ) command = command.left( andSign ); firstParam = command; - firstParam.replace( "+", " " ); + firstParam.tqreplace( "+", " " ); needContactAddition = true; } else - if ( command.find( "addbuddy", 0, false ) != -1 ) + if ( command.tqfind( "addbuddy", 0, false ) != -1 ) { realCommand = "addbuddy"; kdDebug(14152) << k_funcinfo << "Handling AIM add buddy request" << endl; command.remove( 0, 8 ); - if ( command.find( "?screenname=", 0, false ) == -1 ) + if ( command.tqfind( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove(0, 12); - int andSign = command.find("&"); + int andSign = command.tqfind("&"); if ( andSign > 0 ) command = command.left(andSign); - command.replace("+", " "); + command.tqreplace("+", " "); firstParam = command; needContactAddition = true; } else - if ( command.find( "gochat", 0, false ) != -1 ) + if ( command.tqfind( "gochat", 0, false ) != -1 ) { realCommand = "gochat"; kdDebug(14152) << k_funcinfo << "Handling AIM chat room request" << endl; command.remove( 0, 6 ); - if ( command.find( "?RoomName=", 0, false ) == -1 ) + if ( command.tqfind( "?RoomName=", 0, false ) == -1 ) { kdWarning(14152) << "Unhandled AIM URI: " << url.url() << endl; return; @@ -136,7 +136,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); - int andSign = command.find("&"); + int andSign = command.tqfind("&"); if (andSign > 0) // strip off anything else for now { firstParam = command.left(andSign); @@ -146,7 +146,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); //remove "&Exchange=" secondParam = command; kdDebug(14152) << k_funcinfo << firstParam << " " << secondParam << endl; - firstParam.replace("+", " "); + firstParam.tqreplace("+", " "); } Kopete::Account *account = 0; @@ -189,8 +189,8 @@ void AIMProtocolHandler::handleURL(const KURL &url) const } if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), - i18n("Do you want to add '%1' to your contact list?").arg(command), - TQString::null, i18n("Add"), i18n("Do Not Add")) + i18n("Do you want to add '%1' to your contact list?").tqarg(command), + TQString(), i18n("Add"), i18n("Do Not Add")) != KMessageBox::Yes) { kdDebug(14152) << k_funcinfo << "Cancelled" << endl; @@ -212,8 +212,8 @@ void AIMProtocolHandler::handleURL(const KURL &url) const else KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n( "Unable to connect to the chat room %1 because the account" - " for %2 is not connected." ).arg( firstParam ).arg( aimAccount->accountId() ), - TQString::null ); + " for %2 is not connected." ).tqarg( firstParam ).tqarg( aimAccount->accountId() ), + TQString() ); } @@ -227,10 +227,10 @@ void AIMProtocolHandler::handleURL(const KURL &url) const -AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList &) - : Kopete::Protocol( AIMProtocolFactory::instance(), parent, name ), - statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), - statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), +AIMProtocol::AIMProtocol(TQObject *tqparent, const char *name, const TQStringList &) + : Kopete::Protocol( AIMProtocolFactory::instance(), tqparent, name ), + statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString(), i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), + statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ), statusWirelessOnline( Kopete::OnlineStatus::Online, 1, this, 30, "contact_phone_overlay", i18n("Mobile"), i18n("Mobile"), @@ -241,7 +241,7 @@ AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList awayMessage(Kopete::Global::Properties::self()->awayMessage()), clientFeatures("clientFeatures", i18n("Client Features"), 0, false), clientProfile( "clientProfile", i18n( "User Profile"), 0, false, true), - iconHash("iconHash", i18n("Buddy Icon MD5 Hash"), TQString::null, true, false, true) + iconHash("iconHash", i18n("Buddy Icon MD5 Hash"), TQString(), true, false, true) { if (protocolStatic_) kdDebug(14152) << k_funcinfo << "AIM plugin already initialized" << endl; @@ -283,11 +283,11 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.contains( "ssi_type" ) ) + if ( serializedData.tqcontains( "ssi_type" ) ) { ssiName = serializedData["ssi_name"]; - TQString authStatus = serializedData["ssi_waitingAuth"]; - if ( authStatus == "true" ) + TQString authtqStatus = serializedData["ssi_waitingAuth"]; + if ( authtqStatus == "true" ) ssiWaitingAuth = true; ssiGid = serializedData["ssi_gid"].toUInt(); ssiBid = serializedData["ssi_bid"].toUInt(); @@ -297,18 +297,18 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac Oscar::SSI item( ssiName, ssiGid, ssiBid, ssiType, TQValueList(), 0 ); item.setWaitingAuth( ssiWaitingAuth ); - AIMContact *c = new AIMContact( account, contactId, metaContact, TQString::null, item ); + AIMContact *c = new AIMContact( account, contactId, metaContact, TQString(), item ); return c; } -AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) +AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) { - return ( new AIMAddContactPage( account->isConnected(), parent ) ); + return ( new AIMAddContactPage( account->isConnected(), tqparent ) ); } -KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return ( new AIMEditAccountWidget( this, account, parent ) ); + return ( new AIMEditAccountWidget( this, account, tqparent ) ); } Kopete::Account *AIMProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/oscar/aim/aimprotocol.h b/kopete/protocols/oscar/aim/aimprotocol.h index 16c8860a..e133ed97 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.h +++ b/kopete/protocols/oscar/aim/aimprotocol.h @@ -40,9 +40,10 @@ public: class AIMProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - AIMProtocol( TQObject *parent, const char *name, const TQStringList &args ); + AIMProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~AIMProtocol(); /** * Return the active instance of the protocol @@ -56,8 +57,8 @@ public: const TQMap &serializedData, const TQMap &addressBookData ); - AddContactPage*createAddContactWidget( TQWidget *parent, Kopete::Account *account ); - KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); + AddContactPage*createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); + KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); Kopete::Account* createNewAccount( const TQString &accountId ); /** diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 927a12ec..cc016684 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -37,9 +37,9 @@ #include AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *parent, const char* name ) - : KDialogBase( parent, name, modal, i18n( "User Information on %1" ) - .arg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), + TQWidget *tqparent, const char* name ) + : KDialogBase( tqparent, name, modal, i18n( "User Information on %1" ) + .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), Cancel | Ok , Ok, true ) { kdDebug(14200) << k_funcinfo << "for contact '" << c->contactId() << "'" << endl; @@ -77,7 +77,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool userInfoView=0L; mMainWidget->userInfoFrame->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain); TQVBoxLayout *l = new TQVBoxLayout(mMainWidget->userInfoFrame); - userInfoEdit = new KTextEdit(TQString::null, TQString::null, + userInfoEdit = new KTextEdit(TQString(), TQString(), mMainWidget->userInfoFrame, "userInfoEdit"); userInfoEdit->setTextFormat(PlainText); @@ -85,7 +85,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool if ( aimmc ) userInfoEdit->setText( aimmc->userProfile() ); else - userInfoEdit->setText( TQString::null ); + userInfoEdit->setText( TQString() ); setButtonText(Ok, i18n("&Save Profile")); showButton(User1, false); @@ -133,7 +133,7 @@ void AIMUserInfoDialog::slotUpdateClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").arg(newNick)); + setCaption(i18n("User Information on %1").tqarg(newNick)); } } @@ -150,7 +150,7 @@ void AIMUserInfoDialog::slotSaveClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").arg(newNick)); + setCaption(i18n("User Information on %1").tqarg(newNick)); } mAccount->setUserProfile(userInfoEdit->text()); @@ -221,4 +221,4 @@ void AIMUserInfoDialog::slotMailClicked(const TQString&, const TQString &address #include "aimuserinfo.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/aim/aimuserinfo.h b/kopete/protocols/oscar/aim/aimuserinfo.h index 886274ac..43f27b94 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.h +++ b/kopete/protocols/oscar/aim/aimuserinfo.h @@ -30,9 +30,10 @@ class AIMAccount; class AIMUserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AIMUserInfoDialog(Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *parent, const char* name); + TQWidget *tqparent, const char* name); ~AIMUserInfoDialog(); private: diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp index f00741c9..7a2d1b1d 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp @@ -25,9 +25,9 @@ #include #include -AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *parent, +AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *tqparent, const char *name ) - : AddContactPage(parent,name) + : AddContactPage(tqparent,name) { m_gui = 0; (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h index 7f6c732d..e186ac61 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h @@ -17,9 +17,10 @@ class MetaContact; class AIMAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - AIMAddContactPage(bool connected, TQWidget *parent=0, + AIMAddContactPage(bool connected, TQWidget *tqparent=0, const char *name=0); ~AIMAddContactPage(); diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui index b3267eb0..97484a6d 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui @@ -1,6 +1,6 @@ aimAddContactUI - + aimAddContactUI @@ -19,16 +19,16 @@ 0 - + GroupBox1 Contact Information - + - + @@ -40,12 +40,12 @@ 6 - + addSN - + TextLabel1 @@ -60,5 +60,5 @@ addSN - + diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index d8a7b9f3..a1b8dbfd 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -1,6 +1,6 @@ aimEditAccountUI - + aimEditAccountUI @@ -33,22 +33,22 @@ 0 - + labelStatusMessage - + AlignCenter - + tabWidget6 - + tab @@ -59,7 +59,7 @@ unnamed - + groupBox72 @@ -70,15 +70,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + lblAccountId @@ -95,7 +95,7 @@ The screen name of your AIM account. This should be in the form of an alphanumeric string (spaces allowed, not case sensitive). - + edtAccountId @@ -113,7 +113,7 @@ mPasswordWidget - + mGlobalIdentity @@ -121,7 +121,7 @@ Exclu&de from Global Identity - + mAutoLogon @@ -134,7 +134,7 @@ - + groupBox5 @@ -153,7 +153,7 @@ unnamed - + textLabel6 @@ -165,7 +165,7 @@ 0 - + 0 0 @@ -174,11 +174,11 @@ To connect to the AOL Instant Messaging network, you will need to use a screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an AIM screen name, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -198,7 +198,7 @@ Expanding - + 20 90 @@ -207,7 +207,7 @@ - + tab @@ -218,7 +218,7 @@ unnamed - + groupBox73 @@ -229,7 +229,7 @@ unnamed - + optionOverrideServer @@ -240,15 +240,15 @@ false - + - layout58 + tqlayout58 unnamed - + lblServer @@ -262,13 +262,13 @@ edtServerAddress - The IP address or hostmask of the AIM server you wish to connect to. + The IP address or hosttqmask of the AIM server you wish to connect to. - The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). + The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). - + edtServerAddress @@ -279,13 +279,13 @@ login.oscar.aol.com - The IP address or hostmask of the AIM server you wish to connect to. + The IP address or hosttqmask of the AIM server you wish to connect to. - The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). + The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). - + lblPort @@ -305,7 +305,7 @@ The port on the AIM server that you would like to connect to. Normally this is 5190. - + sbxServerPort @@ -342,14 +342,14 @@ Expanding - + 20 200 - + encodingCombo @@ -357,7 +357,7 @@ false - + textLabel1 @@ -373,7 +373,7 @@ - + tab @@ -384,7 +384,7 @@ unnamed - + buttonGroup1 @@ -395,7 +395,7 @@ unnamed - + rbAllowPerimtList @@ -403,7 +403,7 @@ Allow only from visible list - + rbBlockAll @@ -411,7 +411,7 @@ Block all users - + rbBlockAIM @@ -419,7 +419,7 @@ Block AIM users - + rbBlockDenyList @@ -427,7 +427,7 @@ Block only from invisible list - + rbAllowAll @@ -435,7 +435,7 @@ Allow all users - + rbAllowMyContacts @@ -455,7 +455,7 @@ Expanding - + 31 225 @@ -533,7 +533,7 @@ rbBlockAIM rbBlockDenyList - + kopetepasswordwidget.h diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 2e0100ab..85e78ace 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -20,8 +20,8 @@ #include "aimaccount.h" AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *protocol, - Kopete::Account *account, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), KopeteEditAccountWidget( account ) + Kopete::Account *account, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), KopeteEditAccountWidget( account ) { //kdDebug(14152) << k_funcinfo << "Called." << endl; diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h index 9f180315..b3c4ad3a 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h @@ -37,10 +37,11 @@ class aimEditAccountUI; class AIMEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: AIMEditAccountWidget(AIMProtocol *protocol, Kopete::Account *account, - TQWidget *parent=0, const char *name=0); + TQWidget *tqparent=0, const char *name=0); virtual ~AIMEditAccountWidget(); virtual bool validateData(); diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index db22a574..5743d7e7 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -1,6 +1,6 @@ AIMUserInfoWidget - + AIMUserInfoWidget @@ -12,13 +12,13 @@ 408 - + 360 400 - + @@ -27,15 +27,15 @@ 0 - + - layout9 + tqlayout9 unnamed - + lblNickName @@ -51,7 +51,7 @@ Nickname: - + txtNickName @@ -64,7 +64,7 @@ - + lblScreenName @@ -80,7 +80,7 @@ Screen name: - + txtScreenName @@ -90,15 +90,15 @@ - + - layout10 + tqlayout10 unnamed - + lblWarnLevel @@ -106,7 +106,7 @@ Warning level: - + txtWarnLevel @@ -114,7 +114,7 @@ true - + lblIdleTime @@ -122,7 +122,7 @@ Idle minutes: - + txtIdleTime @@ -132,15 +132,15 @@ - + - layout11 + tqlayout11 unnamed - + lblOnlineSince @@ -148,7 +148,7 @@ Online since: - + txtOnlineSince @@ -158,7 +158,7 @@ - + lblAwayMessage @@ -173,7 +173,7 @@ Away message: - + AlignTop @@ -193,7 +193,7 @@ AutoText - + textLabel1 @@ -201,7 +201,7 @@ Profile: - + userInfoFrame @@ -213,7 +213,7 @@ 0 - + 64 16 @@ -239,7 +239,7 @@ txtOnlineSince txtAwayMessage - + ktextbrowser.h diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui index d1d93edf..4b3b12aa 100644 --- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui +++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui @@ -1,6 +1,6 @@ AIMJoinChatBase - + AIMJoinChatBase @@ -19,7 +19,7 @@ 0 - + textLabel3 @@ -37,7 +37,7 @@ Fixed - + 20 16 @@ -54,14 +54,14 @@ Maximum - + 60 20 - + textLabel1 @@ -72,7 +72,7 @@ roomName - + textLabel2 @@ -83,7 +83,7 @@ exchange - + roomName @@ -96,7 +96,7 @@ - + exchange @@ -111,7 +111,7 @@ Expanding - + 20 16 @@ -120,5 +120,5 @@ - + -- cgit v1.2.1