diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index e25539129a2..5bd0792817d 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -5726,7 +5726,7 @@ void BaseTextEditorWidget::collectToCircularClipboard() if (!mimeData) return; CircularClipboard *circularClipBoard = CircularClipboard::instance(); - circularClipBoard->collect(duplicateMimeData(mimeData)); + circularClipBoard->collect(BaseTextEditorWidget::duplicateMimeData(mimeData)); // We want the latest copied content to be the first one to appear on circular paste. circularClipBoard->toLastCollect(); } @@ -5742,7 +5742,7 @@ void BaseTextEditorWidget::circularPaste() { CircularClipboard *circularClipBoard = CircularClipboard::instance(); if (const QMimeData *clipboardData = QApplication::clipboard()->mimeData()) { - circularClipBoard->collect(duplicateMimeData(clipboardData)); + circularClipBoard->collect(BaseTextEditorWidget::duplicateMimeData(clipboardData)); circularClipBoard->toLastCollect(); } @@ -5750,7 +5750,7 @@ void BaseTextEditorWidget::circularPaste() return invokeAssist(QuickFix, d->m_clipboardAssistProvider.data()); if (const QMimeData *mimeData = circularClipBoard->next().data()) { - QApplication::clipboard()->setMimeData(duplicateMimeData(mimeData)); + QApplication::clipboard()->setMimeData(BaseTextEditorWidget::duplicateMimeData(mimeData)); paste(); } } @@ -5984,7 +5984,7 @@ void BaseTextEditorWidget::insertFromMimeData(const QMimeData *source) setTextCursor(cursor); } -QMimeData *BaseTextEditorWidget::duplicateMimeData(const QMimeData *source) const +QMimeData *BaseTextEditorWidget::duplicateMimeData(const QMimeData *source) { Q_ASSERT(source); diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index ed0f5372c4a..d1105b36583 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -228,7 +228,7 @@ public: virtual IAssistInterface *createAssistInterface(AssistKind assistKind, AssistReason assistReason) const; - QMimeData *duplicateMimeData(const QMimeData *source) const; + static QMimeData *duplicateMimeData(const QMimeData *source); static QString msgTextTooLarge(quint64 size); diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp index 45a7e4d3034..98db5f988df 100644 --- a/src/plugins/texteditor/circularclipboardassist.cpp +++ b/src/plugins/texteditor/circularclipboardassist.cpp @@ -73,7 +73,8 @@ public: } //Copy the selected item - QApplication::clipboard()->setMimeData(editwidget->duplicateMimeData(m_mimeData.data())); + QApplication::clipboard()->setMimeData( + BaseTextEditorWidget::duplicateMimeData(m_mimeData.data())); //Paste editwidget->paste();