diff options
Diffstat (limited to 'kopete/protocols/gadu')
35 files changed, 447 insertions, 430 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 2293143f..985111a4 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -81,7 +81,7 @@ public: int currentServer; unsigned int serverIP; - QString lastDescription; + TQString lastDescription; bool forFriends; bool ignoreAnons; @@ -114,8 +114,8 @@ static const char* const servers_ip[] = { #define NUM_SERVERS (sizeof(servers_ip)/sizeof(char*)) - GaduAccount::GaduAccount( Kopete::Protocol* parent, const TQString& accountID,const char* name ) -: Kopete::PasswordedAccount( parent, accountID, 0, name ) + GaduAccount::GaduAccount( Kopete::Protocol* tqparent, const TQString& accountID,const char* name ) +: Kopete::PasswordedAccount( tqparent, accountID, 0, name ) { TQHostAddress ip; p = new GaduAccountPrivate; @@ -132,8 +132,8 @@ static const char* const servers_ip[] = { setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) ); - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); - p->lastDescription = TQString::null; + p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); + p->lastDescription = TQString(); for ( unsigned int i = 0; i < NUM_SERVERS ; i++ ) { ip.setAddress( TQString( servers_ip[i] ) ); @@ -234,15 +234,15 @@ GaduAccount::initConnections() void GaduAccount::setAway( bool isAway, const TQString& awayMessage ) { - unsigned int currentStatus; + unsigned int currenttqStatus; if ( isAway ) { - currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR; + currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR; } else{ - currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR; + currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR; } - changeStatus( GaduProtocol::protocol()->convertStatus( currentStatus ), awayMessage ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( currenttqStatus ), awayMessage ); } @@ -251,8 +251,8 @@ GaduAccount::actionMenu() { kdDebug(14100) << "actionMenu() " << endl; - p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); - p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ). + p->actionMenu_ = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); + p->actionMenu_->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), i18n( "%1 <%2> " ). arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) ); if ( p->session_->isConnected() ) { @@ -287,19 +287,19 @@ GaduAccount::actionMenu() p->listFromFileAction->setEnabled( TRUE ); } p->actionMenu_->insert( new KAction( i18n( "Go O&nline" ), - GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ), - GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ).iconFor( this ), 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ), - GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ).iconFor( this ), 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ), - GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Description..." ), "info", @@ -332,7 +332,7 @@ GaduAccount::connectWithPassword(const TQString& password) if (isConnected ()) return; // FIXME: add status description to this mechainsm, this is a hack now. libkopete design issue. - changeStatus( initialStatus(), p->lastDescription ); + changetqStatus( initialtqStatus(), p->lastDescription ); } void @@ -353,7 +353,7 @@ void GaduAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason ) { kdDebug(14100) << k_funcinfo << "Called" << endl; - changeStatus( status, reason); + changetqStatus( status, reason); } void @@ -375,12 +375,12 @@ GaduAccount::userlistChanged() } bool -GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact ) +GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) { kdDebug(14100) << "createContact " << contactId << endl; uin_t uinNumber = contactId.toUInt(); - GaduContact* newContact = new GaduContact( uinNumber, parentContact->displayName(),this, parentContact ); + GaduContact* newContact = new GaduContact( uinNumber, tqparentContact->displayName(),this, tqparentContact ); newContact->setParentIdentity( accountId() ); addNotify( uinNumber ); @@ -390,13 +390,13 @@ GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* pare } void -GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& descr ) +GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr ) { unsigned int ns; kdDebug(14100) << "##### change status #####" << endl; - kdDebug(14100) << "### Status = " << p->session_->isConnected() << endl; - kdDebug(14100) << "### Status description = \"" << descr << "\"" << endl; + kdDebug(14100) << "### tqStatus = " << p->session_->isConnected() << endl; + kdDebug(14100) << "### tqStatus description = \"" << descr << "\"" << endl; // if change to not available, log off if ( GG_S_NA( status.internalStatus() ) ) { @@ -418,14 +418,14 @@ GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& d if (!descr.isEmpty() && !GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) { // and rerun us again. This won't cause any recursive call, as both conversions are static ns = GaduProtocol::protocol()->statusToWithDescription( status ); - changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr ); return; } // well, if it's empty but we want to set status with desc, change it too if (descr.isEmpty() && GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) { ns = GaduProtocol::protocol()->statusToWithoutDescription( status ); - changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr ); return; } @@ -455,7 +455,7 @@ GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& d else { p->status = status; if ( descr.isEmpty() ) { - if ( p->session_->changeStatus( status.internalStatus(), p->forFriends ) != 0 ) + if ( p->session_->changetqStatus( status.internalStatus(), p->forFriends ) != 0 ) return; } else { @@ -481,7 +481,7 @@ GaduAccount::slotLogin( int status, const TQString& dscr ) { p->lastDescription = dscr; - myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING )); + myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING )); myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, dscr ); if ( !p->session_->isConnected() ) { @@ -507,16 +507,16 @@ GaduAccount::slotLogin( int status, const TQString& dscr ) } } else { - p->session_->changeStatus( status ); + p->session_->changetqStatus( status ); } } void GaduAccount::slotLogoff() { - if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING )) { - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); - changeStatus( p->status ); + if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING )) { + p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); + changetqStatus( p->status ); p->session_->logoff(); dccOff(); } @@ -525,7 +525,7 @@ GaduAccount::slotLogoff() void GaduAccount::slotGoOnline() { - changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ) ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ) ); } void GaduAccount::slotGoOffline() @@ -537,13 +537,13 @@ GaduAccount::slotGoOffline() void GaduAccount::slotGoInvisible() { - changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ) ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ) ); } void GaduAccount::slotGoBusy() { - changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ) ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ) ); } void @@ -648,7 +648,7 @@ GaduAccount::contactStatusChanged( KGaduNotify* gaduNotify ) return; } - contact->changedStatus( gaduNotify ); + contact->changedtqStatus( gaduNotify ); } void @@ -675,14 +675,14 @@ GaduAccount::connectionFailed( gg_failure_t failure ) case GG_FAILURE_PASSWORD: password().setWrong(); // user pressed CANCEL - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); + p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); disconnected( BadPassword ); return; default: if ( p->connectWithSSL ) { if ( useTls() != TLS_only ) { - slotCommandDone( TQString::null, i18n( "connection using SSL was not possible, retrying without." ) ); + slotCommandDone( TQString(), i18n( "connection using SSL was not possible, retrying without." ) ); kdDebug( 14100 ) << "try without tls now" << endl; p->connectWithSSL = false; tryReconnect = true; @@ -710,9 +710,9 @@ GaduAccount::connectionFailed( gg_failure_t failure ) slotLogin( p->status.internalStatus() , p->lastDescription ); } else { - error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).arg( GaduSession::failureDescription( failure ) ), + error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ), i18n( "Connection Error" ) ); - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); + p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); disconnected( InvalidHost ); } @@ -777,7 +777,7 @@ void GaduAccount::connectionSucceed( ) { kdDebug(14100) << "#### Gadu-Gadu connected! " << endl; - p->status = GaduProtocol::protocol()->convertStatus( p->session_->status() ); + p->status = GaduProtocol::protocol()->converttqStatus( p->session_->status() ); myself()->setOnlineStatus( p->status ); myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, p->lastDescription ); startNotify(); @@ -822,11 +822,11 @@ GaduAccount::slotSessionDisconnect( Kopete::Account::DisconnectReason reason ) p->pingTimer_->stop(); } - setAllContactsStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) ); + setAllContactstqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) ); - status = myself()->onlineStatus().internalStatus(); + status = myself()->onlinetqStatus().internalStatus(); if ( status != GG_STATUS_NOT_AVAIL || status != GG_STATUS_NOT_AVAIL_DESCR ) { - myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) ); + myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) ); } GaduAccount::disconnect( reason ); } @@ -894,7 +894,7 @@ GaduAccount::userlist( const TQString& contactsListString ) void GaduAccount::userListExportDone() { - slotCommandDone( TQString::null, i18n( "Contacts exported to the server.") ); + slotCommandDone( TQString(), i18n( "Contacts exported to the server.") ); } void @@ -903,7 +903,7 @@ GaduAccount::slotFriendsMode() p->forFriends = !p->forFriends; kdDebug( 14100 ) << "for friends mode: " << p->forFriends << " desc" << p->lastDescription << endl; // now change status, it will changing it with p->forFriends flag - changeStatus( p->status, p->lastDescription ); + changetqStatus( p->status, p->lastDescription ); saveFriendsMode( p->forFriends ); @@ -922,10 +922,10 @@ GaduAccount::slotExportContactsListToFile() return; } - p->saveListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString::null, + p->saveListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-save", false ); p->saveListDialog->setCaption( - i18n("Save Contacts List for Account %1 As").arg( + i18n("Save Contacts List for Account %1 As").tqarg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->saveListDialog->exec() == TQDialog::Accepted ) { @@ -968,10 +968,10 @@ GaduAccount::slotImportContactsFromFile() return; } - p->loadListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString::null, + p->loadListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-load", true ); p->loadListDialog->setCaption( - i18n("Load Contacts List for Account %1 As").arg( + i18n("Load Contacts List for Account %1 As").tqarg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->loadListDialog->exec() == TQDialog::Accepted ) { @@ -1077,7 +1077,7 @@ GaduAccount::slotDescription() GaduAway* away = new GaduAway( this ); if( away->exec() == TQDialog::Accepted ) { - changeStatus( GaduProtocol::protocol()->convertStatus( away->status() ), + changetqStatus( GaduProtocol::protocol()->converttqStatus( away->status() ), away->awayText() ); } delete away; @@ -1156,8 +1156,8 @@ GaduAccount::setDcc( bool d ) void GaduAccount::saveFriendsMode( bool i ) { - p->config->writeEntry( TQString::fromAscii( "forFriends" ), - i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) ); + p->config->writeEntry( TQString(TQString::fromAscii( "forFriends" )), + TQString(i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) )); } bool @@ -1201,8 +1201,8 @@ void GaduAccount::setIgnoreAnons( bool i ) { p->ignoreAnons = i; - p->config->writeEntry( TQString::fromAscii( "ignoreAnons" ), - i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) ); + p->config->writeEntry( TQString(TQString::fromAscii( "ignoreAnons" )), + TQString(i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) )); } GaduAccount::tlsConnection diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index 0d870deb..ad7b4edf 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -54,12 +54,13 @@ class GaduDCCTransaction; class GaduAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: GaduAccount( Kopete::Protocol*, const TQString& accountID, const char* name = 0L ); ~GaduAccount(); //{ - void setAway( bool isAway, const TQString& awayMessage = TQString::null ); + void setAway( bool isAway, const TQString& awayMessage = TQString() ); KActionMenu* actionMenu(); void dccRequest( GaduContact* ); void sendFile( GaduContact* , TQString& ); @@ -73,11 +74,11 @@ public slots: void connectWithPassword(const TQString &password); void disconnect( DisconnectReason ); void disconnect(); - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); //} - void changeStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString::null ); - void slotLogin( int status = GG_STATUS_AVAIL, const TQString& dscr = TQString::null ); + void changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() ); + void slotLogin( int status = GG_STATUS_AVAIL, const TQString& dscr = TQString() ); void slotLogoff(); void slotGoOnline(); void slotGoOffline(); @@ -127,7 +128,7 @@ signals: protected: //{ bool createContact( const TQString& contactId, - Kopete::MetaContact* parentContact ); + Kopete::MetaContact* tqparentContact ); //} private slots: diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp index 89645afd..6cc671b0 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.cpp +++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp @@ -43,8 +43,8 @@ #include <tqcombobox.h> #include <krestrictedline.h> -GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* parent, const char* name ) -: AddContactPage( parent, name ) +GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* tqparent, const char* name ) +: AddContactPage( tqparent, name ) { account_ = owner; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -80,7 +80,7 @@ GaduAddContactPage::fillGroups() void GaduAddContactPage::showEvent( TQShowEvent* e ) { - slotUinChanged( TQString::null ); + slotUinChanged( TQString() ); AddContactPage::showEvent( e ); } diff --git a/kopete/protocols/gadu/gaduaddcontactpage.h b/kopete/protocols/gadu/gaduaddcontactpage.h index b21f9a27..71ab9c6c 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.h +++ b/kopete/protocols/gadu/gaduaddcontactpage.h @@ -37,9 +37,10 @@ class GaduAddUI; class GaduAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - GaduAddContactPage( GaduAccount*, TQWidget* parent = 0, const char* name = 0 ); + GaduAddContactPage( GaduAccount*, TQWidget* tqparent = 0, const char* name = 0 ); ~GaduAddContactPage(); virtual bool validateData(); virtual bool apply( Kopete::Account* , Kopete::MetaContact * ); diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index dd86fa23..e1eb5487 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -36,8 +36,8 @@ #include "gaduawayui.h" #include "gaduaway.h" -GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "Away Dialog" ), +GaduAway::GaduAway( GaduAccount* account, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Away Dialog" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ) { @@ -47,11 +47,11 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) ui_ = new GaduAwayUI( this ); setMainWidget( ui_ ); - ks = account->myself()->onlineStatus(); + ks = account->myself()->onlinetqStatus(); s = GaduProtocol::protocol()->statusToWithDescription( ks ); if ( s == GG_STATUS_NOT_AVAIL_DESCR ) { - ui_->statusGroup_->find( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); + ui_->statusGroup_->tqfind( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); ui_->statusGroup_->setButton( GG_STATUS_AVAIL_DESCR ); } else { @@ -68,7 +68,7 @@ GaduAway::status() const return ui_->statusGroup_->id( ui_->statusGroup_->selected() ); } -QString +TQString GaduAway::awayText() const { return ui_->textEdit_->text(); @@ -79,7 +79,7 @@ void GaduAway::slotApply() { if ( account_ ) { - account_->changeStatus( GaduProtocol::protocol()->convertStatus( status() ),awayText() ); + account_->changetqStatus( GaduProtocol::protocol()->converttqStatus( status() ),awayText() ); } } diff --git a/kopete/protocols/gadu/gaduaway.h b/kopete/protocols/gadu/gaduaway.h index c7ec2f5f..0cf8eef7 100644 --- a/kopete/protocols/gadu/gaduaway.h +++ b/kopete/protocols/gadu/gaduaway.h @@ -32,9 +32,10 @@ class GaduAwayUI; class GaduAway : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GaduAway( GaduAccount*, TQWidget* parent = 0, const char* name = 0 ); + GaduAway( GaduAccount*, TQWidget* tqparent = 0, const char* name = 0 ); int status() const; TQString awayText() const; diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index 2be539c0..8f45f94c 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -37,14 +37,14 @@ #include <errno.h> -GaduCommand::GaduCommand( TQObject* parent, const char* name ) -: TQObject( parent, name ), read_( 0 ), write_( 0 ) +GaduCommand::GaduCommand( TQObject* tqparent, const char* name ) +: TQObject( tqparent, name ), read_( 0 ), write_( 0 ) { } GaduCommand::~GaduCommand() { - //QSocketNotifiers are children and will + //TQSocketNotifiers are tqchildren and will //be deleted anyhow } @@ -114,13 +114,13 @@ GaduCommand::forwarder() emit socketReady(); } -RegisterCommand::RegisterCommand( TQObject* parent, const char* name ) -:GaduCommand( parent, name ), state( RegisterStateNoToken ), session_( 0 ), uin( 0 ) +RegisterCommand::RegisterCommand( TQObject* tqparent, const char* name ) +:GaduCommand( tqparent, name ), state( RegisterStateNoToken ), session_( 0 ), uin( 0 ) { } -RegisterCommand::RegisterCommand( const TQString& email, const TQString& password, TQObject* parent, const char* name ) -:GaduCommand( parent, name ), state( RegisterStateNoToken ), email_( email ), password_( password ), session_( 0 ), uin( 0 ) +RegisterCommand::RegisterCommand( const TQString& email, const TQString& password, TQObject* tqparent, const char* name ) +:GaduCommand( tqparent, name ), state( RegisterStateNoToken ), email_( email ), password_( password ), session_( 0 ), uin( 0 ) { } @@ -204,7 +204,7 @@ void RegisterCommand::watcher() } pubDir = (struct gg_pubdir *)session_->data; - emit operationStatus( i18n( "Token retrieving status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); + emit operationtqStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; @@ -254,7 +254,7 @@ void RegisterCommand::watcher() return; } pubDir = (gg_pubdir*) session_->data; - emit operationStatus( i18n( "Registration status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); + emit operationtqStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; @@ -293,13 +293,13 @@ void RegisterCommand::watcher() } } -RemindPasswordCommand::RemindPasswordCommand( TQObject* parent, const char* name ) -: GaduCommand( parent, name ), uin_( 0 ), session_( 0 ) +RemindPasswordCommand::RemindPasswordCommand( TQObject* tqparent, const char* name ) +: GaduCommand( tqparent, name ), uin_( 0 ), session_( 0 ) { } -RemindPasswordCommand::RemindPasswordCommand( uin_t uin, TQObject* parent, const char* name ) -: GaduCommand( parent, name ), uin_( uin ), session_( 0 ) +RemindPasswordCommand::RemindPasswordCommand( uin_t uin, TQObject* tqparent, const char* name ) +: GaduCommand( tqparent, name ), uin_( uin ), session_( 0 ) { } @@ -351,8 +351,8 @@ RemindPasswordCommand::watcher() enableNotifiers( session_->check ); } -ChangePasswordCommand::ChangePasswordCommand( TQObject* parent, const char* name ) -: GaduCommand( parent, name ), session_( 0 ) +ChangePasswordCommand::ChangePasswordCommand( TQObject* tqparent, const char* name ) +: GaduCommand( tqparent, name ), session_( 0 ) { } diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h index 7fc8792d..c0576b35 100644 --- a/kopete/protocols/gadu/gaducommands.h +++ b/kopete/protocols/gadu/gaducommands.h @@ -35,12 +35,13 @@ class TQSocketNotifier; class TQStringList; class TQPixmap; -class GaduCommand : public QObject +class GaduCommand : public TQObject { Q_OBJECT + TQ_OBJECT public: - GaduCommand( TQObject* parent = 0, const char* name = 0 ); + GaduCommand( TQObject* tqparent = 0, const char* name = 0 ); virtual ~GaduCommand(); virtual void execute() = 0; @@ -52,7 +53,7 @@ signals: void done( const TQString& title, const TQString& what ); void error( const TQString& title, const TQString& error ); void socketReady(); - void operationStatus( const TQString ); + void operationtqStatus( const TQString ); protected: void checkSocket( int, int ); @@ -73,11 +74,12 @@ private: class RegisterCommand : public GaduCommand { Q_OBJECT + TQ_OBJECT public: - RegisterCommand( TQObject* parent = 0, const char* name = 0 ); + RegisterCommand( TQObject* tqparent = 0, const char* name = 0 ); RegisterCommand( const TQString& email, const TQString& password , - TQObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~RegisterCommand(); void setUserinfo( const TQString& email, const TQString& password, const TQString& token ); @@ -95,21 +97,22 @@ protected slots: private: enum RegisterState{ RegisterStateNoToken, RegisterStateWaitingForToken, RegisterStateGotToken, RegisterStateWaitingForNumber, RegisterStateDone }; RegisterState state; - QString email_; - QString password_; + TQString email_; + TQString password_; struct gg_http* session_; int uin; - QString tokenId; - QString tokenString; + TQString tokenId; + TQString tokenString; }; class RemindPasswordCommand : public GaduCommand { Q_OBJECT + TQ_OBJECT public: - RemindPasswordCommand( uin_t uin, TQObject* parent = 0, const char* name = 0 ); - RemindPasswordCommand( TQObject* parent = 0, const char* name = 0 ); + RemindPasswordCommand( uin_t uin, TQObject* tqparent = 0, const char* name = 0 ); + RemindPasswordCommand( TQObject* tqparent = 0, const char* name = 0 ); ~RemindPasswordCommand(); void setUIN( uin_t ); @@ -126,9 +129,10 @@ private: class ChangePasswordCommand : public GaduCommand { Q_OBJECT + TQ_OBJECT public: - ChangePasswordCommand( TQObject* parent = 0, const char* name = 0 ); + ChangePasswordCommand( TQObject* tqparent = 0, const char* name = 0 ); ~ChangePasswordCommand(); void setInfo( uin_t uin, const TQString& passwd, const TQString& newpasswd, @@ -140,9 +144,9 @@ protected slots: private: struct gg_http* session_; - QString passwd_; - QString newpasswd_; - QString newemail_; + TQString passwd_; + TQString newpasswd_; + TQString newemail_; uin_t uin_; }; diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index dfbb93a4..2ee61e97 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -44,8 +44,8 @@ using Kopete::UserInfoDialog; -GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* parent ) -: Kopete::Contact( account, TQString::number( uin ), parent ), uin_( uin ) +GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* tqparent ) +: Kopete::Contact( account, TQString::number( uin ), tqparent ), uin_( uin ) { msgManager_ = 0L; account_ = static_cast<GaduAccount*>( account ); @@ -66,21 +66,21 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco setFileCapable( true ); //offline - setOnlineStatus( GaduProtocol::protocol()->convertStatus( 0 ) ); + setOnlineStatus( GaduProtocol::protocol()->converttqStatus( 0 ) ); setProperty( Kopete::Global::Properties::self()->nickName(), name ); } -QString +TQString GaduContact::identityId() const { - return parentIdentity_; + return tqparentIdentity_; } void GaduContact::setParentIdentity( const TQString& id) { - parentIdentity_ = id; + tqparentIdentity_ = id; } uin_t @@ -96,7 +96,7 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint //If the file location is null, then get it from a file open dialog if( !sourceURL.isValid() ) - filePath = KFileDialog::getOpenFileName(TQString::null, "*", 0l , i18n("Kopete File Transfer")); + filePath = KFileDialog::getOpenFileName(TQString(), "*", 0l , i18n("Kopete File Transfer")); else filePath = sourceURL.path(-1); @@ -107,14 +107,14 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint void -GaduContact::changedStatus( KGaduNotify* newstatus ) +GaduContact::changedtqStatus( KGaduNotify* newstatus ) { if ( newstatus->description.isNull() ) { - setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) ); + setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) ); removeProperty( GaduProtocol::protocol()->propAwayMessage ); } else { - setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) ); + setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) ); setProperty( GaduProtocol::protocol()->propAwayMessage, newstatus->description ); } @@ -230,7 +230,7 @@ GaduContact::slotUserInfo() dlg->setName( metaContact()->displayName() ); dlg->setId( TQString::number( uin_ ) ); - dlg->setStatus( onlineStatus().description() ); + dlg->settqStatus( onlinetqStatus().description() ); dlg->setAwayMessage( description_ ); dlg->show(); } @@ -277,7 +277,7 @@ GaduContactsList::ContactLine* GaduContact::contactDetails() { Kopete::GroupList groupList; - QString groups; + TQString groups; GaduContactsList::ContactLine* cl = new GaduContactsList::ContactLine; @@ -315,7 +315,7 @@ GaduContact::contactDetails() return cl; } -QString +TQString GaduContact::findBestContactName( const GaduContactsList::ContactLine* cl ) { TQString name; diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h index 27c99e00..ee244a96 100644 --- a/kopete/protocols/gadu/gaducontact.h +++ b/kopete/protocols/gadu/gaducontact.h @@ -45,6 +45,7 @@ class TQStringList; class GaduContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: GaduContact( unsigned int, const TQString&, Kopete::Account*, Kopete::MetaContact* ); @@ -66,7 +67,7 @@ public: bool ignored(); static TQString findBestContactName( const GaduContactsList::ContactLine* ); - void changedStatus( KGaduNotify* ); + void changedtqStatus( KGaduNotify* ); uin_t uin() const; @@ -82,7 +83,7 @@ public slots: void slotShowPublicProfile(); void slotEditContact(); virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); protected: @@ -94,8 +95,8 @@ private: bool ignored_; Kopete::ChatSession* msgManager_; - QString description_; - QString parentIdentity_; + TQString description_; + TQString tqparentIdentity_; GaduAccount* account_; KAction* actionSendMessage_; diff --git a/kopete/protocols/gadu/gaducontactlist.cpp b/kopete/protocols/gadu/gaducontactlist.cpp index 314e661f..9c003751 100644 --- a/kopete/protocols/gadu/gaducontactlist.cpp +++ b/kopete/protocols/gadu/gaducontactlist.cpp @@ -45,7 +45,7 @@ GaduContactsList::GaduContactsList( TQString sList ) return; } - if ( ( !sList.contains( '\n' ) && sList.contains( ';' ) ) || !sList.contains( ';' ) ) { + if ( ( !sList.tqcontains( '\n' ) && sList.tqcontains( ';' ) ) || !sList.tqcontains( ';' ) ) { return; } @@ -164,7 +164,7 @@ GaduContactsList::addContact( } -QString +TQString GaduContactsList::asString() { TQString contacts; diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp index 4235d4e3..6e5b416a 100644 --- a/kopete/protocols/gadu/gadudcc.cpp +++ b/kopete/protocols/gadu/gadudcc.cpp @@ -50,8 +50,8 @@ static TQMutex initmutex; typedef TQMap< unsigned int, GaduAccount* > gaduAccounts; static gaduAccounts accounts; -GaduDCC::GaduDCC( TQObject* parent, const char* name ) -:TQObject( parent, name ) +GaduDCC::GaduDCC( TQObject* tqparent, const char* name ) +:TQObject( tqparent, name ) { } @@ -78,7 +78,7 @@ GaduDCC::unregisterAccount( unsigned int id ) return false; } - if ( !accounts.contains( id ) ) { + if ( !accounts.tqcontains( id ) ) { kdDebug(14100) << "attempt to unregister not registered account" << endl; initmutex.unlock(); return false; @@ -118,7 +118,7 @@ GaduDCC::registerAccount( GaduAccount* account ) aid = account->accountId().toInt(); - if ( accounts.contains( aid ) ) { + if ( accounts.tqcontains( aid ) ) { kdDebug(14100) << "attempt to register already registered account" << endl; initmutex.unlock(); return false; @@ -168,7 +168,7 @@ GaduDCC::slotIncoming( gg_dcc* incoming, bool& handled ) GaduDCC::~GaduDCC() { - if ( accounts.contains( accountId ) ) { + if ( accounts.tqcontains( accountId ) ) { kdDebug( 14100 ) << "unregister account " << accountId << " in destructor " << endl; unregisterAccount( accountId ); } diff --git a/kopete/protocols/gadu/gadudcc.h b/kopete/protocols/gadu/gadudcc.h index d065d199..52f07750 100644 --- a/kopete/protocols/gadu/gadudcc.h +++ b/kopete/protocols/gadu/gadudcc.h @@ -35,8 +35,9 @@ class GaduDCCServer; class GaduDCC: public TQObject { Q_OBJECT + TQ_OBJECT public: - GaduDCC( TQObject* parent, const char* name = NULL ); + GaduDCC( TQObject* tqparent, const char* name = NULL ); ~GaduDCC(); bool unregisterAccount(); bool registerAccount( GaduAccount* ); diff --git a/kopete/protocols/gadu/gadudccserver.h b/kopete/protocols/gadu/gadudccserver.h index e5c4b8e5..50982eab 100644 --- a/kopete/protocols/gadu/gadudccserver.h +++ b/kopete/protocols/gadu/gadudccserver.h @@ -34,6 +34,7 @@ class GaduAccount; class GaduDCCServer: public TQObject { Q_OBJECT + TQ_OBJECT public: GaduDCCServer( TQHostAddress* dccIp = NULL, unsigned int port = 1550 ); ~GaduDCCServer(); diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index 7ec8d2ac..f152b942 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -44,8 +44,8 @@ #include "libgadu.h" -GaduDCCTransaction::GaduDCCTransaction( GaduDCC* parent, const char* name ) -:TQObject( parent, name ), gaduDCC_( parent ) +GaduDCCTransaction::GaduDCCTransaction( GaduDCC* tqparent, const char* name ) +:TQObject( tqparent, name ), gaduDCC_( tqparent ) { read_ = NULL; write_ = NULL; @@ -237,8 +237,8 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c KGuiItem resumeButton( i18n ( "&Resume" ) ); KGuiItem overwriteButton( i18n ( "Over&write" ) ); switch ( KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget (), - i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).arg( fileName ), - i18n( "File Exists: %1" ).arg( fileName ), resumeButton, overwriteButton ) ) + i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).tqarg( fileName ), + i18n( "File Exists: %1" ).tqarg( fileName ), resumeButton, overwriteButton ) ) { // resume case KMessageBox::Yes: @@ -384,7 +384,7 @@ GaduDCCTransaction::watcher() { return; break; case GG_EVENT_DCC_NEED_FILE_INFO: - if (gaduDCC_->requests.contains(dccSock_->peer_uin)) { + if (gaduDCC_->requests.tqcontains(dccSock_->peer_uin)) { TQString filePath = gaduDCC_->requests[dccSock_->peer_uin]; kdDebug() << "Callback request found. Sending " << filePath << endl; gaduDCC_->requests.remove(dccSock_->peer_uin); diff --git a/kopete/protocols/gadu/gadudcctransaction.h b/kopete/protocols/gadu/gadudcctransaction.h index 4b9807af..43c6395a 100644 --- a/kopete/protocols/gadu/gadudcctransaction.h +++ b/kopete/protocols/gadu/gadudcctransaction.h @@ -36,6 +36,7 @@ class GaduDCC; class GaduDCCTransaction: TQObject { Q_OBJECT + TQ_OBJECT public: GaduDCCTransaction( GaduDCC*, const char* name = NULL ); ~GaduDCCTransaction(); diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp index 08987c16..244aee2a 100644 --- a/kopete/protocols/gadu/gadueditaccount.cpp +++ b/kopete/protocols/gadu/gadueditaccount.cpp @@ -43,8 +43,8 @@ #include "kopetepasswordwidget.h" -GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, TQWidget* parent, const char* name ) -: GaduAccountEditUI( parent, name ), KopeteEditAccountWidget( ident ), protocol_( proto ), rcmd( 0 ) +GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, TQWidget* tqparent, const char* name ) +: GaduAccountEditUI( tqparent, name ), KopeteEditAccountWidget( ident ), protocol_( proto ), rcmd( 0 ) { #ifdef __GG_LIBGADU_HAVE_OPENSSL diff --git a/kopete/protocols/gadu/gadueditaccount.h b/kopete/protocols/gadu/gadueditaccount.h index 1b870496..c63ac450 100644 --- a/kopete/protocols/gadu/gadueditaccount.h +++ b/kopete/protocols/gadu/gadueditaccount.h @@ -35,9 +35,10 @@ namespace Kopete { class Account; } class GaduEditAccount : public GaduAccountEditUI, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - GaduEditAccount( GaduProtocol*, Kopete::Account*, TQWidget* parent = 0, const char* name = 0 ); + GaduEditAccount( GaduProtocol*, Kopete::Account*, TQWidget* tqparent = 0, const char* name = 0 ); virtual bool validateData(); Kopete::Account* apply(); diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp index 985a9874..6c13f1ff 100644 --- a/kopete/protocols/gadu/gadueditcontact.cpp +++ b/kopete/protocols/gadu/gadueditcontact.cpp @@ -46,8 +46,8 @@ // FIXME: this and gaduadcontactpage should have one base class, with some code duplicated in both. GaduEditContact::GaduEditContact( GaduAccount* account, GaduContact* contact, - TQWidget* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "Edit Contact's Properties" ), + TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Edit Contact's Properties" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ), contact_( contact ) { @@ -64,8 +64,8 @@ GaduEditContact::GaduEditContact( GaduAccount* account, GaduContact* contact, } GaduEditContact::GaduEditContact( GaduAccount* account, GaduContactsList::ContactLine* clin, - TQWidget* parent , const char* name ) -: KDialogBase( parent, name, true, i18n( "Edit Contact's Properties" ), + TQWidget* tqparent , const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Edit Contact's Properties" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ), contact_( NULL ) { diff --git a/kopete/protocols/gadu/gadueditcontact.h b/kopete/protocols/gadu/gadueditcontact.h index f135d55a..a48bd697 100644 --- a/kopete/protocols/gadu/gadueditcontact.h +++ b/kopete/protocols/gadu/gadueditcontact.h @@ -36,12 +36,13 @@ class TQListViewItem; class GaduEditContact : public KDialogBase { Q_OBJECT + TQ_OBJECT public: GaduEditContact( GaduAccount*, GaduContact*, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); GaduEditContact( GaduAccount*, GaduContactsList::ContactLine*, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); protected slots: void slotApply(); void listClicked( TQListViewItem* ); diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp index 1a59f17f..8336b6fd 100644 --- a/kopete/protocols/gadu/gaduprotocol.cpp +++ b/kopete/protocols/gadu/gaduprotocol.cpp @@ -45,8 +45,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_gadu, KGenericFactory<GaduProtocol>( "kopete_ GaduProtocol* GaduProtocol::protocolStatic_ = 0L; -GaduProtocol::GaduProtocol( TQObject* parent, const char* name, const TQStringList& ) -:Kopete::Protocol( GaduProtocolFactory::instance(), parent, name ), +GaduProtocol::GaduProtocol( TQObject* tqparent, const char* name, const TQStringList& ) +:Kopete::Protocol( GaduProtocolFactory::instance(), tqparent, name ), propFirstName(Kopete::Global::Properties::self()->firstName()), propLastName(Kopete::Global::Properties::self()->lastName()), propEmail(Kopete::Global::Properties::self()->emailAddress()), @@ -68,7 +68,7 @@ GaduProtocol::GaduProtocol( TQObject* parent, const char* name, const TQStringLi gaduStatusInvisibleDescr_(Kopete::OnlineStatus::Invisible, GG_STATUS_INVISIBLE_DESCR, this, GG_STATUS_INVISIBLE_DESCR, TQStringList::split( '|', "contact_invisible_overlay|gg_description_overlay" ), i18n( "Invisible" ) , i18n( "I&nvisible" )), gaduStatusAvail_(Kopete::OnlineStatus::Online, GG_STATUS_AVAIL, this, GG_STATUS_AVAIL, - TQString::null, i18n( "Online" ) , i18n( "&Online" ) , Kopete::OnlineStatusManager::Online ), + TQString(), i18n( "Online" ) , i18n( "&Online" ) , Kopete::OnlineStatusManager::Online ), gaduStatusAvailDescr_(Kopete::OnlineStatus::Online, GG_STATUS_AVAIL_DESCR, this, GG_STATUS_AVAIL_DESCR, "gg_description_overlay", i18n( "Online" ) , i18n( "&Online" )), gaduConnecting_(Kopete::OnlineStatus::Offline, GG_STATUS_CONNECTING, this, GG_STATUS_CONNECTING, @@ -99,9 +99,9 @@ GaduProtocol::protocol() } AddContactPage* -GaduProtocol::createAddContactWidget( TQWidget* parent, Kopete::Account* account ) +GaduProtocol::createAddContactWidget( TQWidget* tqparent, Kopete::Account* account ) { - return new GaduAddContactPage( static_cast<GaduAccount*>( account ), parent ); + return new GaduAddContactPage( static_cast<GaduAccount*>( account ), tqparent ); } void @@ -199,7 +199,7 @@ GaduProtocol::statusWithDescription( uint status ) } Kopete::OnlineStatus -GaduProtocol::convertStatus( uint status ) const +GaduProtocol::converttqStatus( uint status ) const { switch( status ) { case GG_STATUS_NOT_AVAIL: @@ -235,9 +235,9 @@ GaduProtocol::createNewAccount( const TQString& accountId ) } KopeteEditAccountWidget* -GaduProtocol::createEditAccountWidget( Kopete::Account* account, TQWidget* parent ) +GaduProtocol::createEditAccountWidget( Kopete::Account* account, TQWidget* tqparent ) { - return( new GaduEditAccount( this, account, parent ) ); + return( new GaduEditAccount( this, account, tqparent ) ); } #include "gaduprotocol.moc" diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h index 0a4524b8..99076f9d 100644 --- a/kopete/protocols/gadu/gaduprotocol.h +++ b/kopete/protocols/gadu/gaduprotocol.h @@ -50,18 +50,19 @@ class GaduPreferences; class GaduProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - GaduProtocol( TQObject* parent, const char* name, const TQStringList& str); + GaduProtocol( TQObject* tqparent, const char* name, const TQStringList& str); ~GaduProtocol(); static GaduProtocol *protocol(); // Plugin reimplementation // { - AddContactPage* createAddContactWidget( TQWidget* parent, Kopete::Account* account ); + AddContactPage* createAddContactWidget( TQWidget* tqparent, Kopete::Account* account ); Kopete::Account* createNewAccount( const TQString& accountId ); - KopeteEditAccountWidget *createEditAccountWidget( Kopete::Account* account, TQWidget* parent ); + KopeteEditAccountWidget *createEditAccountWidget( Kopete::Account* account, TQWidget* tqparent ); bool canSendOffline() const { return true; } virtual Kopete::Contact *deserializeContact( Kopete::MetaContact* metaContact, @@ -70,7 +71,7 @@ public: // } //!Plugin reimplementation - Kopete::OnlineStatus convertStatus( uint ) const; + Kopete::OnlineStatus converttqStatus( uint ) const; bool statusWithDescription( uint status ); uint statusToWithDescription( Kopete::OnlineStatus status ); diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index 1c329cf0..8c33aef2 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -40,8 +40,8 @@ #include <klistview.h> #include <klocale.h> -GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, false, TQString::null, User1|User2|User3|Cancel, User2 ) +GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) { mAccount = account; createWidget(); @@ -50,8 +50,8 @@ GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char show(); } -GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, false, TQString::null, User1|User2|User3|Cancel, User2 ) +GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) { ResLine rs; @@ -80,7 +80,7 @@ GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* par // now it is time to switch to Right Page(tm) rs.uin = searchFor; - fName = fSurname = fNick = fCity = TQString::null; + fName = fSurname = fNick = fCity = TQString(); fUin = searchFor; fGender = fAgeFrom = fAgeTo = 0; fOnlyOnline = false; @@ -170,7 +170,7 @@ GaduPublicDir::initConnections() void GaduPublicDir::inputChanged( bool ) { - inputChanged( TQString::null ); + inputChanged( TQString() ); } void @@ -217,20 +217,20 @@ GaduPublicDir::validateData() CHECK_INT( fAgeTo ); } else { - fSurname = TQString::null; + fSurname = TQString(); CHECK_INT( fUin ); } return false; } // Move to GaduProtocol someday -QPixmap -GaduPublicDir::iconForStatus( uint status ) +TQPixmap +GaduPublicDir::iconFortqStatus( uint status ) { TQPixmap n; if ( GaduProtocol::protocol() ) { - return GaduProtocol::protocol()->convertStatus( status ).protocolIcon(); + return GaduProtocol::protocol()->converttqStatus( status ).protocolIcon(); } return n; } @@ -256,7 +256,7 @@ GaduPublicDir::slotSearchResult( const SearchResult& result, unsigned int ) (*r).city, TQString::number( (*r).uin ).ascii() ); - sl->setPixmap( 0, iconForStatus( (*r).status ) ); + sl->setPixmap( 0, iconFortqStatus( (*r).status ) ); } // if not found anything, obviously we don't want to search for more @@ -282,7 +282,7 @@ GaduPublicDir::slotNewSearch() showButton( User1, false ); showButton( User3, false ); enableButton( User2, false ); - inputChanged( TQString::null ); + inputChanged( TQString() ); mAccount->pubDirSearchClose(); } diff --git a/kopete/protocols/gadu/gadupubdir.h b/kopete/protocols/gadu/gadupubdir.h index 4dd1b545..78e92e2f 100644 --- a/kopete/protocols/gadu/gadupubdir.h +++ b/kopete/protocols/gadu/gadupubdir.h @@ -39,11 +39,12 @@ class GaduContact; class GaduPublicDir : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GaduPublicDir( GaduAccount* , TQWidget *parent = 0, const char* name = "GaduPublicDir" ); - GaduPublicDir( GaduAccount* , int searchFor, TQWidget* parent = 0, const char* name = "GaduPublicDir" ); - TQPixmap iconForStatus( uint status ); + GaduPublicDir( GaduAccount* , TQWidget *tqparent = 0, const char* name = "GaduPublicDir" ); + GaduPublicDir( GaduAccount* , int searchFor, TQWidget* tqparent = 0, const char* name = "GaduPublicDir" ); + TQPixmap iconFortqStatus( uint status ); private slots: void slotSearch(); @@ -67,10 +68,10 @@ private: GaduPublicDirectory* mMainWidget; // form data - QString fName; - QString fSurname; - QString fNick; - QString fCity; + TQString fName; + TQString fSurname; + TQString fNick; + TQString fCity; int fUin; int fGender; bool fOnlyOnline; diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index b2ee0bc1..7baaa1bc 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -35,8 +35,8 @@ #include "gaduregisteraccount.h" #include "gaducommands.h" -GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "Register New Account" ), KDialogBase::User1 | KDialogBase::Ok, KDialogBase::User1, true ) +GaduRegisterAccount::GaduRegisterAccount( TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Register New Account" ), KDialogBase::User1 | KDialogBase::Ok, KDialogBase::User1, true ) { ui = new GaduRegisterAccountUI( this ); setMainWidget( ui ); @@ -46,7 +46,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) setButtonText( Ok, i18n( "&Cancel" ) ); enableButton( User1, false ); - cRegister = new RegisterCommand( this ); + cRegister = new RegisterCommand( TQT_TQOBJECT(this) ); emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); hintPixmap = KGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); @@ -62,9 +62,9 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) connect( cRegister, TQT_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); connect( cRegister, TQT_SIGNAL( done( const TQString&, const TQString& ) ), TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); connect( cRegister, TQT_SIGNAL( error( const TQString&, const TQString& ) ), TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - connect( cRegister, TQT_SIGNAL( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) ); + connect( cRegister, TQT_SIGNAL( operationtqStatus( const TQString ) ), TQT_SLOT( updatetqStatus( const TQString ) ) ); - updateStatus( i18n( "Retrieving token" ) ); + updatetqStatus( i18n( "Retrieving token" ) ); cRegister->requestToken(); show(); @@ -86,7 +86,7 @@ GaduRegisterAccount::validateInput() if ( !emailRegexp->exactMatch( ui->valueEmailAddress->text() ) ) { - updateStatus( i18n( "Please enter a valid E-Mail Address." ) ); + updatetqStatus( i18n( "Please enter a valid E-Mail Address." ) ); ui->pixmapEmailAddress->setPixmap ( hintPixmap ); valid = false; } @@ -96,21 +96,21 @@ GaduRegisterAccount::validateInput() if ( valid && ( ( ui->valuePassword->text().isEmpty() ) || ( ui->valuePasswordVerify->text().isEmpty() ) ) ) { - updateStatus( i18n( "Please enter the same password twice." ) ); + updatetqStatus( i18n( "Please enter the same password twice." ) ); valid = false; passwordHighlight = true; } if ( valid && ( ui->valuePassword->text() != ui->valuePasswordVerify->text() ) ) { - updateStatus( i18n( "Password entries do not match." ) ); + updatetqStatus( i18n( "Password entries do not match." ) ); valid = false; passwordHighlight = true; } if ( valid && ( ui->valueVerificationSequence->text().isEmpty() ) ) { - updateStatus( i18n( "Please enter the verification sequence." ) ); + updatetqStatus( i18n( "Please enter the verification sequence." ) ); ui->pixmapVerificationSequence->setPixmap ( hintPixmap ); valid = false; } @@ -131,7 +131,7 @@ GaduRegisterAccount::validateInput() if ( valid ) { // clear status message if we have valid data - updateStatus( i18n( "" ) ); + updatetqStatus( i18n( "" ) ); } enableButton( User1, valid ); @@ -156,7 +156,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri ui->labelVerificationSequence->setDisabled( true ); ui->labelInstructions->setDisabled( true ); emit registeredNumber( cRegister->newUin(), ui->valuePassword->text() ); - updateStatus( i18n( "Account created; your new UIN is %1." ).arg(TQString::number( cRegister->newUin() ) ) ); + updatetqStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() ) ) ); enableButton( User1, false ); setButtonText( Ok, i18n( "&Close" ) ); } @@ -164,18 +164,18 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri void GaduRegisterAccount::registrationError( const TQString& title, const TQString& what ) { - updateStatus( i18n( "Registration failed: %1" ).arg( what ) ); + updatetqStatus( i18n( "Registration failed: %1" ).tqarg( what ) ); KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title ); disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); disconnect( this, TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); disconnect( this, TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - disconnect( this, TQT_SLOT( updateStatus( const TQString ) ) ); + disconnect( this, TQT_SLOT( updatetqStatus( const TQString ) ) ); ui->valueVerificationSequence->setDisabled( true ); ui->valueVerificationSequence->setText( "" ); enableButton( User1, false ); - updateStatus( "" ); + updatetqStatus( "" ); // emit UIN 0, to enable 'register new account' button again in dialog below emit registeredNumber( 0, TQString( "" ) ); @@ -192,9 +192,9 @@ GaduRegisterAccount::displayToken( TQPixmap image, TQString /*tokenId */ ) } void -GaduRegisterAccount::updateStatus( const TQString status ) +GaduRegisterAccount::updatetqStatus( const TQString status ) { - ui->labelStatusMessage->setAlignment( AlignCenter ); + ui->labelStatusMessage->tqsetAlignment( AlignCenter ); ui->labelStatusMessage->setText( status ); } diff --git a/kopete/protocols/gadu/gaduregisteraccount.h b/kopete/protocols/gadu/gaduregisteraccount.h index c449986f..f6abb06d 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.h +++ b/kopete/protocols/gadu/gaduregisteraccount.h @@ -33,6 +33,7 @@ class GaduRegisterAccountUI; class GaduRegisterAccount : public KDialogBase { Q_OBJECT + TQ_OBJECT public: GaduRegisterAccount( TQWidget* , const char* ); @@ -48,7 +49,7 @@ protected slots: void registrationDone( const TQString&, const TQString& ); void inputChanged( const TQString & ); void doRegister(); - void updateStatus( const TQString status ); + void updatetqStatus( const TQString status ); private: void validateInput(); @@ -56,7 +57,7 @@ private: GaduRegisterAccountUI* ui; RegisterCommand* cRegister; TQRegExp* emailRegexp; - QPixmap hintPixmap; + TQPixmap hintPixmap; }; #endif diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index fd567bf6..9e46b967 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -37,7 +37,7 @@ GaduRichTextFormat::~GaduRichTextFormat() { } -QString +TQString GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, void* formatStructure) { TQString tmp, nb; @@ -100,9 +100,9 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo g = (int)color->green; b = (int)color->blue; } - style += TQString(" color: rgb( %1, %2, %3 ); ").arg( r ).arg( g ).arg( b ); + style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b ); - tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").arg( style ) ); + tmp += formatOpeningTag( TQString::tqfromLatin1("span"), TQString::tqfromLatin1("style=\"%1\"").tqarg( style ) ); opened = true; } @@ -121,7 +121,7 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo return tmp; } -QString +TQString GaduRichTextFormat::formatOpeningTag( const TQString& tag, const TQString& attributes ) { TQString res = "<" + tag; @@ -130,7 +130,7 @@ GaduRichTextFormat::formatOpeningTag( const TQString& tag, const TQString& attri return res + ">"; } -QString +TQString GaduRichTextFormat::formatClosingTag( const TQString& tag ) { return "</" + tag + ">"; @@ -150,8 +150,8 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) output->rtf.resize(0); // test first if there is any HTML formating in it - if( htmlString.find( TQString::fromLatin1("</span") ) > -1 ) { - TQRegExp findTags( TQString::fromLatin1("<span style=\"(.*)\">(.*)</span>") ); + if( htmlString.tqfind( TQString::tqfromLatin1("</span") ) > -1 ) { + TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") ); findTags.setMinimal( true ); int pos = 0; int lastpos = 0; @@ -198,8 +198,8 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) return NULL; } - TQString rep = TQString("<span style=\"%1\">%2</span>" ).arg( styleHTML ).arg( replacement ); - htmlString.replace( findTags.pos( 0 ), rep.length(), replacement ); + TQString rep = TQString("<span style=\"%1\">%2</span>" ).tqarg( styleHTML ).tqarg( replacement ); + htmlString.tqreplace( findTags.pos( 0 ), rep.length(), replacement ); replacement = unescapeGaduMessage( replacement ); output->message += replacement; @@ -226,26 +226,26 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) void GaduRichTextFormat::parseAttributes( const TQString attribute, const TQString value ) { - if( attribute == TQString::fromLatin1("color") ) { + if( attribute == TQString::tqfromLatin1("color") ) { color.setNamedColor( value ); } - if( attribute == TQString::fromLatin1("font-weight") && value == TQString::fromLatin1("600") ) { + if( attribute == TQString::tqfromLatin1("font-weight") && value == TQString::tqfromLatin1("600") ) { rtfs.font |= GG_FONT_BOLD; } - if( attribute == TQString::fromLatin1("text-decoration") && value == TQString::fromLatin1("underline") ) { + if( attribute == TQString::tqfromLatin1("text-decoration") && value == TQString::tqfromLatin1("underline") ) { rtfs.font |= GG_FONT_UNDERLINE ; } - if( attribute == TQString::fromLatin1("font-style") && value == TQString::fromLatin1("italic") ) { + if( attribute == TQString::tqfromLatin1("font-style") && value == TQString::tqfromLatin1("italic") ) { rtfs.font |= GG_FONT_ITALIC; } } -QString +TQString GaduRichTextFormat::unescapeGaduMessage( TQString& ns ) { TQString s; s = Kopete::Message::unescape( ns ); - s.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); + s.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); return s; } @@ -263,14 +263,14 @@ GaduRichTextFormat::insertRtf( uint position) // append font description rtfs.position = position; uint csize = rtf.size(); - if ( rtf.resize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { + if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtfs, sizeof( rtfs ) ); // append color description, if color has changed if ( rtfs.font & GG_FONT_COLOR ) { csize = rtf.size(); - if ( rtf.resize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { + if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtcs, sizeof( rtcs ) ); @@ -279,13 +279,13 @@ GaduRichTextFormat::insertRtf( uint position) return true; } -QString +TQString GaduRichTextFormat::escapeBody( TQString& input ) { - input.replace( '<', TQString::fromLatin1("<") ); - input.replace( '>', TQString::fromLatin1(">") ); - input.replace( '\n', TQString::fromLatin1( "<br />" ) ); - input.replace( '\t', TQString::fromLatin1( " " ) ); - input.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " " ) ); + input.tqreplace( '<', TQString::tqfromLatin1("<") ); + input.tqreplace( '>', TQString::tqfromLatin1(">") ); + input.tqreplace( '\n', TQString::tqfromLatin1( "<br />" ) ); + input.tqreplace( '\t', TQString::tqfromLatin1( " " ) ); + input.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); return input; } diff --git a/kopete/protocols/gadu/gadurichtextformat.h b/kopete/protocols/gadu/gadurichtextformat.h index 9476539e..ff9ba208 100644 --- a/kopete/protocols/gadu/gadurichtextformat.h +++ b/kopete/protocols/gadu/gadurichtextformat.h @@ -37,7 +37,7 @@ public: KGaduMessage* convertToGaduMessage( const Kopete::Message& ); private: - TQString formatOpeningTag( const TQString& , const TQString& = TQString::null ); + TQString formatOpeningTag( const TQString& , const TQString& = TQString() ); TQString formatClosingTag( const TQString& ); bool insertRtf( uint ); TQString unescapeGaduMessage( TQString& ); @@ -47,7 +47,7 @@ private: gg_msg_richtext_format rtfs; gg_msg_richtext_color rtcs; gg_msg_richtext* header; - QByteArray rtf; + TQByteArray rtf; }; #endif diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 63b696d4..f7fe5970 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -38,8 +38,8 @@ #include <string.h> #include <netinet/in.h> -GaduSession::GaduSession( TQObject* parent, const char* name ) -: TQObject( parent, name ), session_( 0 ), searchSeqNr_( 0 ) +GaduSession::GaduSession( TQObject* tqparent, const char* name ) +: TQObject( tqparent, name ), session_( 0 ), searchSeqNr_( 0 ) { textcodec = TQTextCodec::codecForName( "CP1250" ); rtf = new GaduRichTextFormat; @@ -62,7 +62,7 @@ GaduSession::isConnected() const int GaduSession::status() const { - kdDebug(14100)<<"Status = " << session_->status <<", initial = "<< session_->initial_status <<endl; + kdDebug(14100)<<"tqStatus = " << session_->status <<", initial = "<< session_->initial_status <<endl; if ( session_ ) { return session_->status & ( ~GG_STATUS_FRIENDS_MASK ); } @@ -265,7 +265,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl } else { sendMsg = msg.plainBody(); - sendMsg.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); + sendMsg.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); cpMsg = textcodec->fromUnicode( sendMsg ); return gg_send_message( session_, msgClass, recipient, (const unsigned char *)cpMsg.data() ); @@ -279,7 +279,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl } int -GaduSession::changeStatus( int status, bool forFriends ) +GaduSession::changetqStatus( int status, bool forFriends ) { kdDebug(14101)<<"## Changing to "<<status<<endl; if ( isConnected() ) { @@ -424,8 +424,8 @@ GaduSession::pubDirSearch( ResLine& query, int ageFrom, int ageTo, bool onlyAli (const char*)textcodec->fromUnicode( query.city ) ); } if ( ageFrom || ageTo ) { - TQString yearFrom = TQString::number( TQDate::currentDate().year() - ageFrom ); - TQString yearTo = TQString::number( TQDate::currentDate().year() - ageTo ); + TQString yearFrom = TQString::number( TQDate::tqcurrentDate().year() - ageFrom ); + TQString yearTo = TQString::number( TQDate::tqcurrentDate().year() - ageTo ); if ( ageFrom && ageTo ) { gg_pubdir50_add( searchRequest, GG_PUBDIR50_BIRTHYEAR, @@ -490,7 +490,7 @@ GaduSession::sendResult( gg_pubdir50_t result ) resultLine.status = stat.toInt(); age = resultLine.age.toInt(); if ( age ) { - resultLine.age = TQString::number( TQDate::currentDate().year() - age ); + resultLine.age = TQString::number( TQDate::tqcurrentDate().year() - age ); } else { resultLine.age.truncate( 0 ); @@ -566,7 +566,7 @@ GaduSession::handleUserlist( gg_event* event ) } } -QString +TQString GaduSession::stateDescription( int state ) { switch( state ) { @@ -604,7 +604,7 @@ GaduSession::stateDescription( int state ) return i18n( "unknown" ); } } -QString +TQString GaduSession::errorDescription( int err ) { switch( err ){ @@ -617,11 +617,11 @@ GaduSession::errorDescription( int err ) case GG_ERROR_WRITING: return i18n( "Writing error." ); default: - return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)err ) ); + return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)err ) ); } } -QString +TQString GaduSession::failureDescription( gg_failure_t f ) { switch( f ) { @@ -642,7 +642,7 @@ GaduSession::failureDescription( gg_failure_t f ) case GG_FAILURE_TLS: return i18n( "Unable to connect over encrypted channel.\nTry to turn off encryption support in Gadu account settings and reconnect." ); default: - return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)f ) ); + return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)f ) ); } } @@ -730,7 +730,7 @@ GaduSession::checkDescriptor() gaduNotify.description = textcodec->toUnicode( event->event.status.descr ); } else { - gaduNotify.description = TQString::null; + gaduNotify.description = TQString(); } gaduNotify.remote_port = 0; gaduNotify.version = 0; @@ -747,7 +747,7 @@ GaduSession::checkDescriptor() gaduNotify.description = textcodec->toUnicode( event->event.status60.descr ); } else { - gaduNotify.description = TQString::null; + gaduNotify.description = TQString(); } gaduNotify.remote_ip.setAddress( ntohl( event->event.status60.remote_ip ) ); gaduNotify.remote_port = event->event.status60.remote_port; diff --git a/kopete/protocols/gadu/gadusession.h b/kopete/protocols/gadu/gadusession.h index a1caeb0d..4487b63a 100644 --- a/kopete/protocols/gadu/gadusession.h +++ b/kopete/protocols/gadu/gadusession.h @@ -39,10 +39,10 @@ #include <libgadu.h> struct KGaduMessage { - QString message; // Unicode + TQString message; // Unicode unsigned int sender_id; // sender's UIN - QDateTime sendTime; - QByteArray rtf; + TQDateTime sendTime; + TQByteArray rtf; }; struct KGaduLoginParams { @@ -89,12 +89,13 @@ class TQStringList; namespace Kopete { class Message; } class GaduRichTextFormat; -class GaduSession : public QObject +class GaduSession : public TQObject { Q_OBJECT + TQ_OBJECT public: - GaduSession( TQObject* parent = 0, const char* name = 0 ); + GaduSession( TQObject* tqparent = 0, const char* name = 0 ); virtual ~GaduSession(); bool isConnected() const; int status() const; @@ -123,7 +124,7 @@ public slots: int addNotify( uin_t ); int removeNotify( uin_t ); int sendMessage( uin_t recipient, const Kopete::Message& msg, int msgClass ); - int changeStatus( int, bool forFriends = false ); + int changetqStatus( int, bool forFriends = false ); int changeStatusDescription( int, const TQString&, bool forFriends = false ); int ping(); diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui index f8d673b6..afc259b1 100644 --- a/kopete/protocols/gadu/ui/gaduadd.ui +++ b/kopete/protocols/gadu/ui/gaduadd.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GaduAddUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GaduAddUI</cstring> </property> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout39</cstring> + <cstring>tqlayout39</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -45,7 +45,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -71,34 +71,34 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string><i>(for example: 1234567)</i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -118,7 +118,7 @@ <string>The forename (first name) of the contact you wish to add. Optionally this may include a middle name.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -138,7 +138,7 @@ <string>The surname (last name) of the contact you wish to add.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -163,7 +163,7 @@ <string>A nickname for the contact you wish to add.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -191,7 +191,7 @@ <string>E-Mail address for this contact.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4_2</cstring> </property> @@ -221,15 +221,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>fornameEdit_</cstring> </property> @@ -243,7 +243,7 @@ <string>The forename (first name) of the contact you wish to add. Optionally this may include a middle name.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>snameEdit_</cstring> </property> @@ -257,7 +257,7 @@ <string>The surname (last name) of the contact you wish to add.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>nickEdit_</cstring> </property> @@ -268,7 +268,7 @@ <string>A nickname for the contact you wish to add.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>emailEdit_</cstring> </property> @@ -282,7 +282,7 @@ <string>E-Mail address for this contact.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>telephoneEdit_</cstring> </property> @@ -300,7 +300,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>notAFriend_</cstring> </property> @@ -317,7 +317,7 @@ <string>Check if you want to exclude this contact from the "Just for friends" status mode.</string> </property> </widget> - <widget class="QListView" row="3" column="0"> + <widget class="TQListView" row="3" column="0"> <column> <property name="text"> <string>Group</string> @@ -353,7 +353,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>krestrictedline.h</includehint> </includehints> diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui index 3e475bce..fbc9411c 100644 --- a/kopete/protocols/gadu/ui/gaduawayui.ui +++ b/kopete/protocols/gadu/ui/gaduawayui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>GaduAwayUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GaduAwayUI</cstring> </property> @@ -31,20 +31,20 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>statusGroup_</cstring> </property> <property name="title"> - <string>Status</string> + <string>tqStatus</string> </property> <property name="whatsThis" stdset="0"> <string>Choose status, by default present status is selected. @@ -55,15 +55,15 @@ Choosing Offline status will disconnect you, with given description.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>onlineButton_</cstring> </property> @@ -80,7 +80,7 @@ Choosing Offline status will disconnect you, with given description.</string> <string>Set your status to Online, indicating that you are available to chat with anyone who wishes.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>awayButton_</cstring> </property> @@ -97,7 +97,7 @@ Choosing Offline status will disconnect you, with given description.</string> <string>Set your status to busy, indicating that you may should not be bothered with trivial chat, and may not be able to reply immediately.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>invisibleButton_</cstring> </property> @@ -114,7 +114,7 @@ Choosing Offline status will disconnect you, with given description.</string> <string>Set status to invisible, which will hide your presence from other users (who will see you as offline). However you may still chat, and see the online presence of others.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>offlineButton_</cstring> </property> @@ -135,15 +135,15 @@ Choosing Offline status will disconnect you, with given description.</string> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout278</cstring> + <cstring>tqlayout278</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -160,7 +160,7 @@ Choosing Offline status will disconnect you, with given description.</string> <string>Description of your status (up to 70 characters).</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>textEdit_</cstring> </property> @@ -190,5 +190,5 @@ Choosing Offline status will disconnect you, with given description.</string> <tabstop>invisibleButton_</tabstop> <tabstop>offlineButton_</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui index 01edaa08..1542a76f 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GaduAccountEditUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GaduAccountEditUI</cstring> </property> @@ -27,14 +27,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget4</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox63</cstring> </property> @@ -56,15 +56,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -111,7 +111,7 @@ <cstring>passwordWidget_</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoLoginCheck_</cstring> </property> @@ -127,7 +127,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -146,7 +146,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -158,7 +158,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -168,11 +168,11 @@ <string>To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account.<br><br> If you do not currently have an account, please click the button to create one.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>registerNew</cstring> </property> @@ -201,7 +201,7 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -210,7 +210,7 @@ If you do not currently have an account, please click the button to create one.< </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -231,14 +231,14 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox64</cstring> </property> @@ -249,7 +249,7 @@ If you do not currently have an account, please click the button to create one.< <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>dccCheck_</cstring> </property> @@ -263,15 +263,15 @@ If you do not currently have an account, please click the button to create one.< <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout65</cstring> + <cstring>tqlayout65</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -288,7 +288,7 @@ If you do not currently have an account, please click the button to create one.< <string>Whether or not you want to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>If Available</string> @@ -322,7 +322,7 @@ If you do not currently have an account, please click the button to create one.< </widget> </hbox> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>cacheServersCheck__</cstring> </property> @@ -342,7 +342,7 @@ If you do not currently have an account, please click the button to create one.< <string>This option is used whenever the primary Gadu-Gadu load-balancing server fails. If this is checked, Kopete will try to connect to the actual servers directly using cached information about them. This prevents connection errors when the main load-balancing server does not answer. In practice it only helps very rarely.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>ignoreCheck_</cstring> </property> @@ -363,7 +363,7 @@ If you do not currently have an account, please click the button to create one.< </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -374,7 +374,7 @@ If you do not currently have an account, please click the button to create one.< <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>connectLabel</cstring> </property> @@ -397,7 +397,7 @@ If you do not currently have an account, please click the button to create one.< <string><p align="center">You must be connected to change your Personal Information.</p></string> </property> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>userInformation</cstring> </property> @@ -411,23 +411,23 @@ If you do not currently have an account, please click the button to create one.< <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -435,7 +435,7 @@ If you do not currently have an account, please click the button to create one.< <string>Name:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>uiSurnamea</cstring> </property> @@ -443,7 +443,7 @@ If you do not currently have an account, please click the button to create one.< <string>Surname:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_3</cstring> </property> @@ -451,7 +451,7 @@ If you do not currently have an account, please click the button to create one.< <string>Your nick name:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_3_2</cstring> </property> @@ -459,7 +459,7 @@ If you do not currently have an account, please click the button to create one.< <string>Gender:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_3_2_2</cstring> </property> @@ -467,7 +467,7 @@ If you do not currently have an account, please click the button to create one.< <string>Year of birth:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_3_2_3</cstring> </property> @@ -477,15 +477,15 @@ If you do not currently have an account, please click the button to create one.< </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>uiName</cstring> </property> @@ -493,7 +493,7 @@ If you do not currently have an account, please click the button to create one.< <bool>false</bool> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>uiSurname</cstring> </property> @@ -501,7 +501,7 @@ If you do not currently have an account, please click the button to create one.< <bool>false</bool> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>nickName</cstring> </property> @@ -509,7 +509,7 @@ If you do not currently have an account, please click the button to create one.< <bool>true</bool> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string></string> @@ -532,7 +532,7 @@ If you do not currently have an account, please click the button to create one.< <bool>false</bool> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>uiYOB</cstring> </property> @@ -540,7 +540,7 @@ If you do not currently have an account, please click the button to create one.< <bool>false</bool> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>uiCity</cstring> </property> @@ -552,7 +552,7 @@ If you do not currently have an account, please click the button to create one.< </widget> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_5_3_2_4_2</cstring> </property> @@ -570,30 +570,30 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_3_2_4</cstring> </property> @@ -601,7 +601,7 @@ If you do not currently have an account, please click the button to create one.< <string>Maiden name:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5_3_2_4_3</cstring> </property> @@ -611,15 +611,15 @@ If you do not currently have an account, please click the button to create one.< </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>uiMeiden</cstring> </property> @@ -627,7 +627,7 @@ If you do not currently have an account, please click the button to create one.< <bool>false</bool> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>uiOrgin</cstring> </property> @@ -643,7 +643,7 @@ If you do not currently have an account, please click the button to create one.< </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -654,7 +654,7 @@ If you do not currently have an account, please click the button to create one.< <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>dcc</cstring> </property> @@ -668,7 +668,7 @@ If you do not currently have an account, please click the button to create one.< <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -676,7 +676,7 @@ If you do not currently have an account, please click the button to create one.< <string><qt><p align="center"><font color="#ff0000">These options affect <b>all</b> Gadu-Gadu accounts.</font></p></qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>optionOverrideDCC</cstring> </property> @@ -684,17 +684,17 @@ If you do not currently have an account, please click the button to create one.< <string>&Override default configuration</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <hbox> <property name="name"> @@ -703,7 +703,7 @@ If you do not currently have an account, please click the button to create one.< <property name="spacing"> <number>3</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -717,7 +717,7 @@ If you do not currently have an account, please click the button to create one.< <cstring>ipAddress</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -752,7 +752,7 @@ If you do not currently have an account, please click the button to create one.< <string>0.0.0.0</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>dccPort</cstring> </property> @@ -780,7 +780,7 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>180</height> @@ -790,14 +790,14 @@ If you do not currently have an account, please click the button to create one.< </vbox> </widget> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelStatusMessage</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -865,7 +865,7 @@ If you do not currently have an account, please click the button to create one.< <tabstop>ipAddress</tabstop> <tabstop>dccPort</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>krestrictedline.h</includehint> diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui index 5a0e475e..9490ffb6 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GaduRegisterAccountUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GaduRegisterAccountUI</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapEmailAddress</cstring> </property> @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -55,7 +55,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>labelPasswordVerify</cstring> </property> @@ -100,7 +100,7 @@ <string>The E-mail address you would like to use to register this account.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>pixmapVerificationSequence</cstring> </property> @@ -112,13 +112,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -128,7 +128,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>labelEmailAddress</cstring> </property> @@ -145,7 +145,7 @@ <string>The E-mail address you would like to use to register this account.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>pixmapPasswordVerify</cstring> </property> @@ -157,13 +157,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -173,7 +173,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>labelVerificationSequence</cstring> </property> @@ -193,7 +193,7 @@ <string>The text from the image below. This is used to prevent abusive automated registration scripts.</string> </property> </widget> - <widget class="QLineEdit" row="3" column="2"> + <widget class="TQLineEdit" row="3" column="2"> <property name="name"> <cstring>valueVerificationSequence</cstring> </property> @@ -204,7 +204,7 @@ <string>The text from the image below. This is used to prevent abusive automated registration scripts.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>pixmapPassword</cstring> </property> @@ -216,13 +216,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -232,7 +232,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>labelPassword</cstring> </property> @@ -265,9 +265,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layoutImageCenter</cstring> + <cstring>tqlayoutImageCenter</cstring> </property> <hbox> <property name="name"> @@ -283,14 +283,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>23</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapToken</cstring> </property> @@ -302,13 +302,13 @@ <verstretch>13</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>64</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>256</width> <height>64</height> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>22</width> <height>20</height> @@ -359,7 +359,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelInstructions</cstring> </property> @@ -374,7 +374,7 @@ <property name="text"> <string><i>Type the letters and numbers shown in the image above into the <b>Verification Sequence</b> field. This is used to prevent automated registration abuse.</i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -388,21 +388,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelStatusMessage</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -414,7 +414,7 @@ <tabstop>valuePasswordVerify</tabstop> <tabstop>valueVerificationSequence</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui index ac215b1a..2aef2334 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>GaduPublicDirectory</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GaduPublicDirectory</cstring> </property> @@ -16,11 +16,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack" row="0" column="0"> + <widget class="TQWidgetStack" row="0" column="0"> <property name="name"> <cstring>pubsearch</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -48,39 +48,39 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout38</cstring> + <cstring>tqlayout38</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout31</cstring> + <cstring>tqlayout31</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout29</cstring> + <cstring>tqlayout29</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1a</cstring> </property> @@ -88,7 +88,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2a</cstring> </property> @@ -96,7 +96,7 @@ <string>Surname:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3a</cstring> </property> @@ -104,7 +104,7 @@ <string>Nick:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2a</cstring> </property> @@ -114,30 +114,30 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout30</cstring> + <cstring>tqlayout30</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>nameS</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>surname</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>nick</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>cityS</cstring> </property> @@ -146,15 +146,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2_2a</cstring> </property> @@ -162,7 +162,7 @@ <string>Age from:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>ageFrom</cstring> </property> @@ -182,7 +182,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2_3</cstring> </property> @@ -190,7 +190,7 @@ <string>to:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>ageTo</cstring> </property> @@ -220,7 +220,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>297</width> <height>21</height> @@ -229,15 +229,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_4a</cstring> </property> @@ -251,7 +251,7 @@ <bool>false</bool> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string></string> @@ -280,23 +280,23 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>uin_static</cstring> </property> @@ -319,7 +319,7 @@ </widget> </vbox> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioByUin</cstring> </property> @@ -330,7 +330,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioByData</cstring> </property> @@ -341,15 +341,15 @@ <string>Search by specified data:</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>layout35</cstring> + <cstring>tqlayout35</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>onlyOnline</cstring> </property> @@ -367,7 +367,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>224</width> <height>21</height> @@ -386,7 +386,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -397,7 +397,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -411,7 +411,7 @@ <widget class="KListView" row="0" column="0"> <column> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> <property name="pixmap"> <pixmap>image0</pixmap> @@ -527,13 +527,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>512</width> <height>256</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>640</width> <height>512</height> @@ -684,7 +684,7 @@ <tabstop>onlyOnline</tabstop> <tabstop>listFound</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>krestrictedline.h</includehint> <includehint>klistview.h</includehint> |