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

List:       kde-commits
Subject:    KDE/kdegames/kpat
From:       Parker Coates <parker.coates () kdemail ! net>
Date:       2012-02-15 4:45:43
Message-ID: 20120215044543.AED53AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1280180 by coates:

Clean up MainWindow::saveGame().

 M  +16 -15    mainwindow.cpp  


--- trunk/KDE/kdegames/kpat/mainwindow.cpp #1280179:1280180
@@ -937,42 +937,43 @@
     if ( url.isEmpty() )
         return;
 
-    KMimeType::Ptr mimeType = dialog.currentFilterMimeType();
-
+    QFile localFile;
+    KTemporaryFile tempFile;
     if ( url.isLocalFile() )
     {
-        QFile file( url.toLocalFile() );
-        if ( !file.open( QFile::WriteOnly ) )
+        localFile.setFileName( url.toLocalFile() );
+        if ( !localFile.open( QFile::WriteOnly ) )
         {
             KMessageBox::error( this, i18n("Error opening file for writing. Saving failed.") );
             return;
         }
-
-        if ( mimeType->is( legacySaveFileMimeType ) )
-            m_dealer->saveLegacyFile( &file );
-        else
-            m_dealer->saveFile( &file );
     }
     else
     {
-        KTemporaryFile tempFile;
         if ( !tempFile.open() )
         {
             KMessageBox::error( this, i18n("Unable to create temporary file. Saving failed.") );
             return;
         }
+    }
+    QFile & file = url.isLocalFile() ? localFile : tempFile;
 
-        if ( mimeType->is( legacySaveFileMimeType ) )
-            m_dealer->saveLegacyFile( &tempFile );
+    if ( dialog.currentFilterMimeType()->is( legacySaveFileMimeType ) )
+    {
+        m_dealer->saveLegacyFile( &file );
+    }
         else
-            m_dealer->saveFile( &tempFile );
+    {
+        m_dealer->saveFile( &file );
+    }
 
-        if ( !KIO::NetAccess::upload( tempFile.fileName(), url, this ) )
+    file.close();
+
+    if ( !url.isLocalFile() && !KIO::NetAccess::upload( file.fileName(), url, this ) )
         {
             KMessageBox::error( this, i18n("Error uploading file. Saving failed.") );
             return;
         }
-    }
 
     m_recentFilesAction->addUrl( url );
 }
[prev in list] [next in list] [prev in thread] [next in thread]