[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Sharan Rao]

SVN commit 693192 by sharan:

removed unnecessary statements and replaced some deprecated ones.
first steps towards a warning free compilation :)


 M  +3 -4      umldoc.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #693191:693192
@@ -277,7 +277,7 @@
         m_bLoading = m_bLoading_old;
         // Remove all objects from the predefined folders.
         // @fixme With advanced code generation enabled, this crashes.
-        UMLObject *obj;
+
         for (int i = 0; i < Uml::N_MODELTYPES; i++)
             m_root[i]->removeAllObjects();
         // Restore the datatype folder, it has been deleted above.
@@ -615,9 +615,8 @@
                                              );
         } else {
             // now remove the original file
-            if ( KIO::
-                    NetAccess::
-                    file_move( tmpfile.fileName(), d.path(), -1, true ) == false ) {
+            KIO::FileCopyJob* fcj = KIO::file_move( tmpfile.fileName(), d.path(), -1, true,true );
+            if ( KIO::NetAccess::synchronousRun( fcj, (QWidget*)UMLApp::app() ) == false ) {
                 KMessageBox::error(0, i18n("There was a problem saving file: %1", d.path()), i18n("Save Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 return false;