[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       Kevin Ottens <ervin () kde ! org>
Date:       2007-02-26 22:41:37
Message-ID: 1172529697.626396.1664.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 637575 by ervin:

Adapt to KIO::Observer death.


 M  +4 -3      konq_undo.cc  


--- trunk/KDE/kdebase/libkonq/konq_undo.cc #637574:637575
@@ -23,7 +23,6 @@
 #include "undomanageradaptor.h"
 #include "konq_operations.h"
 
-#include <kio/observer.h>
 #include <kio/job.h>
 #include <kio/jobuidelegate.h>
 #include <QtDBus/QtDBus>
@@ -76,6 +75,8 @@
     virtual ~KonqUndoJob() { KonqUndoManager::decRef(); }
 
     virtual void kill( bool ) { KonqUndoManager::self()->stopUndo( true ); \
KIO::Job::doKill(); } +
+    void emitFinished() { emit finished(this, progressId()); }
 };
 
 KonqCommandRecorder::KonqCommandRecorder( KonqUndoManager::CommandType op, const \
KUrl::List &src, const KUrl &dst, KIO::Job *job ) @@ -365,7 +366,7 @@
 
 void KonqUndoManager::slotResult( KJob *job )
 {
-    Observer::self()->jobFinished( d->m_undoJob->progressId() );
+    d->m_undoJob->emitFinished();
     d->m_currentJob = 0;
     if ( job->error() )
     {
@@ -539,7 +540,7 @@
         if ( d->m_undoJob )
         {
             kDebug(1203) << "KonqUndoManager::stepRemovingDirectories deleting \
                undojob" << endl;
-            Observer::self()->jobFinished( d->m_undoJob->progressId() );
+            d->m_undoJob->emitFinished();
             delete d->m_undoJob;
             d->m_undoJob = 0;
         }


[prev in list] [next in list] [prev in thread] [next in thread]