diff options
| author | hjk <hjk121@nokiamail.com> | 2013-08-30 16:38:57 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-09-03 11:41:45 +0200 |
| commit | a37589d431844a64031d3044787c15f8dddace45 (patch) | |
| tree | 4e4d2e07f31278b5606e779707697e65185cbc64 /src/plugins/texteditor/plaintexteditor.cpp | |
| parent | 1226400af3da68f355f298935bc13807f257d224 (diff) | |
| download | qt-creator-a37589d431844a64031d3044787c15f8dddace45.tar.gz | |
Apply 'static' pattern to MimeDatabase
Also adjust and streamline using and surrounding code.
Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/texteditor/plaintexteditor.cpp')
| -rw-r--r-- | src/plugins/texteditor/plaintexteditor.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index 649b5f3bf6..410032a6ac 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -74,7 +74,7 @@ PlainTextEditorWidget::PlainTextEditorWidget(QWidget *parent) connect(Manager::instance(), SIGNAL(mimeTypesRegistered()), this, SLOT(configure())); } -Core::IEditor *PlainTextEditor::duplicate(QWidget *parent) +IEditor *PlainTextEditor::duplicate(QWidget *parent) { PlainTextEditorWidget *newWidget = new PlainTextEditorWidget(parent); newWidget->duplicateFrom(editorWidget()); @@ -82,9 +82,9 @@ Core::IEditor *PlainTextEditor::duplicate(QWidget *parent) return newWidget->editor(); } -Core::Id PlainTextEditor::id() const +Id PlainTextEditor::id() const { - return Core::Id(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); + return Core::Constants::K_DEFAULT_TEXT_EDITOR_ID; } void PlainTextEditorWidget::unCommentSelection() @@ -105,18 +105,18 @@ void PlainTextEditorWidget::setTabSettings(const TextEditor::TabSettings &ts) void PlainTextEditorWidget::configure() { - Core::MimeType mimeType; + MimeType mimeType; if (editorDocument()) - mimeType = Core::ICore::mimeDatabase()->findByFile(editorDocument()->filePath()); + mimeType = MimeDatabase::findByFile(editorDocument()->filePath()); configure(mimeType); } void PlainTextEditorWidget::configure(const QString &mimeType) { - configure(Core::ICore::mimeDatabase()->findByType(mimeType)); + configure(MimeDatabase::findByType(mimeType)); } -void PlainTextEditorWidget::configure(const Core::MimeType &mimeType) +void PlainTextEditorWidget::configure(const MimeType &mimeType) { Highlighter *highlighter = new Highlighter(); baseTextDocument()->setSyntaxHighlighter(highlighter); |