forked from qt-creator/qt-creator
TextEditor: fix parameter name for TextEditorWidget::insertWidget
Change-Id: I03e9a1b58f62b09ea23d15aeffa5b3397448cdf1 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
@@ -867,7 +867,7 @@ public:
|
|||||||
void openTypeUnderCursor(bool openInNextSplit);
|
void openTypeUnderCursor(bool openInNextSplit);
|
||||||
qreal charWidth() const;
|
qreal charWidth() const;
|
||||||
|
|
||||||
std::unique_ptr<EmbeddedWidgetInterface> insertWidget(QWidget *widget, int line);
|
std::unique_ptr<EmbeddedWidgetInterface> insertWidget(QWidget *widget, int pos);
|
||||||
void forceUpdateScrollbarSize();
|
void forceUpdateScrollbarSize();
|
||||||
|
|
||||||
// actions
|
// actions
|
||||||
@@ -4128,7 +4128,7 @@ void TextEditorWidgetPrivate::forceUpdateScrollbarSize()
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<EmbeddedWidgetInterface> TextEditorWidgetPrivate::insertWidget(
|
std::unique_ptr<EmbeddedWidgetInterface> TextEditorWidgetPrivate::insertWidget(
|
||||||
QWidget *widget, int line)
|
QWidget *widget, int pos)
|
||||||
{
|
{
|
||||||
QPointer<CarrierWidget> carrier = new CarrierWidget(q, widget);
|
QPointer<CarrierWidget> carrier = new CarrierWidget(q, widget);
|
||||||
std::unique_ptr<EmbeddedWidgetInterface> result(new EmbeddedWidgetInterface());
|
std::unique_ptr<EmbeddedWidgetInterface> result(new EmbeddedWidgetInterface());
|
||||||
@@ -4148,7 +4148,7 @@ std::unique_ptr<EmbeddedWidgetInterface> TextEditorWidgetPrivate::insertWidget(
|
|||||||
|
|
||||||
std::shared_ptr<State> pState = std::make_shared<State>();
|
std::shared_ptr<State> pState = std::make_shared<State>();
|
||||||
pState->cursor = QTextCursor(q->document());
|
pState->cursor = QTextCursor(q->document());
|
||||||
pState->cursor.setPosition(line);
|
pState->cursor.setPosition(pos);
|
||||||
pState->cursor.movePosition(QTextCursor::StartOfBlock);
|
pState->cursor.movePosition(QTextCursor::StartOfBlock);
|
||||||
|
|
||||||
auto position = [this, pState, carrier] {
|
auto position = [this, pState, carrier] {
|
||||||
@@ -7434,9 +7434,9 @@ TextEditorWidget::SuggestionBlocker TextEditorWidget::blockSuggestions()
|
|||||||
return d->m_suggestionBlocker;
|
return d->m_suggestionBlocker;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<EmbeddedWidgetInterface> TextEditorWidget::insertWidget(QWidget *widget, int line)
|
std::unique_ptr<EmbeddedWidgetInterface> TextEditorWidget::insertWidget(QWidget *widget, int pos)
|
||||||
{
|
{
|
||||||
return d->insertWidget(widget, line);
|
return d->insertWidget(widget, pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<QTextCursor> TextEditorWidget::autoCompleteHighlightPositions() const
|
QList<QTextCursor> TextEditorWidget::autoCompleteHighlightPositions() const
|
||||||
|
@@ -533,7 +533,7 @@ public:
|
|||||||
// Returns an object that blocks suggestions until it is destroyed.
|
// Returns an object that blocks suggestions until it is destroyed.
|
||||||
SuggestionBlocker blockSuggestions();
|
SuggestionBlocker blockSuggestions();
|
||||||
|
|
||||||
std::unique_ptr<EmbeddedWidgetInterface> insertWidget(QWidget *widget, int line);
|
std::unique_ptr<EmbeddedWidgetInterface> insertWidget(QWidget *widget, int pos);
|
||||||
|
|
||||||
QList<QTextCursor> autoCompleteHighlightPositions() const;
|
QList<QTextCursor> autoCompleteHighlightPositions() const;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user