diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-02 12:25:20 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-09-02 16:48:13 +0200 |
| commit | 7224ccb2e7bab5b7bca88cbcd41829fdf3c25165 (patch) | |
| tree | 6c3bc438bf4e68ce06cf5afd8950d235b0bd391e /src/plugins/android | |
| parent | cae737e6291d8349602cd9bd2e109abd0292e5af (diff) | |
| download | qt-creator-7224ccb2e7bab5b7bca88cbcd41829fdf3c25165.tar.gz | |
Editors: Automatically add editor/document id to context and use that
instead of manually adding a context everywhere.
Change-Id: I4336015a6d19349171a255e949da89b0013d6700
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androidconstants.h | 1 | ||||
| -rw-r--r-- | src/plugins/android/javaeditor.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index d05555661e..8330630032 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -68,7 +68,6 @@ const char ANDROID_MANIFEST_EDITOR_CONTEXT[] = "Android.AndroidManifestEditor.Id const char ANDROID_BUILDDIRECTORY[] = "android-build"; const char JAVA_EDITOR_ID[] = "java.editor"; -const char C_JAVA_EDITOR[] = "Java Editor"; const char JAVA_MIMETYPE[] = "text/x-java"; const char WIZARD_JAVA[] = "Wizard.Java"; const char JAVA_WIZARD_CATEGORY[] = "U.Java"; diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index e6c875c034..d1035bc197 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -57,7 +57,6 @@ class JavaEditor : public TextEditor::BaseTextEditor public: JavaEditor() { - addContext(Constants::C_JAVA_EDITOR); setDuplicateSupported(true); setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>()); } @@ -113,8 +112,7 @@ JavaEditorFactory::JavaEditorFactory() setGenericSyntaxHighlighter(QLatin1String(Constants::JAVA_MIMETYPE)); setCommentStyle(Utils::CommentDefinition::CppStyle); - setEditorActionHandlers(Constants::C_JAVA_EDITOR, - TextEditor::TextEditorActionHandler::UnCommentSelection); + setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection); } } // namespace Internal |