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

List:       kde-commits
Subject:    KDE/kdebase
From:       Thiago Macieira <thiago () kde ! org>
Date:       2007-07-26 21:32:27
Message-ID: 1185485547.751070.18974.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 693038 by thiago:

Call the front-end function, not the backend virtual doKill

 M  +2 -2      apps/dolphin/src/viewpropsprogressinfo.cpp  
 M  +2 -2      apps/keditbookmarks/testlink.cpp  
 M  +2 -2      apps/lib/konq/konq_filetip.cc  
 M  +1 -1      apps/lib/konq/konq_undo.cc  
 M  +1 -1      runtime/kdeprint/slave/kio_print.cpp  


--- trunk/KDE/kdebase/apps/dolphin/src/viewpropsprogressinfo.cpp #693037:693038
@@ -135,11 +135,11 @@
 void ViewPropsProgressInfo::cancelApplying()
 {
     if (m_dirSizeJob != 0) {
-        m_dirSizeJob->doKill();
+        m_dirSizeJob->kill();
     }
 
     if (m_applyViewPropsJob != 0) {
-        m_applyViewPropsJob->doKill();
+        m_applyViewPropsJob->kill();
     }
 }
 
--- trunk/KDE/kdebase/apps/keditbookmarks/testlink.cpp #693037:693038
@@ -80,7 +80,7 @@
     if (m_job) {
         // kDebug() << "JOB kill\n";
         m_job->disconnect();
-        m_job->doKill();
+        m_job->kill();
     }
 }
 
@@ -135,7 +135,7 @@
         }
     }
 
-    transfer->doKill();
+    transfer->kill();
 }
 
 void TestLinkItr::slotJobResult(KJob *job) {
--- trunk/KDE/kdebase/apps/lib/konq/konq_filetip.cc #693037:693038
@@ -76,7 +76,7 @@
 KonqFileTip::~KonqFileTip()
 {
    if ( m_previewJob ) {
-        m_previewJob->doKill();
+        m_previewJob->kill();
         m_previewJob = 0;
     }
 }
@@ -104,7 +104,7 @@
     if (!m_on) return;
 
     if ( m_previewJob ) {
-        m_previewJob->doKill();
+        m_previewJob->kill();
         m_previewJob = 0;
     }
 
--- trunk/KDE/kdebase/apps/lib/konq/konq_undo.cc #693037:693038
@@ -357,7 +357,7 @@
     d->m_undoJob = 0;
 
     if ( d->m_currentJob )
-        d->m_currentJob->doKill();
+        d->m_currentJob->kill();
 
     d->m_currentJob = 0;
 
--- trunk/KDE/kdebase/runtime/kdeprint/slave/kio_print.cpp #693037:693038
@@ -516,7 +516,7 @@
 		{
 			m_httpError = KIO::ERR_INTERNAL;
 			m_httpErrorTxt = "Unable to write to the internal buffer.";
-			j->doKill();
+			j->kill();
 		}
 	}
 }
[prev in list] [next in list] [prev in thread] [next in thread]