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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
This commit is contained in:
Oswald Buddenhagen
2010-10-25 11:27:30 +02:00
parent 3b2614c697 49bb852292
commit 35bb61590d
83 changed files with 83178 additions and 77579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -491,6 +491,7 @@ public:
void aboutToShutdown();
private slots:
void onCoreAboutToClose();
void editorOpened(Core::IEditor *);
void editorAboutToClose(Core::IEditor *);
@@ -583,6 +584,13 @@ FakeVimPluginPrivate::~FakeVimPluginPrivate()
m_fakeVimExCommandsPage = 0;
}
void FakeVimPluginPrivate::onCoreAboutToClose()
{
// don't attach to editors any more
disconnect(editorManager(), SIGNAL(editorOpened(Core::IEditor*)),
this, SLOT(editorOpened(Core::IEditor*)));
}
void FakeVimPluginPrivate::aboutToShutdown()
{
theFakeVimSettings()->writeSettings(ICore::instance()->settings());
@@ -615,6 +623,8 @@ bool FakeVimPluginPrivate::initialize()
actionManager()->actionContainer(Core::Constants::M_EDIT_ADVANCED);
advancedMenu->addAction(cmd, Core::Constants::G_EDIT_EDITOR);
connect(m_core, SIGNAL(coreAboutToClose()), this, SLOT(onCoreAboutToClose()));
// EditorManager
connect(editorManager(), SIGNAL(editorAboutToClose(Core::IEditor*)),
this, SLOT(editorAboutToClose(Core::IEditor*)));