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

Core: Make IEditor::id a value member and adjust users

Browse Source 
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-02-24 15:03:25 +01:00
committed by Eike Ziller
parent 9035a9b77a
commit 6c6f47f86c
39 changed files with 44 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/android/androidmanifesteditor.cpp
View File

@@ -44,6 +44,8 @@ using namespace Internal;
Android::Internal::AndroidManifestEditor::AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget)
: Core::IEditor(editorWidget), m_toolBar(0)
{
setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
m_toolBar = new QToolBar(editorWidget);
m_actionGroup = new QActionGroup(this);
connect(m_actionGroup, SIGNAL(triggered(QAction*)), this, SLOT(changeEditorPage(QAction*)));
@@ -64,11 +66,6 @@ Android::Internal::AndroidManifestEditor::AndroidManifestEditor(AndroidManifestE
setWidget(editorWidget);
}
Core::Id AndroidManifestEditor::id() const
{
return Constants::ANDROID_MANIFEST_EDITOR_ID;
}
bool AndroidManifestEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
{
return widget()->open(errorString, fileName, realFileName);

1
src/plugins/android/androidmanifesteditor.h
View File

@@ -50,7 +50,6 @@ class AndroidManifestEditor : public Core::IEditor
public:
explicit AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget);
Core::Id id() const;
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
QWidget *toolBar();
AndroidManifestEditorWidget *widget() const;

6
src/plugins/android/javaeditor.cpp
View File

@@ -52,6 +52,7 @@ using namespace Android::Internal;
JavaEditor::JavaEditor(JavaEditorWidget *editor)
: BaseTextEditor(editor)
{
setId(Constants::JAVA_EDITOR_ID);
setContext(Core::Context(Constants::C_JAVA_EDITOR,
TextEditor::Constants::C_TEXTEDITOR));
}
@@ -64,11 +65,6 @@ Core::IEditor *JavaEditor::duplicate()
return ret->editor();
}
Core::Id JavaEditor::id() const
{
return Core::Id(Constants::JAVA_EDITOR_ID);
}
TextEditor::CompletionAssistProvider *JavaEditor::completionAssistProvider()
{
return ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>();

1
src/plugins/android/javaeditor.h
View File

@@ -49,7 +49,6 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
Core::Id id() const;
TextEditor::CompletionAssistProvider *completionAssistProvider();
};