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

QmakeProjectManager: Move .pro editor over to new construction scheme

Browse Source 
Change-Id: I1894e6ae622cb43ef6974aac82505c1f9912ff7b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-20 15:14:35 +02:00
parent f0dfe2dcab
commit 96b18db854
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmakeprojectmanager/profileeditor.cpp
View File

@@ -39,6 +39,7 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
#include <utils/qtcassert.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFileInfo> #include <QFileInfo>
@@ -54,18 +55,13 @@ namespace Internal {
ProFileEditor::ProFileEditor() ProFileEditor::ProFileEditor()
{ {
setContext(Core::Context(Constants::C_PROFILEEDITOR, addContext(Constants::C_PROFILEEDITOR);
TextEditor::Constants::C_TEXTEDITOR));
setDuplicateSupported(true); setDuplicateSupported(true);
setCommentStyle(Utils::CommentDefinition::HashStyle); setCommentStyle(Utils::CommentDefinition::HashStyle);
setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<ProFileCompletionAssistProvider>()); setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<ProFileCompletionAssistProvider>());
} setEditorCreator([]() { return new ProFileEditor; });
setDocumentCreator([]() { return new ProFileDocument; });
Core::IEditor *ProFileEditor::duplicate() setWidgetCreator([]() { return new ProFileEditorWidget; });
{
ProFileEditorWidget *ret = new ProFileEditorWidget;
ret->setTextDocument(editorWidget()->textDocumentPtr());
return ret->editor();
} }
// //
@@ -165,7 +161,7 @@ ProFileEditorWidget::Link ProFileEditorWidget::findLinkAt(const QTextCursor &cur
TextEditor::BaseTextEditor *ProFileEditorWidget::createEditor() TextEditor::BaseTextEditor *ProFileEditorWidget::createEditor()
{ {
return new ProFileEditor; QTC_ASSERT("should not happen anymore" && false, return 0);
} }
void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e) void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e)
@@ -222,9 +218,7 @@ ProFileEditorFactory::ProFileEditorFactory()
Core::IEditor *ProFileEditorFactory::createEditor() Core::IEditor *ProFileEditorFactory::createEditor()
{ {
ProFileEditorWidget *editor = new ProFileEditorWidget; return new ProFileEditor;
editor->setTextDocument(TextEditor::BaseTextDocumentPtr(new ProFileDocument));
return editor->editor();
} }
} // namespace Internal } // namespace Internal

2
src/plugins/qmakeprojectmanager/profileeditor.h
View File

@@ -43,8 +43,6 @@ class ProFileEditor : public TextEditor::BaseTextEditor
public: public:
ProFileEditor(); ProFileEditor();
Core::IEditor *duplicate();
}; };
class ProFileEditorWidget : public TextEditor::BaseTextEditorWidget class ProFileEditorWidget : public TextEditor::BaseTextEditorWidget