From kde-commits Fri Sep 22 16:50:43 2006 From: Volker Krause Date: Fri, 22 Sep 2006 16:50:43 +0000 To: kde-commits Subject: KDE/kdepim/akonadi/libakonadi Message-Id: <1158943843.888158.20675.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=115894385814675 SVN commit 587416 by vkrause: Don't make doHandleResponse() pure virtual, we have too many classes not needing it. M +0 -5 collectioncreatejob.cpp M +0 -1 collectioncreatejob.h M +0 -7 collectiondeletejob.cpp M +0 -1 collectiondeletejob.h M +0 -7 collectionmodifyjob.cpp M +0 -1 collectionmodifyjob.h M +0 -5 collectionrenamejob.cpp M +0 -1 collectionrenamejob.h M +0 -6 expungejob.cpp M +0 -1 expungejob.h M +0 -6 itemdeletejob.cpp M +0 -1 itemdeletejob.h M +5 -0 job.cpp M +4 -4 job.h M +0 -6 jobqueue.cpp M +0 -1 jobqueue.h --- trunk/KDE/kdepim/akonadi/libakonadi/collectioncreatejob.cpp #587415:587416 @@ -50,11 +50,6 @@ writeData( command ); } -void PIM::CollectionCreateJob::doHandleResponse( const QByteArray & tag, const QByteArray & data ) -{ - qDebug() << "unhandled response in collection create job: " << tag << data; -} - QByteArray PIM::CollectionCreateJob::path( ) const { return d->path; --- trunk/KDE/kdepim/akonadi/libakonadi/collectioncreatejob.h #587415:587416 @@ -58,7 +58,6 @@ protected: virtual void doStart(); - virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data ); private: CollectionCreateJobPrivate *d; --- trunk/KDE/kdepim/akonadi/libakonadi/collectiondeletejob.cpp #587415:587416 @@ -43,11 +43,4 @@ writeData( newTag() + " DELETE \"" + d->path + "\"" ); } -void PIM::CollectionDeleteJob::doHandleResponse(const QByteArray & tag, const QByteArray & data) -{ - // the parent class does it all for us - Q_UNUSED( tag ); - Q_UNUSED( data ); -} - #include "collectiondeletejob.moc" --- trunk/KDE/kdepim/akonadi/libakonadi/collectiondeletejob.h #587415:587416 @@ -50,7 +50,6 @@ protected: virtual void doStart(); - virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data ); private: CollectionDeleteJobPrivate* const d; --- trunk/KDE/kdepim/akonadi/libakonadi/collectionmodifyjob.cpp #587415:587416 @@ -50,13 +50,6 @@ writeData( command ); } -void PIM::CollectionModifyJob::doHandleResponse(const QByteArray & tag, const QByteArray & data) -{ - // parent class does all we need - Q_UNUSED( tag ); - Q_UNUSED( data ); -} - void PIM::CollectionModifyJob::setContentTypes(const QList< QByteArray > & mimeTypes) { d->setMimeTypes = true; --- trunk/KDE/kdepim/akonadi/libakonadi/collectionmodifyjob.h #587415:587416 @@ -54,7 +54,6 @@ protected: virtual void doStart(); - virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data ); private: CollectionModifyJobPrivate* const d; --- trunk/KDE/kdepim/akonadi/libakonadi/collectionrenamejob.cpp #587415:587416 @@ -48,9 +48,4 @@ writeData( newTag() + " RENAME \"" + d->from + "\" \"" + d->to + '\"' ); } -void PIM::CollectionRenameJob::doHandleResponse( const QByteArray & tag, const QByteArray & data ) -{ - qDebug() << "Unhandled response in collection rename job: " << tag << data; -} - #include "collectionrenamejob.moc" --- trunk/KDE/kdepim/akonadi/libakonadi/collectionrenamejob.h #587415:587416 @@ -47,7 +47,6 @@ protected: virtual void doStart(); - virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data ); private: CollectionRenameJobPrivate *d; --- trunk/KDE/kdepim/akonadi/libakonadi/expungejob.cpp #587415:587416 @@ -35,10 +35,4 @@ writeData( newTag() + " EXPUNGE" ); } -void PIM::ExpungeJob::doHandleResponse(const QByteArray & tag, const QByteArray & data) -{ - Q_UNUSED( tag ); - Q_UNUSED( data ); -} - #include "expungejob.moc" --- trunk/KDE/kdepim/akonadi/libakonadi/expungejob.h #587415:587416 @@ -47,7 +47,6 @@ protected: virtual void doStart(); - virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data ); private: ExpungeJobPrivate *d; --- trunk/KDE/kdepim/akonadi/libakonadi/itemdeletejob.cpp #587415:587416 @@ -70,10 +70,4 @@ emit done( this ); } -void PIM::ItemDeleteJob::doHandleResponse(const QByteArray & tag, const QByteArray & data) -{ - Q_UNUSED( tag ); - Q_UNUSED( data ); -} - #include "itemdeletejob.moc" --- trunk/KDE/kdepim/akonadi/libakonadi/itemdeletejob.h #587415:587416 @@ -49,7 +49,6 @@ protected: virtual void doStart(); - virtual void doHandleResponse( const QByteArray& tag, const QByteArray &data ); private slots: void storeDone( PIM::Job* job ); --- trunk/KDE/kdepim/akonadi/libakonadi/job.cpp #587415:587416 @@ -334,4 +334,9 @@ connect( d->socket, SIGNAL(readyRead()), this, SLOT(slotDataReceived()) ); } +void PIM::Job::doHandleResponse(const QByteArray & tag, const QByteArray & data) +{ + qDebug() << "Unhandled response: " << tag << data; +} + #include "job.moc" --- trunk/KDE/kdepim/akonadi/libakonadi/job.h #587415:587416 @@ -248,13 +248,13 @@ virtual void doStart() = 0; /** - This method should be reimplemented in the concrete jobs. It will be called - on received data from the backend. + This method should be reimplemented in the concrete jobs in case you want + to handle incoming data. It will be called on received data from the backend. + The default implementation does nothing. @param tag The tag of the corresponding command, empty if this is an untagges response. @param data The received data. */ - virtual void doHandleResponse( const QByteArray &tag, - const QByteArray &data ) = 0; + virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data ); private: /** --- trunk/KDE/kdepim/akonadi/libakonadi/jobqueue.cpp #587415:587416 @@ -59,12 +59,6 @@ startNext(); } -void PIM::JobQueue::doHandleResponse( const QByteArray & tag, const QByteArray & data ) -{ - Q_UNUSED( tag ); - Q_UNUSED( data ); -} - void PIM::JobQueue::jobDone( PIM::Job * job ) { Q_UNUSED( job ); --- trunk/KDE/kdepim/akonadi/libakonadi/jobqueue.h #587415:587416 @@ -58,7 +58,6 @@ protected: virtual void doStart(); - virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data ); private: // part of the Job API, hide it for JobQueue