From c1dbcfb204cb919e5f7e70ea72ebf147f2bea04e Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 30 Jan 2015 15:02:04 +0100 Subject: [PATCH] DiffEditor: Move SelectableTextEditorWidget to internal Change-Id: I4fefca2c780f17c68e73bbdaee9528c8945c00e4 Reviewed-by: Eike Ziller --- src/plugins/diffeditor/selectabletexteditorwidget.cpp | 3 ++- src/plugins/diffeditor/selectabletexteditorwidget.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.cpp b/src/plugins/diffeditor/selectabletexteditorwidget.cpp index 19418521b65..cdbbd18dbc7 100644 --- a/src/plugins/diffeditor/selectabletexteditorwidget.cpp +++ b/src/plugins/diffeditor/selectabletexteditorwidget.cpp @@ -35,6 +35,7 @@ #include namespace DiffEditor { +namespace Internal { SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *parent) : TextEditorWidget(parent) @@ -157,5 +158,5 @@ void SelectableTextEditorWidget::paintBlock(QPainter *painter, TextEditorWidget::paintBlock(painter, block, offset, newSelections, clipRect); } +} // namespace Internal } // namespace DiffEditor - diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.h b/src/plugins/diffeditor/selectabletexteditorwidget.h index f2554aa6cfe..814338c6fd1 100644 --- a/src/plugins/diffeditor/selectabletexteditorwidget.h +++ b/src/plugins/diffeditor/selectabletexteditorwidget.h @@ -31,12 +31,12 @@ #ifndef SELECTABLETEXTEDITORWIDGET_H #define SELECTABLETEXTEDITORWIDGET_H -#include "diffeditor_global.h" #include namespace DiffEditor { +namespace Internal { -class DIFFEDITOR_EXPORT DiffSelection +class DiffSelection { public: DiffSelection() : start(-1), end(-1), format(0) {} @@ -48,8 +48,7 @@ public: QTextCharFormat *format; }; -class DIFFEDITOR_EXPORT SelectableTextEditorWidget - : public TextEditor::TextEditorWidget +class SelectableTextEditorWidget : public TextEditor::TextEditorWidget { Q_OBJECT public: @@ -70,6 +69,7 @@ private: QMap > m_diffSelections; }; +} // namespace Internal } // namespace DiffEditor #endif // SELECTABLETEXTEDITORWIDGET_H