Mercurial Repositories > eric / file diff

--- a/ViewManager/ViewManager.py	Fri Sep 03 10:05:50 2010 +0200
+++ b/ViewManager/ViewManager.py	Fri Sep 03 10:21:47 2010 +0200
@@ -3008,9 +3008,9 @@
                         QMessageBox.Save),
                     QMessageBox.Save)
             if res == QMessageBox.Save:
-                ok, newName = editor.saveFile()
+                ok = editor.saveFile()
                 if ok:
-                    self.setEditorName(editor, newName)
+                    self.setEditorName(editor, editor.getFileName())
                 return ok
             elif res == QMessageBox.Abort:
                 return False
@@ -3441,7 +3441,7 @@
         if not editor.isModified():
             return True
         else:
-            ok = editor.saveFile()[0]
+            ok = editor.saveFile()
             return ok
         
     def saveEditorEd(self, ed):
@@ -3455,9 +3455,9 @@
             if not ed.isModified():
                 return True
             else:
-                ok, newName = ed.saveFile()
+                ok = ed.saveFile()
                 if ok:
-                    self.setEditorName(ed, newName)
+                    self.setEditorName(ed, ed.getFileName())
                 return ok
         else:
             return False
@@ -3496,18 +3496,18 @@
         @param editors list of editors to be saved
         """
         for editor in editors:
-            ok, newName = editor.saveFile()
+            ok = editor.saveFile()
             if ok:
-                self.setEditorName(editor, newName)
+                self.setEditorName(editor, editor.getFileName())
         
     def saveAllEditors(self):
         """
         Public slot to save the contents of all editors.
         """
         for editor in self.editors:
-            ok, newName = editor.saveFile()
+            ok = editor.saveFile()
             if ok:
-                self.setEditorName(editor, newName)
+                self.setEditorName(editor, editor.getFileName())
         
         # restart autosave timer
         if self.autosaveInterval > 0:
@@ -4638,9 +4638,9 @@
         """
         for editor in self.editors:
             if editor.shouldAutosave():
-                ok, newName = editor.saveFile()
+                ok = editor.saveFile()
                 if ok:
-                    self.setEditorName(editor, newName)
+                    self.setEditorName(editor, editor.getFileName())
         
         # restart autosave timer
         if self.autosaveInterval > 0: