wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

showProgressInfo was always false

Browse Source 
=> simplify porting

svn path=/trunk/KDE/kdepim/; revision=652169
wilder-work
Laurent Montel 19 years ago
parent c46bdfdfae
commit 0241c9c49a
6 changed files with 25 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      acljobs.cpp
  2. 11
      acljobs.h
  3. 20
      annotationjobs.cpp
  4. 7
      annotationjobs.h
  5. 10
      quotajobs.cpp
  6. 2
      quotajobs.h

28
acljobs.cpp
Unescape View File

@ -34,7 +34,6 @@
#include "acljobs.h"
#include <kio/scheduler.h>
#include <kdebug.h>
#include <kuiserverjobtracker.h>
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"

11
acljobs.h
Unescape View File

@ -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.

20
annotationjobs.cpp
Unescape View File

@ -34,7 +34,6 @@
#include "annotationjobs.h"
#include <kio/scheduler.h>
#include <kdebug.h>
#include <kuiserverjobtracker.h>
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 );
}

7
annotationjobs.h
Unescape View File

@ -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

10
quotajobs.cpp
Unescape View File

@ -31,7 +31,6 @@
#include "quotajobs.h"
#include <kio/scheduler.h>
#include <kdebug.h>
#include <kuiserverjobtracker.h>
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&)),

2
quotajobs.h
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save