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

Give TextEditorActionHandler an explicit parent and unify usage.

Browse Source 
The action handler implicitly passed ownership to ICore, which is non-
to the action handler. We now consistently create the action handler in
the editor factory, give ownership to the editor factory, and don't hold
a reference to it.

Change-Id: I4372f8de966e3ceff87c06c5528c6b54522c1d57
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Eike Ziller
2013-12-10 17:13:21 +01:00
parent 3d1b70c58e
commit d80fb696ab
27 changed files with 48 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidmanifesteditorfactory.cpp
View File

@@ -41,12 +41,12 @@ using namespace Android::Internal;
AndroidManifestEditorFactory::AndroidManifestEditorFactory(QObject *parent)
: Core::IEditorFactory(parent),
m_actionHandler(new TextEditor::TextEditorActionHandler(Constants::ANDROID_MANIFEST_EDITOR_CONTEXT))
: Core::IEditorFactory(parent)
{
setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
setDisplayName(tr("Android Manifest editor"));
addMimeType(Constants::ANDROID_MANIFEST_MIME_TYPE);
new TextEditor::TextEditorActionHandler(this, Constants::ANDROID_MANIFEST_EDITOR_CONTEXT);
}
Core::IEditor *AndroidManifestEditorFactory::createEditor(QWidget *parent)

5
src/plugins/android/androidmanifesteditorfactory.h
View File

@@ -32,8 +32,6 @@
#include <coreplugin/editormanager/ieditorfactory.h>
namespace TextEditor { class TextEditorActionHandler; }
namespace Android {
namespace Internal {
@@ -45,9 +43,6 @@ public:
explicit AndroidManifestEditorFactory(QObject *parent = 0);
Core::IEditor *createEditor(QWidget *parent);
private:
TextEditor::TextEditorActionHandler *m_actionHandler;
};
} // namespace Internal