From d1b7e90b7dab46c6314fc71519f5248255801992 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 20 Jun 2022 14:21:12 +0200 Subject: [PATCH] Use Utils::setClipboardAndSelection() more often Change-Id: I094f07cdb1e5e8c8026bb36d0a486719567641b9 Reviewed-by: Eike Ziller --- src/plugins/debugger/watchhandler.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index b4656da8f2e..3663daa5296 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -60,7 +60,6 @@ #include #include -#include #include #include #include @@ -1663,14 +1662,6 @@ static QString removeWatchActionText(QString exp) return WatchModel::tr("Remove Expression Evaluator for \"%1\"").arg(Utils::quoteAmpersands(exp)); } -static void copyToClipboard(const QString &clipboardText) -{ - QClipboard *clipboard = QApplication::clipboard(); - if (clipboard->supportsSelection()) - clipboard->setText(clipboardText, QClipboard::Selection); - clipboard->setText(clipboardText, QClipboard::Clipboard); -} - void WatchModel::inputNewExpression() { QDialog dlg; @@ -1788,19 +1779,19 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) addAction(this, menu, tr("Copy View Contents to Clipboard"), true, - [this] { copyToClipboard(editorContents()); }); + [this] { setClipboardAndSelection(editorContents()); }); addAction(this, menu, tr("Copy Current Value to Clipboard"), item, [this, name = item ? item->iname : QString()] { if (auto item = findItem(name)) - copyToClipboard(item->value); + setClipboardAndSelection(item->value); }); // addAction(menu, tr("Copy Selected Rows to Clipboard"), // selectionModel()->hasSelection(), - // [this] { copyToClipboard(editorContents(selectionModel()->selectedRows())); }); + // [this] { setClipboardAndSelection(editorContents(selectionModel()->selectedRows())); }); addAction(this, menu, tr("Open View Contents in Editor"), m_engine->debuggerActionsEnabled(),