feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditors: Make function static

Browse Source 
Change-Id: I4297651458f6efb28a3bbeb83b4c038956d64305
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-01-14 09:50:12 +01:00
parent 90081329da
commit b7ce718d4c
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -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);