Merge remote-tracking branch 'origin/3.4'

1 files changed, 1 insertions, 3 deletions

diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 7ee205f792..17b8f88457 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -122,11 +122,10 @@ public slots:
                            const QString &defaultLocation = QString(),
                            const QVariantMap &extraVariables = QVariantMap());
 
-    bool showOptionsDialog(Id category = Id(), Id page = Id(), QWidget *parent = 0);
+    bool showOptionsDialog(Id page = Id(), QWidget *parent = 0);
 
     bool showWarningWithOptions(const QString &title, const QString &text,
                                 const QString &details = QString(),
-                                Id settingsCategory = Id(),
                                 Id settingsId = Id(),
                                 QWidget *parent = 0);
 
@@ -136,7 +135,6 @@ protected:
 private slots:
     void openFile();
     void aboutToShowRecentFiles();
-    void openRecentFile();
     void setFocusToEditor();
     void saveAll();
     void aboutQtCreator();