From 0241c9c49a9419991818840c398c89e2278def91 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 10 Apr 2007 09:46:30 +0000 Subject: [PATCH] showProgressInfo was always false => simplify porting svn path=/trunk/KDE/kdepim/; revision=652169 --- acljobs.cpp | 28 ++++++++-------------------- acljobs.h | 11 ++++------- annotationjobs.cpp | 20 ++++++-------------- annotationjobs.h | 7 +++---- quotajobs.cpp | 10 +++------- quotajobs.h | 2 +- 6 files changed, 25 insertions(+), 53 deletions(-) diff --git a/acljobs.cpp b/acljobs.cpp index 34474cf52..2f075c864 100644 --- a/acljobs.cpp +++ b/acljobs.cpp @@ -34,7 +34,6 @@ #include "acljobs.h" #include #include -#include using namespace KMail; @@ -140,7 +139,7 @@ ACLJobs::DeleteACLJob* ACLJobs::deleteACL( KIO::Slave* slave, const KUrl& url, c QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream << (int)'A' << (int)'D' << url << user; - ACLJobs::DeleteACLJob* job = new ACLJobs::DeleteACLJob( url, user, packedArgs, false ); + ACLJobs::DeleteACLJob* job = new ACLJobs::DeleteACLJob( url, user, packedArgs); KIO::Scheduler::assignJobToSlave( slave, job ); return job; } @@ -151,7 +150,7 @@ ACLJobs::GetACLJob* ACLJobs::getACL( KIO::Slave* slave, const KUrl& url ) QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream << (int)'A' << (int)'G' << url; - ACLJobs::GetACLJob* job = new ACLJobs::GetACLJob( url, packedArgs, false ); + ACLJobs::GetACLJob* job = new ACLJobs::GetACLJob( url, packedArgs); KIO::Scheduler::assignJobToSlave( slave, job ); return job; } @@ -162,17 +161,14 @@ ACLJobs::GetUserRightsJob* ACLJobs::getUserRights( KIO::Slave* slave, const KUrl QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream << (int)'A' << (int)'M' << url; - ACLJobs::GetUserRightsJob* job = new ACLJobs::GetUserRightsJob( url, packedArgs, false ); + ACLJobs::GetUserRightsJob* job = new ACLJobs::GetUserRightsJob( url, packedArgs ); KIO::Scheduler::assignJobToSlave( slave, job ); return job; } -ACLJobs::GetACLJob::GetACLJob( const KUrl& url, const QByteArray &packedArgs, - bool showProgressInfo ) +ACLJobs::GetACLJob::GetACLJob( const KUrl& url, const QByteArray &packedArgs) : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs ) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); connect( this, SIGNAL(infoMessage(KJob*,const QString&,const QString&)), SLOT(slotInfoMessage(KJob*,const QString&,const QString&)) ); } @@ -190,12 +186,9 @@ void ACLJobs::GetACLJob::slotInfoMessage( KJob*, const QString& str,const QStrin } } -ACLJobs::GetUserRightsJob::GetUserRightsJob( const KUrl& url, const QByteArray &packedArgs, - bool showProgressInfo ) +ACLJobs::GetUserRightsJob::GetUserRightsJob( const KUrl& url, const QByteArray &packedArgs) : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); connect( this, SIGNAL(infoMessage(KJob*,const QString&,const QString&)), SLOT(slotInfoMessage(KJob*,const QString&,const QString&)) ); } @@ -207,24 +200,19 @@ void ACLJobs::GetUserRightsJob::slotInfoMessage( KJob*, const QString& str,const } ACLJobs::DeleteACLJob::DeleteACLJob( const KUrl& url, const QString& userId, - const QByteArray &packedArgs, - bool showProgressInfo ) + const QByteArray &packedArgs) : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs ), mUserId( userId ) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); } //// -ACLJobs::MultiSetACLJob::MultiSetACLJob( KIO::Slave* slave, const KUrl& url, const ACLList& acl, bool showProgressInfo ) +ACLJobs::MultiSetACLJob::MultiSetACLJob( KIO::Slave* slave, const KUrl& url, const ACLList& acl ) : KIO::Job(), mSlave( slave ), mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() ) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); QTimer::singleShot(0, this, SLOT(slotStart())); } @@ -266,7 +254,7 @@ void ACLJobs::MultiSetACLJob::slotResult( KJob *job ) ACLJobs::MultiSetACLJob* ACLJobs::multiSetACL( KIO::Slave* slave, const KUrl& url, const ACLList& acl ) { - return new MultiSetACLJob( slave, url, acl, false /*showProgressInfo*/ ); + return new MultiSetACLJob( slave, url, acl); } #include "acljobs.moc" diff --git a/acljobs.h b/acljobs.h index e56caecfc..bf323ac09 100644 --- a/acljobs.h +++ b/acljobs.h @@ -100,8 +100,7 @@ namespace ACLJobs { { Q_OBJECT public: - GetACLJob( const KUrl& url, const QByteArray &packedArgs, - bool showProgressInfo ); + GetACLJob( const KUrl& url, const QByteArray &packedArgs); const ACLList& entries() const { return m_entries; } @@ -116,8 +115,7 @@ namespace ACLJobs { { Q_OBJECT public: - GetUserRightsJob( const KUrl& url, const QByteArray &packedArgs, - bool showProgressInfo ); + GetUserRightsJob( const KUrl& url, const QByteArray &packedArgs); unsigned int permissions() const { return m_permissions; } protected slots: @@ -133,8 +131,7 @@ namespace ACLJobs { Q_OBJECT public: DeleteACLJob( const KUrl& url, const QString& userId, - const QByteArray &packedArgs, - bool showProgressInfo ); + const QByteArray &packedArgs); QString userId() const { return mUserId; } @@ -147,7 +144,7 @@ namespace ACLJobs { Q_OBJECT public: - MultiSetACLJob( KIO::Slave* slave, const KUrl& url, const ACLList& acl, bool showProgressInfo ); + MultiSetACLJob( KIO::Slave* slave, const KUrl& url, const ACLList& acl); signals: // Emitted when a given user's permissions were successfully changed. diff --git a/annotationjobs.cpp b/annotationjobs.cpp index 3ebed672d..a7a02f55d 100644 --- a/annotationjobs.cpp +++ b/annotationjobs.cpp @@ -34,7 +34,6 @@ #include "annotationjobs.h" #include #include -#include using namespace KMail; @@ -59,19 +58,16 @@ AnnotationJobs::GetAnnotationJob* AnnotationJobs::getAnnotation( QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream << (int)'M' << (int)'G' << url << entry << attributes; - GetAnnotationJob* job = new GetAnnotationJob( url, entry, packedArgs, false ); + GetAnnotationJob* job = new GetAnnotationJob( url, entry, packedArgs); KIO::Scheduler::assignJobToSlave( slave, job ); return job; } AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KUrl& url, const QString& entry, - const QByteArray &packedArgs, - bool showProgressInfo ) + const QByteArray &packedArgs) : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs), mEntry( entry ) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); connect( this, SIGNAL(infoMessage(KJob*,const QString&,const QString&)), SLOT(slotInfoMessage(KJob*,const QString&,const QString&)) ); } @@ -89,13 +85,11 @@ void AnnotationJobs::GetAnnotationJob::slotInfoMessage( KJob*, const QString& st } AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob( - KIO::Slave* slave, const KUrl& url, const QStringList& entries, bool showProgressInfo ) + KIO::Slave* slave, const KUrl& url, const QStringList& entries ) : KIO::Job(), mSlave( slave ), mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() ) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); QTimer::singleShot(0, this, SLOT(slotStart())); } @@ -140,19 +134,17 @@ void AnnotationJobs::MultiGetAnnotationJob::slotResult( KJob *job ) AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( KIO::Slave* slave, const KUrl& url, const QStringList& entries ) { - return new MultiGetAnnotationJob( slave, url, entries, false /*showProgressInfo*/ ); + return new MultiGetAnnotationJob( slave, url, entries ); } //// AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob( - KIO::Slave* slave, const KUrl& url, const AnnotationList& annotations, bool showProgressInfo ) + KIO::Slave* slave, const KUrl& url, const AnnotationList& annotations ) : KIO::Job(), mSlave( slave ), mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() ) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); QTimer::singleShot(0, this, SLOT(slotStart())); } @@ -191,7 +183,7 @@ void AnnotationJobs::MultiSetAnnotationJob::slotResult( KJob *job ) AnnotationJobs::MultiSetAnnotationJob* AnnotationJobs::multiSetAnnotation( KIO::Slave* slave, const KUrl& url, const AnnotationList& annotations ) { - return new MultiSetAnnotationJob( slave, url, annotations, false /*showProgressInfo*/ ); + return new MultiSetAnnotationJob( slave, url, annotations ); } diff --git a/annotationjobs.h b/annotationjobs.h index 9395e33d8..a7536eca8 100644 --- a/annotationjobs.h +++ b/annotationjobs.h @@ -109,8 +109,7 @@ class GetAnnotationJob : public KIO::SimpleJob { Q_OBJECT public: - GetAnnotationJob( const KUrl& url, const QString& entry, const QByteArray &packedArgs, - bool showProgressInfo ); + GetAnnotationJob( const KUrl& url, const QString& entry, const QByteArray &packedArgs); const AnnotationList& annotations() const { return mAnnotations; } @@ -127,7 +126,7 @@ class MultiGetAnnotationJob : public KIO::Job Q_OBJECT public: - MultiGetAnnotationJob( KIO::Slave* slave, const KUrl& url, const QStringList& entries, bool showProgressInfo ); + MultiGetAnnotationJob( KIO::Slave* slave, const KUrl& url, const QStringList& entries); signals: // Emitted when a given annotation was found - or not found @@ -174,7 +173,7 @@ class MultiSetAnnotationJob : public KIO::Job Q_OBJECT public: - MultiSetAnnotationJob( KIO::Slave* slave, const KUrl& url, const AnnotationList& annotations, bool showProgressInfo ); + MultiSetAnnotationJob( KIO::Slave* slave, const KUrl& url, const AnnotationList& annotations); signals: // Emitted when a given annotation was successfully changed diff --git a/quotajobs.cpp b/quotajobs.cpp index 3e45306f8..8c1c408d9 100644 --- a/quotajobs.cpp +++ b/quotajobs.cpp @@ -31,7 +31,6 @@ #include "quotajobs.h" #include #include -#include using namespace KMail; @@ -42,18 +41,15 @@ QuotaJobs::GetQuotarootJob* QuotaJobs::getQuotaroot( QDataStream stream( &packedArgs, IO_WriteOnly ); stream << (int)'Q' << (int)'R' << url; - GetQuotarootJob* job = new GetQuotarootJob( url, packedArgs, false ); + GetQuotarootJob* job = new GetQuotarootJob( url, packedArgs); KIO::Scheduler::assignJobToSlave( slave, job ); return job; } QuotaJobs::GetQuotarootJob::GetQuotarootJob( const KUrl& url, - const QByteArray &packedArgs, - bool showProgressInfo ) + const QByteArray &packedArgs) : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs) { - if(showProgressInfo) - KIO::getJobTracker()->registerJob(this); connect( this, SIGNAL(infoMessage(KIO::Job*,const QString&)), SLOT(slotInfoMessage(KIO::Job*,const QString&)) ); } @@ -108,7 +104,7 @@ QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( KIO::Slave* slave, const KUrl stream << (int)'Q' << (int)'R' << url; QuotaJobs::GetQuotarootJob *job = - new QuotaJobs::GetQuotarootJob( url, packedArgs, false ); + new QuotaJobs::GetQuotarootJob( url, packedArgs); connect(job, SIGNAL(quotaInfoReceived(const QuotaInfoList&)), SLOT(slotQuotaInfoReceived(const QuotaInfoList&))); connect(job, SIGNAL(quotaRootResult(const QStringList&)), diff --git a/quotajobs.h b/quotajobs.h index d60ca2cec..c78b16a46 100644 --- a/quotajobs.h +++ b/quotajobs.h @@ -132,7 +132,7 @@ class GetQuotarootJob : public KIO::SimpleJob { Q_OBJECT public: - GetQuotarootJob( const KUrl& url, const QByteArray &packedArgs, bool showProgressInfo ); + GetQuotarootJob( const KUrl& url, const QByteArray &packedArgs); signals: /** Emitted when the server returns a (potentially empty) list of