[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/libkonq
From: Laurent Montel <montel () kde ! org>
Date: 2007-04-10 8:27:28
Message-ID: 1176193648.602359.25453.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 652150 by mlaurent:
Fix porting
M +6 -3 konq_operations.cc
M +2 -1 konq_undo.cc
--- trunk/KDE/kdebase/libkonq/konq_operations.cc #652149:652150
@@ -40,7 +40,7 @@
#include <kio/paste.h>
#include <kio/renamedialog.h>
#include <kdirnotify.h>
-
+#include <kuiserverjobtracker.h>
// For doDrop
#include <kauthorized.h>
#include <kglobal.h>
@@ -759,11 +759,14 @@
////
-KonqMultiRestoreJob::KonqMultiRestoreJob( const KUrl::List& urls, bool /*showProgressInfo*/ )
- : KIO::Job( /*showProgressInfo*/ ),
+KonqMultiRestoreJob::KonqMultiRestoreJob( const KUrl::List& urls, bool showProgressInfo )
+ : KIO::Job( ),
m_urls( urls ), m_urlsIterator( m_urls.begin() ),
m_progress( 0 )
{
+ if(showProgressInfo)
+ KIO::getJobTracker()->registerJob(this);
+
QTimer::singleShot(0, this, SLOT(slotStart()));
}
--- trunk/KDE/kdebase/libkonq/konq_undo.cc #652149:652150
@@ -33,6 +33,7 @@
#include <kconfig.h>
#include <kmessagebox.h>
#include <kglobal.h>
+#include <kuiserverjobtracker.h>
#include <QDateTime>
@@ -71,7 +72,7 @@
class KonqUndoJob : public KIO::Job
{
public:
- KonqUndoJob() : KIO::Job( ) { KonqUndoManager::incRef(); }
+ KonqUndoJob() : KIO::Job( ) { KIO::getJobTracker()->registerJob(this); KonqUndoManager::incRef(); }
virtual ~KonqUndoJob() { KonqUndoManager::decRef(); }
virtual void kill( bool ) { KonqUndoManager::self()->stopUndo( true ); KIO::Job::doKill(); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic