diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 9e7dbbdba359ccfa0129baa3925f68b076b9e24f..414fc8ca027fb27eba73a74091d2a3a9294f5c37 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -1368,11 +1368,6 @@ void DocumentManager::executeOpenWithMenuAction(QAction *action) EditorManager::openExternalEditor(entry.fileName, entry.externalEditor->id()); } -void DocumentManager::slotExecuteOpenWithMenuAction(QAction *action) -{ - executeOpenWithMenuAction(action); -} - bool DocumentManager::eventFilter(QObject *obj, QEvent *e) { if (obj == qApp && e->type() == QEvent::ApplicationActivate) { diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h index 70168a2b23176d15e07e71f4525abd679cd34e90..ef54a55cfcece116a1552e12dd0cdd2dc4d6edb4 100644 --- a/src/plugins/coreplugin/documentmanager.h +++ b/src/plugins/coreplugin/documentmanager.h @@ -126,10 +126,8 @@ public: lead to any editors to reload or any other editor manager actions. */ static void notifyFilesChangedInternally(const QStringList &files); - static void executeOpenWithMenuAction(QAction *action); - public slots: - void slotExecuteOpenWithMenuAction(QAction *action); + static void executeOpenWithMenuAction(QAction *action); signals: void currentFileChanged(const QString &filePath); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 3b373d128fe6fc0a9986c9dfeb28a6f37a049ae0..0f95462d54217e1af8ba52f13ad4ac73142a8fe8 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -541,7 +541,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er d->m_openWithMenu->setTitle(tr("Open With")); connect(d->m_openWithMenu, SIGNAL(triggered(QAction*)), - DocumentManager::instance(), SLOT(slotExecuteOpenWithMenuAction(QAction*))); + DocumentManager::instance(), SLOT(executeOpenWithMenuAction(QAction*))); // // Separators diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index f81f7b2a82480cf74e384a2ac20b4d920eff6db0..faef490d58e8bb8c7b8a1a24fb5d32efdb59cbc8 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -110,7 +110,7 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context, // (That is because this editor instance is deleted in executeOpenWithMenuAction // in that case.) connect(m_openWithMenu, SIGNAL(triggered(QAction*)), - Core::DocumentManager::instance(), SLOT(slotExecuteOpenWithMenuAction(QAction*)), + Core::DocumentManager::instance(), SLOT(executeOpenWithMenuAction(QAction*)), Qt::QueuedConnection); connect(m_resourceEditor, SIGNAL(dirtyChanged(bool)), m_resourceDocument, SLOT(dirtyChanged(bool)));