From b0c86264e0cd10a0d3a47de3b05be453d9417bcd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Jan 2024 13:10:18 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- kbugbuster/backend/bugjob.cpp | 16 +++++------ kbugbuster/backend/bugserver.cpp | 4 +-- kbugbuster/backend/bugsystem.cpp | 60 +++++++++++++++++++-------------------- kbugbuster/backend/mailsender.cpp | 22 +++++++------- kbugbuster/backend/smtp.cpp | 20 ++++++------- 5 files changed, 61 insertions(+), 61 deletions(-) (limited to 'kbugbuster/backend') diff --git a/kbugbuster/backend/bugjob.cpp b/kbugbuster/backend/bugjob.cpp index 3531fc5f..faf1d149 100644 --- a/kbugbuster/backend/bugjob.cpp +++ b/kbugbuster/backend/bugjob.cpp @@ -30,14 +30,14 @@ void BugJob::start( const KURL &url ) TDEIO::Job *job = TDEIO::get( url, true /*always 'reload=true', we have our own cache*/, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( ioResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( ioData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), - this, TQT_SLOT( ioInfoMessage( TDEIO::Job *, const TQString & ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - this, TQT_SLOT( ioInfoPercent( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( ioResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( ioData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), + this, TQ_SLOT( ioInfoMessage( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + this, TQ_SLOT( ioInfoPercent( TDEIO::Job *, unsigned long ) ) ); } void BugJob::ioResult( TDEIO::Job *job ) diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index f8ace6e6..a7aa61f2 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -258,8 +258,8 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, // implement message queueing for smtp MailSender *directMailer = mailer->clone(); #if 0 - connect( directMailer, TQT_SIGNAL( status( const TQString & ) ), - this, TQT_SIGNAL( infoMessage( const TQString & ) ) ); + connect( directMailer, TQ_SIGNAL( status( const TQString & ) ), + this, TQ_SIGNAL( infoMessage( const TQString & ) ) ); #endif if (!directMailer->send( senderName, senderEmail, cmd->mailAddress(), cmd->bug().title().prepend( "Re: " ), diff --git a/kbugbuster/backend/bugsystem.cpp b/kbugbuster/backend/bugsystem.cpp index f5bd66bd..cfeb74c9 100644 --- a/kbugbuster/backend/bugsystem.cpp +++ b/kbugbuster/backend/bugsystem.cpp @@ -80,12 +80,12 @@ void BugSystem::retrievePackageList() emit packageListLoading(); PackageListJob *job = new PackageListJob( mServer ); - connect( job, TQT_SIGNAL( packageListAvailable( const Package::List & ) ), - this, TQT_SIGNAL( packageListAvailable( const Package::List & ) ) ); - connect( job, TQT_SIGNAL( packageListAvailable( const Package::List & ) ), - this, TQT_SLOT( setPackageList( const Package::List & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( loadingError( const TQString & ) ) ); + connect( job, TQ_SIGNAL( packageListAvailable( const Package::List & ) ), + this, TQ_SIGNAL( packageListAvailable( const Package::List & ) ) ); + connect( job, TQ_SIGNAL( packageListAvailable( const Package::List & ) ), + this, TQ_SLOT( setPackageList( const Package::List & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( loadingError( const TQString & ) ) ); connectJob( job ); registerJob( job ); @@ -120,12 +120,12 @@ void BugSystem::retrieveBugList( const Package &pkg, const TQString &component ) emit bugListLoading( pkg, component ); BugListJob *job = new BugListJob( mServer ); - connect( job, TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), - this, TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ) ); - connect( job, TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), - this, TQT_SLOT( setBugList( const Package &, const TQString &, const Bug::List & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( loadingError( const TQString & ) ) ); + connect( job, TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), + this, TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ) ); + connect( job, TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), + this, TQ_SLOT( setBugList( const Package &, const TQString &, const Bug::List & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( loadingError( const TQString & ) ) ); connectJob( job ); registerJob( job ); @@ -152,10 +152,10 @@ void BugSystem::retrieveMyBugsList() BugMyBugsJob *job = new BugMyBugsJob( mServer ); - connect( job, TQT_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ), - this, TQT_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( loadingError( const TQString & ) ) ); + connect( job, TQ_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ), + this, TQ_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( loadingError( const TQString & ) ) ); connectJob( job ); registerJob( job ); @@ -184,12 +184,12 @@ void BugSystem::retrieveBugDetails( const Bug &bug ) emit bugDetailsLoading( bug ); BugDetailsJob *job = new BugDetailsJob( mServer ); - connect( job, TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), - this, TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ) ); - connect( job, TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), - this, TQT_SLOT( setBugDetails( const Bug &, const BugDetails & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( bugDetailsLoadingError() ) ); + connect( job, TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), + this, TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ) ); + connect( job, TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), + this, TQ_SLOT( setBugDetails( const Bug &, const BugDetails & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( bugDetailsLoadingError() ) ); connectJob( job ); registerJob( job ); @@ -201,12 +201,12 @@ void BugSystem::retrieveBugDetails( const Bug &bug ) void BugSystem::connectJob( BugJob *job ) { - connect( job, TQT_SIGNAL( infoMessage( const TQString & ) ), - this, TQT_SIGNAL( infoMessage( const TQString & ) ) ); - connect( job, TQT_SIGNAL( infoPercent( unsigned long ) ), - this, TQT_SIGNAL( infoPercent( unsigned long ) ) ); - connect( job, TQT_SIGNAL( jobEnded( BugJob * ) ), - TQT_SLOT( unregisterJob( BugJob * ) ) ); + connect( job, TQ_SIGNAL( infoMessage( const TQString & ) ), + this, TQ_SIGNAL( infoMessage( const TQString & ) ) ); + connect( job, TQ_SIGNAL( infoPercent( unsigned long ) ), + this, TQ_SIGNAL( infoPercent( unsigned long ) ) ); + connect( job, TQ_SIGNAL( jobEnded( BugJob * ) ), + TQ_SLOT( unregisterJob( BugJob * ) ) ); } void BugSystem::setPackageList( const Package::List &pkgs ) @@ -290,8 +290,8 @@ void BugSystem::sendCommands() // ### connect to signals MailSender *mailer = new MailSender( client, smtpServer ); - connect( mailer, TQT_SIGNAL( status( const TQString & ) ), - TQT_SIGNAL( infoMessage( const TQString & ) ) ); + connect( mailer, TQ_SIGNAL( status( const TQString & ) ), + TQ_SIGNAL( infoMessage( const TQString & ) ) ); mServer->sendCommands( mailer, senderName, senderEmail, sendBCC, recipient ); } diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 2d05d759..00d2d0f8 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -78,7 +78,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T if (!fd) { kdError() << "Unable to open a pipe to " << command << endl; - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); return false; } @@ -103,13 +103,13 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T if (!kapp->dcopClient()->isApplicationRegistered("kmail")) { KMessageBox::error(0,i18n("No running instance of KMail found.")); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); return false; } emit status( i18n( "Passing mail to TDE email program..." ) ); if (!kMailOpenComposer(to,"", (bcc ? from : ""), subject,body,0,KURL())) { - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); return false; } } else if ( m_client == Direct ) { @@ -128,12 +128,12 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T TQString::fromLatin1( "\n\n" ) + body; Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer ); - connect( smtp, TQT_SIGNAL( status( const TQString & ) ), - this, TQT_SIGNAL( status( const TQString & ) ) ); - connect( smtp, TQT_SIGNAL( success() ), - this, TQT_SLOT( smtpSuccess() ) ); - connect( smtp, TQT_SIGNAL( error( const TQString &, const TQString & ) ), - this, TQT_SLOT( smtpError( const TQString &, const TQString & ) ) ); + connect( smtp, TQ_SIGNAL( status( const TQString & ) ), + this, TQ_SIGNAL( status( const TQString & ) ) ); + connect( smtp, TQ_SIGNAL( success() ), + this, TQ_SLOT( smtpSuccess() ) ); + connect( smtp, TQ_SIGNAL( error( const TQString &, const TQString & ) ), + this, TQ_SLOT( smtpError( const TQString &, const TQString & ) ) ); smtp->insertChild( this ); // die when smtp dies } else { @@ -143,7 +143,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T if (m_client != Direct) { emit finished(); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); } return true; @@ -176,7 +176,7 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response) "response: %2" ).arg( command ).arg( response ) ); emit finished(); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); } int MailSender::kMailOpenComposer(const TQString& arg0,const TQString& arg1, diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp index 2b5f58e9..5e5bc9da 100644 --- a/kbugbuster/backend/smtp.cpp +++ b/kbugbuster/backend/smtp.cpp @@ -23,12 +23,12 @@ Smtp::Smtp( const TQString &from, const TQStringList &to, { skipReadResponse = false; mSocket = new TQSocket( this ); - connect ( mSocket, TQT_SIGNAL( readyRead() ), - this, TQT_SLOT( readyRead() ) ); - connect ( mSocket, TQT_SIGNAL( connected() ), - this, TQT_SLOT( connected() ) ); - connect ( mSocket, TQT_SIGNAL( error(int) ), - this, TQT_SLOT( socketError(int) ) ); + connect ( mSocket, TQ_SIGNAL( readyRead() ), + this, TQ_SLOT( readyRead() ) ); + connect ( mSocket, TQ_SIGNAL( connected() ), + this, TQ_SLOT( connected() ) ); + connect ( mSocket, TQ_SIGNAL( error(int) ), + this, TQ_SLOT( socketError(int) ) ); message = aMessage; @@ -98,7 +98,7 @@ void Smtp::socketError(int errorCode) default: responseLine = i18n( "Internal error, unrecognized error." ); } - TQTimer::singleShot( 0, this, TQT_SLOT(emitError()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitError()) ); } void Smtp::emitError() { @@ -147,7 +147,7 @@ void Smtp::readyRead() *t << message << seperator << ".\r\n"; state = smtpSuccess; } else if ( state == smtpSuccess && responseLine[0] == '2' ) { - TQTimer::singleShot( 0, this, TQT_SIGNAL(success()) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL(success()) ); } else if ( state == smtpQuit && responseLine[0] == '2' ) { command = "QUIT"; *t << "QUIT\r\n"; @@ -157,7 +157,7 @@ void Smtp::readyRead() } else if ( state == smtpClose ) { // we ignore it } else { // error occurred - TQTimer::singleShot( 0, this, TQT_SLOT(emitError()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitError()) ); state = smtpClose; } @@ -168,7 +168,7 @@ void Smtp::readyRead() t = 0; delete mSocket; mSocket = 0; - TQTimer::singleShot( 0, this, TQT_SLOT(deleteMe()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(deleteMe()) ); } } -- cgit v1.2.1