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

DiffEditor: Move SelectableTextEditorWidget to internal

Browse Source 
Change-Id: I4fefca2c780f17c68e73bbdaee9528c8945c00e4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 15:02:04 +01:00
parent f10fd0ef5e
commit c1dbcfb204
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/diffeditor/selectabletexteditorwidget.cpp
View File

@@ -35,6 +35,7 @@
#include <QTextBlock> #include <QTextBlock>
namespace DiffEditor { namespace DiffEditor {
namespace Internal {
SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *parent) SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *parent)
: TextEditorWidget(parent) : TextEditorWidget(parent)
@@ -157,5 +158,5 @@ void SelectableTextEditorWidget::paintBlock(QPainter *painter,
TextEditorWidget::paintBlock(painter, block, offset, newSelections, clipRect); TextEditorWidget::paintBlock(painter, block, offset, newSelections, clipRect);
} }
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor

8
src/plugins/diffeditor/selectabletexteditorwidget.h
View File

@@ -31,12 +31,12 @@
#ifndef SELECTABLETEXTEDITORWIDGET_H #ifndef SELECTABLETEXTEDITORWIDGET_H
#define SELECTABLETEXTEDITORWIDGET_H #define SELECTABLETEXTEDITORWIDGET_H
#include "diffeditor_global.h"
#include <texteditor/texteditor.h> #include <texteditor/texteditor.h>
namespace DiffEditor { namespace DiffEditor {
namespace Internal {
class DIFFEDITOR_EXPORT DiffSelection class DiffSelection
{ {
public: public:
DiffSelection() : start(-1), end(-1), format(0) {} DiffSelection() : start(-1), end(-1), format(0) {}
@@ -48,8 +48,7 @@ public:
QTextCharFormat *format; QTextCharFormat *format;
}; };
class DIFFEDITOR_EXPORT SelectableTextEditorWidget class SelectableTextEditorWidget : public TextEditor::TextEditorWidget
: public TextEditor::TextEditorWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
@@ -70,6 +69,7 @@ private:
QMap<int, QList<DiffSelection> > m_diffSelections; QMap<int, QList<DiffSelection> > m_diffSelections;
}; };
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor
#endif // SELECTABLETEXTEDITORWIDGET_H #endif // SELECTABLETEXTEDITORWIDGET_H