From 14185ae13f37bcbe86ef1bcc6ee9fec1b671f10f Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 13 Nov 2013 17:39:00 +0100
Subject: [PATCH] DocumentManager: Merge {slotE,e}xecuteOpenWithMenuAction
Change-Id: Ia84a428ace4d109a3577a100920c9ae5336cefe8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/coreplugin/documentmanager.cpp | 5 -----
src/plugins/coreplugin/documentmanager.h | 4 +---
src/plugins/projectexplorer/projectexplorer.cpp | 2 +-
src/plugins/resourceeditor/resourceeditorw.cpp | 2 +-
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index 9e7dbbdba35..414fc8ca027 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 70168a2b231..ef54a55cfce 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 3b373d128fe..0f95462d542 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 f81f7b2a824..faef490d58e 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)));
--
GitLab