feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DocumentManager: Merge {slotE,e}xecuteOpenWithMenuAction

Browse Source 
Change-Id: Ia84a428ace4d109a3577a100920c9ae5336cefe8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2013-11-13 17:39:00 +01:00
parent f61e643c95
commit 14185ae13f
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -1368,11 +1368,6 @@ void DocumentManager::executeOpenWithMenuAction(QAction *action)
EditorManager::openExternalEditor(entry.fileName, entry.externalEditor->id()); EditorManager::openExternalEditor(entry.fileName, entry.externalEditor->id());
} }
void DocumentManager::slotExecuteOpenWithMenuAction(QAction *action)
{
executeOpenWithMenuAction(action);
}
bool DocumentManager::eventFilter(QObject *obj, QEvent *e) bool DocumentManager::eventFilter(QObject *obj, QEvent *e)
{ {
if (obj == qApp && e->type() == QEvent::ApplicationActivate) { if (obj == qApp && e->type() == QEvent::ApplicationActivate) {

4
src/plugins/coreplugin/documentmanager.h
View File

@@ -126,10 +126,8 @@ public:
lead to any editors to reload or any other editor manager actions. */ lead to any editors to reload or any other editor manager actions. */
static void notifyFilesChangedInternally(const QStringList &files); static void notifyFilesChangedInternally(const QStringList &files);
static void executeOpenWithMenuAction(QAction *action);
public slots: public slots:
void slotExecuteOpenWithMenuAction(QAction *action); static void executeOpenWithMenuAction(QAction *action);
signals: signals:
void currentFileChanged(const QString &filePath); void currentFileChanged(const QString &filePath);

2
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -541,7 +541,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
d->m_openWithMenu->setTitle(tr("Open With")); d->m_openWithMenu->setTitle(tr("Open With"));
connect(d->m_openWithMenu, SIGNAL(triggered(QAction*)), connect(d->m_openWithMenu, SIGNAL(triggered(QAction*)),
DocumentManager::instance(), SLOT(slotExecuteOpenWithMenuAction(QAction*))); DocumentManager::instance(), SLOT(executeOpenWithMenuAction(QAction*)));
// //
// Separators // Separators

2
src/plugins/resourceeditor/resourceeditorw.cpp
View File

@@ -110,7 +110,7 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context,
// (That is because this editor instance is deleted in executeOpenWithMenuAction // (That is because this editor instance is deleted in executeOpenWithMenuAction
// in that case.) // in that case.)
connect(m_openWithMenu, SIGNAL(triggered(QAction*)), connect(m_openWithMenu, SIGNAL(triggered(QAction*)),
Core::DocumentManager::instance(), SLOT(slotExecuteOpenWithMenuAction(QAction*)), Core::DocumentManager::instance(), SLOT(executeOpenWithMenuAction(QAction*)),
Qt::QueuedConnection); Qt::QueuedConnection);
connect(m_resourceEditor, SIGNAL(dirtyChanged(bool)), m_resourceDocument, SLOT(dirtyChanged(bool))); connect(m_resourceEditor, SIGNAL(dirtyChanged(bool)), m_resourceDocument, SLOT(dirtyChanged(bool)));