diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 4e6cb540639..bba693e18e7 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -278,7 +278,7 @@ public:
 
     QToolBar *toolBar() { return m_toolBar; }
 
-    bool temporaryEditor() const { return false; }
+    bool isTemporary() const { return false; }
 
 signals:
     void changed();
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 364098b63bb..e6615a14c3d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1014,7 +1014,7 @@ void EditorManager::addEditor(IEditor *editor, bool isDuplicate)
     m_d->m_editorModel->addEditor(editor, isDuplicate);
     if (!isDuplicate) {
         m_d->m_core->fileManager()->addFile(editor->file());
-        if (!editor->temporaryEditor()) {
+        if (!editor->isTemporary()) {
             m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
         }
     }
@@ -1281,7 +1281,7 @@ bool EditorManager::saveFile(IEditor *editor)
         m_d->m_core->fileManager()->unblockFileChange(file);
     }
 
-    if (success && !editor->temporaryEditor())
+    if (success && !editor->isTemporary())
         m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
 
     return success;
@@ -1376,7 +1376,7 @@ bool EditorManager::saveFileAs(IEditor *editor)
     m_d->m_core->fileManager()->unblockFileChange(editor->file());
     editor->file()->checkPermissions();
 
-    if (success && !editor->temporaryEditor())
+    if (success && !editor->isTemporary())
         m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
 
     updateActions();
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index df6abdeca64..858fbed422f 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -63,7 +63,7 @@ public:
     virtual int currentLine() const { return 0; }
     virtual int currentColumn() const { return 0; }
 
-    virtual bool temporaryEditor() const = 0;
+    virtual bool isTemporary() const = 0;
 
     virtual QToolBar *toolBar() = 0;
 
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 3520bd0cd88..36d6000dcd5 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -897,6 +897,7 @@ bool MainWindow::showOptionsDialog(const QString &category,
 
 void MainWindow::saveAll()
 {
+    bool success;
     m_fileManager->saveModifiedFiles(m_fileManager->modifiedFiles());
     emit m_coreImpl->saveSettingsRequested();
 }
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index cea426aaa5b..e8dd9b416d4 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -69,7 +69,7 @@ public:
     Core::IEditor *duplicate(QWidget *parent);
     const char *kind() const;
 
-    bool temporaryEditor() const { return false; }
+    bool isTemporary() const { return false; }
 
 private:
     QList<int> m_context;
diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h
index 950c2b53417..ec9daf1772b 100644
--- a/src/plugins/designer/formwindoweditor.h
+++ b/src/plugins/designer/formwindoweditor.h
@@ -79,7 +79,7 @@ public:
     QToolBar *toolBar();
     QByteArray saveState() const;
     bool restoreState(const QByteArray &state);
-    virtual bool temporaryEditor() const { return false; }
+    virtual bool isTemporary() const { return false; }
 
     // ContextInterface
     virtual QList<int> context() const;
diff --git a/src/plugins/duieditor/duieditor.h b/src/plugins/duieditor/duieditor.h
index 325329dd849..1b5ef03df26 100644
--- a/src/plugins/duieditor/duieditor.h
+++ b/src/plugins/duieditor/duieditor.h
@@ -63,7 +63,7 @@ public:
 	bool duplicateSupported() const { return true; }
 	Core::IEditor *duplicate(QWidget *parent);
 	const char *kind() const;
-	bool temporaryEditor() const { return false; }
+        bool isTemporary() const { return false; }
 
 private:
 	QList<int> m_context;
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
index 184e47e7125..acfabcfb0b8 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
@@ -80,7 +80,7 @@ public:
     virtual bool duplicateSupported() const;
     virtual Core::IEditor *duplicate(QWidget *parent);
 
-    virtual bool temporaryEditor() const { return false; }
+    virtual bool isTemporary() const { return false; }
 
 private:
     QList<int> m_context;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h b/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h
index 61949467162..fe1686e540d 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h
@@ -79,7 +79,7 @@ public:
 
     virtual bool duplicateSupported() const;
     virtual Core::IEditor *duplicate(QWidget *parent);
-    virtual bool temporaryEditor() const { return false; }
+    virtual bool isTemporary() const { return false; }
 
 private:
     QList<int> m_context;
diff --git a/src/plugins/qt4projectmanager/profileeditor.h b/src/plugins/qt4projectmanager/profileeditor.h
index 8b75f3d2694..84ce85320e5 100644
--- a/src/plugins/qt4projectmanager/profileeditor.h
+++ b/src/plugins/qt4projectmanager/profileeditor.h
@@ -60,7 +60,7 @@ public:
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate(QWidget *parent);
     const char *kind() const;
-    bool temporaryEditor() const { return false; }
+    bool isTemporary() const { return false; }
 private:
     QList<int> m_context;
 };
diff --git a/src/plugins/qtscripteditor/qtscripteditor.h b/src/plugins/qtscripteditor/qtscripteditor.h
index 727b3f18302..359501d2e57 100644
--- a/src/plugins/qtscripteditor/qtscripteditor.h
+++ b/src/plugins/qtscripteditor/qtscripteditor.h
@@ -58,7 +58,7 @@ public:
     Core::IEditor *duplicate(QWidget *parent);
     const char *kind() const;
 
-    bool temporaryEditor() const { return false; }
+    bool isTemporary() const { return false; }
 
 private:
     QList<int> m_context;
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 089c1ccedcf..e213c9307c1 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -105,7 +105,7 @@ public:
     QWidget *widget();
 
     void setSuggestedFileName(const QString &fileName);
-    bool temporaryEditor() const { return false; }
+    bool isTemporary() const { return false; }
 
 private slots:
     void dirtyChanged(bool);
diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h
index 630c487eaee..7b18ce7712b 100644
--- a/src/plugins/texteditor/plaintexteditor.h
+++ b/src/plugins/texteditor/plaintexteditor.h
@@ -47,7 +47,7 @@ public:
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate(QWidget *parent);
     const char *kind() const;
-    bool temporaryEditor() const { return false; }
+    bool isTemporary() const { return false; }
 private:
     QList<int> m_context;
 };
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index ad2112187f8..9a84718af9c 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -75,7 +75,7 @@ public:
     Core::IEditor *duplicate(QWidget * /*parent*/) { return 0; }
     const char *kind() const { return m_kind; }
 
-    bool temporaryEditor() const { return true; }
+    bool isTemporary() const { return true; }
 
 private:
     const char *m_kind;
@@ -106,7 +106,7 @@ public:
     virtual QToolBar *toolBar()                { return m_toolBar; }
     QComboBox *diffFileBrowseComboBox() const  { return m_diffFileBrowseComboBox; }
 
-    bool temporaryEditor() const { return true; }
+    bool isTemporary() const { return true; }
 
 private:
     QComboBox *m_diffFileBrowseComboBox;
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index f949177aade..e4b9a1ad359 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -159,7 +159,7 @@ public:
     // be restricted to them
     static QStringList currentProjectFiles(bool nativeSeparators, QString *name = 0);
 
-    virtual bool temporaryEditor() const { return true; }
+    virtual bool isTemporary() const { return true; }
 
     // Helper to raise an already open submit editor to prevent opening twice.
     static bool raiseSubmitEditor();