forked from qt-creator/qt-creator
TextEditor: Move highlighting support from Plain to Base
Goal is to squash the 'Plain' layer. Change-Id: I2513de57fbbc09e9d0d9d4f1eb008dced76038f0 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -40,7 +40,6 @@
|
||||
#include <coreplugin/find/ifindsupport.h>
|
||||
|
||||
#include <QPlainTextEdit>
|
||||
#include <QSharedPointer>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QToolBar;
|
||||
@@ -52,6 +51,8 @@ class QRect;
|
||||
class QTextBlock;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Core { class MimeType; }
|
||||
|
||||
namespace Utils {
|
||||
class CommentDefinition;
|
||||
class LineColumnLabel;
|
||||
@@ -362,6 +363,7 @@ public:
|
||||
|
||||
// the blocks list must be sorted
|
||||
void setIfdefedOutBlocks(const QList<BlockRange> &blocks);
|
||||
bool isMissingSyntaxDefinition() const;
|
||||
|
||||
public slots:
|
||||
virtual void copy();
|
||||
@@ -461,6 +463,7 @@ public slots:
|
||||
|
||||
/// Abort code assistant if it is running.
|
||||
void abortAssist();
|
||||
void configureMimeType(const Core::MimeType &mimeType);
|
||||
|
||||
signals:
|
||||
void assistFinished();
|
||||
@@ -471,6 +474,8 @@ signals:
|
||||
void requestZoomReset();
|
||||
void requestBlockUpdate(const QTextBlock &);
|
||||
|
||||
void configured(Core::IEditor *editor);
|
||||
|
||||
protected:
|
||||
bool event(QEvent *e);
|
||||
void inputMethodEvent(QInputMethodEvent *e);
|
||||
|
||||
Reference in New Issue
Block a user