[Uml-devel] KDE/kdesdk

[Rafael Fernández López]

SVN commit 624264 by ereslibre:

Fix signal/slots moved from KIO::Job* to KJob*


 M  +1 -0      cervisia/settingsdlg.cpp  
 M  +2 -2      umbrello/umbrello/docgenerators/xhtmlgenerator.cpp  
 M  +3 -1      umbrello/umbrello/docgenerators/xhtmlgenerator.h  


--- trunk/KDE/kdesdk/cervisia/settingsdlg.cpp #624263:624264
@@ -44,6 +44,7 @@
 #include <knuminput.h>
 #include <kurlrequester.h>
 #include <kinstance.h>
+#include <kvbox.h>
 #include "misc.h"
 #include "cervisiasettings.h"
 #include "settingsdlg_advanced.h"
--- trunk/KDE/kdesdk/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp #624263:624264
@@ -156,7 +156,7 @@
   kDebug() << "Copying HTML result to: " << xhtmlUrl << endl;
   KIO::Job* job = KIO::file_copy(tmpXhtml.fileName(),xhtmlUrl,-1,true,false,false);
   job->ui()->setAutoErrorHandlingEnabled(true);
-  connect (job, SIGNAL(result( KIO::Job* )), this, SLOT(slotHtmlCopyFinished( KIO::Job* )));
+  connect (job, SIGNAL(result( KJob* )), this, SLOT(slotHtmlCopyFinished( KJob* )));
 
   QString cssFileName(KGlobal::dirs()->findResource("appdata","xmi.css"));
   kDebug() << "CSS file is'"<<cssFileName<<"'" << endl;
@@ -166,7 +166,7 @@
   cssJob->ui()->setAutoErrorHandlingEnabled(true);
 }
     
-void XhtmlGenerator::slotHtmlCopyFinished( KIO::Job* )
+void XhtmlGenerator::slotHtmlCopyFinished( KJob* )
 {
   kDebug() << "HTML copy finished: emiting finished" << endl;
   emit(finished());
--- trunk/KDE/kdesdk/umbrello/umbrello/docgenerators/xhtmlgenerator.h #624263:624264
@@ -22,6 +22,8 @@
 #include <ktempdir.h>
 #include <qobject.h>
 
+class KJob;
+
 namespace KIO
 {
   class Job;
@@ -90,7 +92,7 @@
     /** Triggered when the copying of the HTML result file is finished. Emits
      * the signal finished(). 
      */
-    void slotHtmlCopyFinished( KIO::Job* );
+    void slotHtmlCopyFinished( KJob* );
 
   private: