diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 72e42c5a703..b320bd663e7 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -290,21 +290,6 @@ QWidget *DiffEditor::toolBar() return m_toolBar; } -TextEditorWidget *DiffEditor::descriptionWidget() const -{ - return m_descriptionWidget; -} - -TextEditorWidget *DiffEditor::unifiedEditorWidget() const -{ - return m_unifiedView->textEditorWidget(); -} - -TextEditorWidget *DiffEditor::sideEditorWidget(DiffSide side) const -{ - return m_sideBySideView->sideEditorWidget(side); -} - void DiffEditor::documentHasChanged() { GuardLocker guard(m_ignoreChanges); diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h index 60f7a772140..e42157ec503 100644 --- a/src/plugins/diffeditor/diffeditor.h +++ b/src/plugins/diffeditor/diffeditor.h @@ -16,8 +16,6 @@ class QToolBar; class QStackedWidget; QT_END_NAMESPACE -namespace TextEditor { class TextEditorWidget; } - namespace DiffEditor::Internal { class DescriptionEditorWidget; @@ -37,9 +35,6 @@ public: Core::IEditor *duplicate() override; Core::IDocument *document() const override; QWidget *toolBar() override; - TextEditor::TextEditorWidget *descriptionWidget() const; - TextEditor::TextEditorWidget *unifiedEditorWidget() const; - TextEditor::TextEditorWidget *sideEditorWidget(DiffSide side) const; private: DiffEditor(); diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp index a3981ed49b1..775a90db22d 100644 --- a/src/plugins/diffeditor/diffeditorfactory.cpp +++ b/src/plugins/diffeditor/diffeditorfactory.cpp @@ -10,7 +10,6 @@ #include using namespace Core; -using namespace TextEditor; using namespace Utils; namespace DiffEditor::Internal { diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp index 1b513aefc33..b3652bd0f0b 100644 --- a/src/plugins/diffeditor/diffview.cpp +++ b/src/plugins/diffeditor/diffview.cpp @@ -77,11 +77,6 @@ UnifiedView::UnifiedView() } QWidget *UnifiedView::widget() -{ - return textEditorWidget(); -} - -TextEditor::TextEditorWidget *UnifiedView::textEditorWidget() { if (!m_widget) { m_widget = new UnifiedDiffEditorWidget; @@ -166,12 +161,6 @@ QWidget *SideBySideView::widget() return m_widget; } -TextEditor::TextEditorWidget *SideBySideView::sideEditorWidget(DiffSide side) -{ - widget(); // ensure widget creation - return m_widget->sideEditorWidget(side); -} - void SideBySideView::setDocument(DiffEditorDocument *document) { QTC_ASSERT(m_widget, return); diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h index 07e4c1d1863..5e044203cda 100644 --- a/src/plugins/diffeditor/diffview.h +++ b/src/plugins/diffeditor/diffview.h @@ -15,8 +15,6 @@ QT_BEGIN_NAMESPACE class QWidget; QT_END_NAMESPACE -namespace TextEditor { class TextEditorWidget; } - namespace DiffEditor { class FileData; @@ -77,7 +75,6 @@ public: UnifiedView(); QWidget *widget() override; - TextEditor::TextEditorWidget *textEditorWidget(); void setDocument(DiffEditorDocument *document) override; @@ -101,7 +98,6 @@ public: SideBySideView(); QWidget *widget() override; - TextEditor::TextEditorWidget *sideEditorWidget(DiffSide side); void setDocument(DiffEditorDocument *document) override; diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 1013adc9e94..c173ee30aa3 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -776,11 +776,6 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent) SideBySideDiffEditorWidget::~SideBySideDiffEditorWidget() = default; -TextEditorWidget *SideBySideDiffEditorWidget::sideEditorWidget(DiffSide side) const -{ - return m_editor[side]; -} - void SideBySideDiffEditorWidget::setDocument(DiffEditorDocument *document) { m_controller.setDocument(document); diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h index b56fea7da02..a7e69fc2d6e 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h @@ -13,7 +13,6 @@ namespace Core { class IContext; } namespace TextEditor { class FontSettings; -class TextEditorWidget; } namespace Utils { @@ -100,8 +99,6 @@ public: explicit SideBySideDiffEditorWidget(QWidget *parent = nullptr); ~SideBySideDiffEditorWidget(); - TextEditor::TextEditorWidget *sideEditorWidget(DiffSide side) const; - void setDocument(DiffEditorDocument *document); DiffEditorDocument *diffDocument() const;