Commit 551b9f48 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer

Moving some code together that belongs together

parent 4e16705a
This diff is collapsed.
...@@ -306,10 +306,6 @@ public: ...@@ -306,10 +306,6 @@ public:
public slots: public slots:
void setDisplayName(const QString &title); void setDisplayName(const QString &title);
virtual void setFontSettings(const TextEditor::FontSettings &);
virtual void format();
virtual void unCommentSelection();
virtual void setStorageSettings(const TextEditor::StorageSettings &);
void paste(); void paste();
void cut(); void cut();
...@@ -355,6 +351,7 @@ protected: ...@@ -355,6 +351,7 @@ protected:
public: public:
void duplicateFrom(BaseTextEditor *editor); void duplicateFrom(BaseTextEditor *editor);
protected: protected:
BaseTextDocument *baseTextDocument() const; BaseTextDocument *baseTextDocument() const;
void setBaseTextDocument(BaseTextDocument *doc); void setBaseTextDocument(BaseTextDocument *doc);
...@@ -380,8 +377,8 @@ public: ...@@ -380,8 +377,8 @@ public:
QWidget *extraArea() const; QWidget *extraArea() const;
virtual int extraAreaWidth(int *markWidthPtr = 0) const; virtual int extraAreaWidth(int *markWidthPtr = 0) const;
virtual void extraAreaPaintEvent(QPaintEvent *); virtual void extraAreaPaintEvent(QPaintEvent *);
virtual void extraAreaMouseEvent(QMouseEvent *);
virtual void extraAreaLeaveEvent(QEvent *); virtual void extraAreaLeaveEvent(QEvent *);
virtual void extraAreaMouseEvent(QMouseEvent *);
const TabSettings &tabSettings() const; const TabSettings &tabSettings() const;
const DisplaySettings &displaySettings() const; const DisplaySettings &displaySettings() const;
...@@ -418,8 +415,12 @@ public: ...@@ -418,8 +415,12 @@ public:
void setIfdefedOutBlocks(const QList<BlockRange> &blocks); void setIfdefedOutBlocks(const QList<BlockRange> &blocks);
public slots: public slots:
virtual void format();
virtual void unCommentSelection();
virtual void setFontSettings(const TextEditor::FontSettings &);
virtual void setTabSettings(const TextEditor::TabSettings &); virtual void setTabSettings(const TextEditor::TabSettings &);
virtual void setDisplaySettings(const TextEditor::DisplaySettings &); virtual void setDisplaySettings(const TextEditor::DisplaySettings &);
virtual void setStorageSettings(const TextEditor::StorageSettings &);
protected: protected:
bool viewportEvent(QEvent *event); bool viewportEvent(QEvent *event);
...@@ -437,7 +438,6 @@ protected: ...@@ -437,7 +438,6 @@ protected:
// Indent at cursor. Calls indentBlock for selection or current line. // Indent at cursor. Calls indentBlock for selection or current line.
virtual void indent(QTextDocument *doc, const QTextCursor &cursor, QChar typedChar); virtual void indent(QTextDocument *doc, const QTextCursor &cursor, QChar typedChar);
protected slots: protected slots:
virtual void slotUpdateExtraAreaWidth(); virtual void slotUpdateExtraAreaWidth();
virtual void slotModificationChanged(bool); virtual void slotModificationChanged(bool);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment