Index: kio/kio/progressbase.h
===================================================================
--- kio/kio/progressbase.h	(revisión: 622985)
+++ kio/kio/progressbase.h	(copia de trabajo)
@@ -163,14 +163,14 @@ public Q_SLOTS:
    * @param job the KIO::Job
    * @param files the number of files
    */
-  virtual void slotTotalFiles( KIO::Job* job, unsigned long files ) {
+  virtual void slotTotalFiles( KJob* job, unsigned long files ) {
     Q_UNUSED(job);Q_UNUSED(files);}
   /**
    * Called to set the total number of directories.
    * @param job the KIO::Job
    * @param dirs the number of directories
    */
-  virtual void slotTotalDirs( KIO::Job* job, unsigned long dirs ) {
+  virtual void slotTotalDirs( KJob* job, unsigned long dirs ) {
     Q_UNUSED(job);Q_UNUSED(dirs);}
 
   /**
@@ -200,7 +200,7 @@ public Q_SLOTS:
    * @param job the KIO::Job
    * @param speed the speed in bytes/second
    */
-  virtual void slotSpeed( KIO::Job* job, unsigned long speed ) {
+  virtual void slotSpeed( KJob* job, unsigned long speed ) {
     Q_UNUSED(job);Q_UNUSED(speed);}
 
   /**
Index: kio/kio/progressbase.cpp
===================================================================
--- kio/kio/progressbase.cpp	(revisión: 622985)
+++ kio/kio/progressbase.cpp	(copia de trabajo)
@@ -57,10 +57,10 @@ void ProgressBase::setJob( KIO::CopyJob 
   // first connect all slots
   connect( job, SIGNAL( totalSize( KJob*, qulonglong ) ),
 	   SLOT( slotTotalSize( KJob*, qulonglong ) ) );
-  connect( job, SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-	   SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-	   SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+  connect( job, SIGNAL( totalFiles( KJob*, unsigned long ) ),
+	   SLOT( slotTotalFiles( KJob*, unsigned long ) ) );
+  connect( job, SIGNAL( totalDirs( KJob*, unsigned long ) ),
+	   SLOT( slotTotalDirs( KJob*, unsigned long ) ) );
 
   connect( job, SIGNAL( processedSize( KJob*, qulonglong ) ),
 	   SLOT( slotProcessedSize( KJob*, qulonglong ) ) );
@@ -69,8 +69,8 @@ void ProgressBase::setJob( KIO::CopyJob 
   connect( job, SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
 	   SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
 
-  connect( job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
-	   SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+  connect( job, SIGNAL( speed( KJob*, unsigned long ) ),
+	   SLOT( slotSpeed( KJob*, unsigned long ) ) );
   connect( job, SIGNAL( percent( KJob*, unsigned long ) ),
 	   SLOT( slotPercent( KJob*, unsigned long ) ) );
 
@@ -98,10 +98,10 @@ void ProgressBase::setJob( KIO::DeleteJo
   // first connect all slots
   connect( job, SIGNAL( totalSize( KJob*, qulonglong ) ),
 	   SLOT( slotTotalSize( KJob*, qulonglong ) ) );
-  connect( job, SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-	   SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-	   SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+  connect( job, SIGNAL( totalFiles( KJob*, unsigned long ) ),
+	   SLOT( slotTotalFiles( KJob*, unsigned long ) ) );
+  connect( job, SIGNAL( totalDirs( KJob*, unsigned long ) ),
+	   SLOT( slotTotalDirs( KJob*, unsigned long ) ) );
 
   connect( job, SIGNAL( processedSize( KJob*, qulonglong ) ),
 	   SLOT( slotProcessedSize( KJob*, qulonglong ) ) );
@@ -110,8 +110,8 @@ void ProgressBase::setJob( KIO::DeleteJo
   connect( job, SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
 	   SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
 
-  connect( job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
-	   SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+  connect( job, SIGNAL( speed( KJob*, unsigned long ) ),
+	   SLOT( slotSpeed( KJob*, unsigned long ) ) );
   connect( job, SIGNAL( percent( KJob*, unsigned long ) ),
 	   SLOT( slotPercent( KJob*, unsigned long ) ) );
 
Index: kio/kio/jobuidelegate.cpp
===================================================================
--- kio/kio/jobuidelegate.cpp	(revisión: 622985)
+++ kio/kio/jobuidelegate.cpp	(copia de trabajo)
@@ -107,8 +107,8 @@ void KIO::JobUiDelegate::connectJob( KJo
                  Observer::self(), SLOT( slotTotalSize( KJob*, qulonglong ) ) );
         connect( job, SIGNAL( processedSize( KJob*, qulonglong ) ),
                  Observer::self(), SLOT( slotProcessedSize( KJob*, qulonglong ) ) );
-        connect( job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
-                 Observer::self(), SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+        connect( job, SIGNAL( speed( KJob*, unsigned long ) ),
+                 Observer::self(), SLOT( slotSpeed( KJob*, unsigned long ) ) );
 
         connect( job, SIGNAL( finished( KJob*, int ) ),
                  this, SLOT( slotFinished( KJob*, int ) ) );
Index: kio/kio/copyjob.h
===================================================================
--- kio/kio/copyjob.h	(revisión: 622985)
+++ kio/kio/copyjob.h	(copia de trabajo)
@@ -126,13 +126,13 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files the total number of files
 	 */
-        void totalFiles( KIO::Job *job, unsigned long files );
+        void totalFiles( KJob *job, unsigned long files );
         /**
 	 * Emitted when the toal number of direcotries is known.
 	 * @param job the job that emitted this signal
 	 * @param dirs the total number of directories
 	 */
-        void totalDirs( KIO::Job *job, unsigned long dirs );
+        void totalDirs( KJob *job, unsigned long dirs );
 
         /**
 	 * Emitted when it is known which files / directories are going
Index: kio/kio/defaultprogress.h
===================================================================
--- kio/kio/defaultprogress.h	(revisión: 622985)
+++ kio/kio/defaultprogress.h	(copia de trabajo)
@@ -63,14 +63,14 @@ public:
 
 public Q_SLOTS:
   virtual void slotTotalSize( KJob* job, qulonglong size );
-  virtual void slotTotalFiles( KIO::Job* job, unsigned long files );
-  virtual void slotTotalDirs( KIO::Job* job, unsigned long dirs );
+  virtual void slotTotalFiles( KJob* job, unsigned long files );
+  virtual void slotTotalDirs( KJob* job, unsigned long dirs );
 
   virtual void slotProcessedSize( KJob* job, qulonglong bytes );
   virtual void slotProcessedFiles( KIO::Job* job, unsigned long files );
   virtual void slotProcessedDirs( KIO::Job* job, unsigned long dirs );
 
-  virtual void slotSpeed( KIO::Job* job, unsigned long speed );
+  virtual void slotSpeed( KJob* job, unsigned long speed );
   virtual void slotPercent( KJob* job, unsigned long percent );
   /**
    * Called to set an information message.
Index: kio/kio/deletejob.h
===================================================================
--- kio/kio/deletejob.h	(revisión: 622985)
+++ kio/kio/deletejob.h	(copia de trabajo)
@@ -67,13 +67,13 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files the total number of files
 	 */
-        void totalFiles( KIO::Job *job, unsigned long files );
+        void totalFiles( KJob *job, unsigned long files );
         /**
 	 * Emitted when the toal number of direcotries is known.
 	 * @param job the job that emitted this signal
 	 * @param dirs the total number of directories
 	 */
-        void totalDirs( KIO::Job *job, unsigned long dirs );
+        void totalDirs( KJob *job, unsigned long dirs );
 
         /**
 	 * Sends the number of processed files.
Index: kio/kio/kdirlister.h
===================================================================
--- kio/kio/kdirlister.h	(revisión: 622985)
+++ kio/kio/kdirlister.h	(copia de trabajo)
@@ -608,7 +608,7 @@ private Q_SLOTS:
   void slotPercent( KJob *, unsigned long );
   void slotTotalSize( KJob *, qulonglong );
   void slotProcessedSize( KJob *, qulonglong );
-  void slotSpeed( KIO::Job *, unsigned long );
+  void slotSpeed( KJob *, unsigned long );
 
 private:
   void jobStarted( KIO::ListJob * );
Index: kio/kio/jobclasses.h
===================================================================
--- kio/kio/jobclasses.h	(revisión: 622985)
+++ kio/kio/jobclasses.h	(copia de trabajo)
@@ -259,7 +259,7 @@ public:
 	 * @param job the job that emitted this signal
 	 * @param speed the speed in bytes/s
          */
-        void speed( KIO::Job *job, unsigned long speed );
+        void speed( KJob *job, unsigned long speed );
 
     protected Q_SLOTS:
         /**
@@ -268,7 +268,7 @@ public:
 	 * @param speed the speed in bytes/s
 	 * @see speed()
          */
-        void slotSpeed( KIO::Job *job, unsigned long speed );
+        void slotSpeed( KJob *job, unsigned long speed );
 
         /**
          * Remove speed information.
Index: kio/kio/statusbarprogress.cpp
===================================================================
--- kio/kio/statusbarprogress.cpp	(revisión: 622985)
+++ kio/kio/statusbarprogress.cpp	(copia de trabajo)
@@ -130,7 +130,7 @@ void StatusbarProgress::slotPercent( KJo
 }
 
 
-void StatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) {
+void StatusbarProgress::slotSpeed( KJob*, unsigned long speed ) {
   if ( speed == 0 ) { // spped is measured in bytes-per-second
     m_pLabel->setText( i18n( " Stalled ") );
   } else {
Index: kio/kio/job.cpp
===================================================================
--- kio/kio/job.cpp	(revisión: 622985)
+++ kio/kio/job.cpp	(copia de trabajo)
@@ -123,8 +123,8 @@ void Job::addSubjob(Job *job, bool inher
     KCompositeJob::addSubjob( job );
 
     // Forward information from that subjob.
-    connect( job, SIGNAL(speed( KIO::Job*, unsigned long )),
-             SLOT(slotSpeed(KIO::Job*, unsigned long)) );
+    connect( job, SIGNAL(speed( KJob*, unsigned long )),
+             SLOT(slotSpeed(KJob*, unsigned long)) );
 
     if (inheritMetaData)
        job->mergeMetaData(m_outgoingMetaData);
@@ -206,7 +206,7 @@ bool Job::isSuspended() const
   return d->m_suspended;
 }
 
-void Job::slotSpeed( KIO::Job*, unsigned long speed )
+void Job::slotSpeed( KJob*, unsigned long speed )
 {
   //kDebug(7007) << "Job::slotSpeed " << speed << endl;
   emitSpeed( speed );
Index: kio/kio/forwardingslavebase.h
===================================================================
--- kio/kio/forwardingslavebase.h	(revisión: 622985)
+++ kio/kio/forwardingslavebase.h	(copia de trabajo)
@@ -180,7 +180,7 @@ private Q_SLOTS:
     void slotInfoMessage(KJob *job, const QString &msg);
     void slotTotalSize(KJob *job, qulonglong size);
     void slotProcessedSize(KJob *job, qulonglong size);
-    void slotSpeed(KIO::Job *job, unsigned long bytesPerSecond);
+    void slotSpeed(KJob *job, unsigned long bytesPerSecond);
 
     // KIO::SimpleJob subclasses
     void slotRedirection(KIO::Job *job, const KUrl &url);
Index: kio/kio/kdirlister.cpp
===================================================================
--- kio/kio/kdirlister.cpp	(revisión: 622985)
+++ kio/kio/kdirlister.cpp	(copia de trabajo)
@@ -2380,7 +2380,7 @@ void KDirLister::slotProcessedSize( KJob
   emit processedSize( result );
 }
 
-void KDirLister::slotSpeed( KIO::Job *job, unsigned long spd )
+void KDirLister::slotSpeed( KJob *job, unsigned long spd )
 {
   d->jobData[static_cast<KIO::ListJob *>(job)].speed = spd;
 
@@ -2427,8 +2427,8 @@ void KDirLister::connectJob( KIO::ListJo
            this, SLOT(slotTotalSize( KJob *, qulonglong )) );
   connect( job, SIGNAL(processedSize( KJob *, qulonglong )),
            this, SLOT(slotProcessedSize( KJob *, qulonglong )) );
-  connect( job, SIGNAL(speed( KIO::Job *, unsigned long )),
-           this, SLOT(slotSpeed( KIO::Job *, unsigned long )) );
+  connect( job, SIGNAL(speed( KJob *, unsigned long )),
+           this, SLOT(slotSpeed( KJob *, unsigned long )) );
 }
 
 void KDirLister::setMainWindow( QWidget *window )
Index: kio/kio/copyjob.cpp
===================================================================
--- kio/kio/copyjob.cpp	(revisión: 622985)
+++ kio/kio/copyjob.cpp	(copia de trabajo)
@@ -90,11 +90,11 @@ CopyJob::CopyJob( const KUrl::List& src,
     d->m_globalDestinationState = destinationState;
 
     if ( showProgressInfo ) {
-        connect( this, SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-                 Observer::self(), SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+        connect( this, SIGNAL( totalFiles( KJob*, unsigned long ) ),
+                 Observer::self(), SLOT( slotTotalFiles( KJob*, unsigned long ) ) );
 
-        connect( this, SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-                 Observer::self(), SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+        connect( this, SIGNAL( totalDirs( KJob*, unsigned long ) ),
+                 Observer::self(), SLOT( slotTotalDirs( KJob*, unsigned long ) ) );
     }
     QTimer::singleShot(0, this, SLOT(slotStart()));
     /**
Index: kio/kio/defaultprogress.cpp
===================================================================
--- kio/kio/defaultprogress.cpp	(revisión: 622985)
+++ kio/kio/defaultprogress.cpp	(copia de trabajo)
@@ -205,7 +205,7 @@ void DefaultProgress::slotTotalSize( KJo
 }
 
 
-void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files )
+void DefaultProgress::slotTotalFiles( KJob*, unsigned long files )
 {
   if ( m_iTotalFiles == files )
       return;
@@ -214,7 +214,7 @@ void DefaultProgress::slotTotalFiles( KI
 }
 
 
-void DefaultProgress::slotTotalDirs( KIO::Job*, unsigned long dirs )
+void DefaultProgress::slotTotalDirs( KJob*, unsigned long dirs )
 {
   if ( m_iTotalDirs == dirs )
       return;
@@ -327,7 +327,7 @@ void DefaultProgress::slotProcessedFiles
 }
 
 
-void DefaultProgress::slotSpeed( KIO::Job*, unsigned long speed )
+void DefaultProgress::slotSpeed( KJob*, unsigned long speed )
 {
   if ( speed == 0 ) {
     speedLabel->setText( i18n( "Stalled") );
Index: kio/kio/deletejob.cpp
===================================================================
--- kio/kio/deletejob.cpp	(revisión: 622985)
+++ kio/kio/deletejob.cpp	(copia de trabajo)
@@ -49,11 +49,11 @@ DeleteJob::DeleteJob( const KUrl::List& 
 {
   if ( showProgressInfo ) {
 
-     connect( this, SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-              Observer::self(), SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+     connect( this, SIGNAL( totalFiles( KJob*, unsigned long ) ),
+              Observer::self(), SLOT( slotTotalFiles( KJob*, unsigned long ) ) );
 
-     connect( this, SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-              Observer::self(), SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+     connect( this, SIGNAL( totalDirs( KJob*, unsigned long ) ),
+              Observer::self(), SLOT( slotTotalDirs( KJob*, unsigned long ) ) );
 
      // See slotReport
      /*connect( this, SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
Index: kio/kio/statusbarprogress.h
===================================================================
--- kio/kio/statusbarprogress.h	(revisión: 622985)
+++ kio/kio/statusbarprogress.h	(copia de trabajo)
@@ -82,7 +82,7 @@ public Q_SLOTS:
   virtual void slotClean();
   virtual void slotTotalSize( KJob* job, qulonglong size );
   virtual void slotPercent( KJob* job, unsigned long percent );
-  virtual void slotSpeed( KIO::Job* job, unsigned long speed );
+  virtual void slotSpeed( KJob* job, unsigned long speed );
 
 protected:
   QProgressBar* m_pProgressBar;
Index: kio/kio/forwardingslavebase.cpp
===================================================================
--- kio/kio/forwardingslavebase.cpp	(revisión: 622985)
+++ kio/kio/forwardingslavebase.cpp	(copia de trabajo)
@@ -313,8 +313,8 @@ void ForwardingSlaveBase::connectJob(KIO
              this, SLOT( slotTotalSize(KJob *, qulonglong) ) );
     connect( job, SIGNAL( processedSize(KJob *, qulonglong) ),
              this, SLOT( slotProcessedSize(KJob *, qulonglong) ) );
-    connect( job, SIGNAL( speed(KIO::Job *, unsigned long) ),
-             this, SLOT( slotSpeed(KIO::Job *, unsigned long) ) );
+    connect( job, SIGNAL( speed(KJob *, unsigned long) ),
+             this, SLOT( slotSpeed(KJob *, unsigned long) ) );
 }
 
 void ForwardingSlaveBase::connectSimpleJob(KIO::SimpleJob *job)
@@ -387,7 +387,7 @@ void ForwardingSlaveBase::slotProcessedS
     processedSize(size);
 }
 
-void ForwardingSlaveBase::slotSpeed(KIO::Job* /*job*/, unsigned long bytesPerSecond)
+void ForwardingSlaveBase::slotSpeed(KJob* /*job*/, unsigned long bytesPerSecond)
 {
     speed(bytesPerSecond);
 }
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(revisión: 622985)
+++ khtml/khtml_part.cpp	(copia de trabajo)
@@ -790,8 +790,8 @@ bool KHTMLPart::openUrl( const KUrl &url
   d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
 
 
-  connect( d->m_job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
-           this, SLOT( slotJobSpeed( KIO::Job*, unsigned long ) ) );
+  connect( d->m_job, SIGNAL( speed( KJob*, unsigned long ) ),
+           this, SLOT( slotJobSpeed( KJob*, unsigned long ) ) );
 
   connect( d->m_job, SIGNAL( percent( KJob*, unsigned long ) ),
            this, SLOT( slotJobPercent( KJob*, unsigned long ) ) );
