TextEditor: Move toolbar widgets from *Editor to *Widget

Lifetime is coupled to the widgets, not the editor.

Change-Id: I01560bbdd6c399376d3a4184f0eb83e4153f830e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2014-08-01 16:41:18 +02:00
parent ac00146a94
commit a9b7045803
6 changed files with 68 additions and 85 deletions

View File

@@ -143,9 +143,6 @@ public:
bool restoreState(const QByteArray &state);
QWidget *toolBar();
enum Side { Left, Right };
void insertExtraToolBarWidget(Side side, QWidget *widget);
QString contextHelpId() const; // from IContext
int currentLine() const;
@@ -192,8 +189,6 @@ public:
// There should be something simpler.
void setCompletionAssistProvider(const std::function<CompletionAssistProvider *()> &provider);
QObject *fileEncodingLabel() const; // FIXME: Remove
void setAutoCompleter(AutoCompleter *autoCompleter);
AutoCompleter *autoCompleter() const;
@@ -205,12 +200,6 @@ signals:
void markTooltipRequested(TextEditor::BaseTextEditor *editor, const QPoint &globalPos, int line);
void contextHelpIdRequested(TextEditor::BaseTextEditor *editor, int position);
private slots:
void updateCursorPosition();
void openGotoLocator();
void setFileEncodingLabelVisible(bool visible);
void setFileEncodingLabelText(const QString &text);
private:
friend class Internal::BaseTextEditorWidgetPrivate;
friend class BaseTextEditorWidget;
@@ -372,6 +361,9 @@ public:
void setIfdefedOutBlocks(const QList<BlockRange> &blocks);
bool isMissingSyntaxDefinition() const;
enum Side { Left, Right };
void insertExtraToolBarWidget(Side side, QWidget *widget);
public slots:
virtual void copy();
virtual void paste();