diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index f46068ed706..3c0e430953a 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -37,6 +37,7 @@ #include "testtreemodel.h" #include + #include #include #include @@ -44,19 +45,21 @@ #include #include #include + #include #include + #include #include #include + #include #include +#include #include #include #include -#include -#include #include #include #include @@ -703,12 +706,12 @@ const TestResult *TestResultsPane::getTestResult(const QModelIndex &idx) void TestResultsPane::onCopyItemTriggered(const TestResult *result) { QTC_ASSERT(result, return); - QApplication::clipboard()->setText(result->outputString(true)); + setClipboardAndSelection(result->outputString(true)); } void TestResultsPane::onCopyWholeTriggered() { - QApplication::clipboard()->setText(getWholeOutput()); + setClipboardAndSelection(getWholeOutput()); } void TestResultsPane::onSaveWholeTriggered() diff --git a/src/plugins/bineditor/bineditorwidget.cpp b/src/plugins/bineditor/bineditorwidget.cpp index 2ae54122494..2b7a021dbd2 100644 --- a/src/plugins/bineditor/bineditorwidget.cpp +++ b/src/plugins/bineditor/bineditorwidget.cpp @@ -39,16 +39,13 @@ #include #include #include +#include +#include +#include #include #include #include -#include -#include - -#include -#include -#include #include #include #include @@ -56,7 +53,9 @@ #include #include #include +#include #include +#include #include using namespace Core; @@ -1488,7 +1487,7 @@ void BinEditorWidget::copy(bool raw) QByteArray data = dataMid(selStart, selectionLength); if (raw) { data.replace(0, ' '); - QApplication::clipboard()->setText(QString::fromLatin1(data)); + setClipboardAndSelection(QString::fromLatin1(data)); return; } QString hexString; @@ -1499,7 +1498,7 @@ void BinEditorWidget::copy(bool raw) hexString.append(QLatin1Char(hex[val >> 4])).append(QLatin1Char(hex[val & 0xf])).append(QLatin1Char(' ')); } hexString.chop(1); - QApplication::clipboard()->setText(hexString); + setClipboardAndSelection(hexString); } void BinEditorWidget::highlightSearchResults(const QByteArray &pattern, QTextDocument::FindFlags findFlags) @@ -1646,9 +1645,9 @@ void BinEditorWidget::contextMenuEvent(QContextMenuEvent *event) else if (action == copyHexAction) copy(false); else if (action == copyBeValue) - QApplication::clipboard()->setText("0x" + QString::number(beAddress, 16)); + setClipboardAndSelection("0x" + QString::number(beAddress, 16)); else if (action == copyLeValue) - QApplication::clipboard()->setText("0x" + QString::number(leAddress, 16)); + setClipboardAndSelection("0x" + QString::number(leAddress, 16)); else if (action == jumpToBeAddressHereAction) jumpToAddress(beAddress); else if (action == jumpToLeAddressHereAction) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index a052fdc8b3b..25eb0544415 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -77,10 +77,8 @@ #include #include -#include #include #include -#include #include #include #include @@ -1055,7 +1053,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event) : m_buildSystem->buildConfiguration()->macroExpander()); }); - QApplication::clipboard()->setText(variableList.join('\n'), QClipboard::Clipboard); + setClipboardAndSelection(variableList.join('\n')); }); menu->move(e->globalPos()); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 8e1741aecee..f4c7f9d0a4c 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -2426,7 +2426,7 @@ void EditorManagerPrivate::copyFilePathFromContextMenu() { if (!d->m_contextMenuEntry) return; - QApplication::clipboard()->setText(d->m_contextMenuEntry->fileName().toUserOutput()); + setClipboardAndSelection(d->m_contextMenuEntry->fileName().toUserOutput()); } void EditorManagerPrivate::copyLocationFromContextMenu() diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 3cf987e1efe..a119c9ce078 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -325,7 +326,8 @@ void CodePasterPluginPrivate::fetch() void CodePasterPluginPrivate::finishPost(const QString &link) { if (m_settings.copyToClipboard.value()) - QApplication::clipboard()->setText(link); + Utils::setClipboardAndSelection(link); + if (m_settings.displayOutput.value()) MessageManager::writeDisrupting(link); else diff --git a/src/plugins/cppcheck/cppchecktextmark.cpp b/src/plugins/cppcheck/cppchecktextmark.cpp index d3446a0610b..d42c81388f4 100644 --- a/src/plugins/cppcheck/cppchecktextmark.cpp +++ b/src/plugins/cppcheck/cppchecktextmark.cpp @@ -27,11 +27,10 @@ #include "cppcheckdiagnostic.h" #include "cppchecktextmark.h" +#include #include #include -#include -#include #include namespace Cppcheck { @@ -90,7 +89,7 @@ CppcheckTextMark::CppcheckTextMark (const Diagnostic &diagnostic) .arg(diagnostic.fileName.toUserOutput()) .arg(diagnostic.lineNumber) .arg(diagnostic.message); - QApplication::clipboard()->setText(text); + Utils::setClipboardAndSelection(text); }); setActions({action}); } diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 857a3701dcd..f7f673004d7 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -35,7 +35,6 @@ #include "remotedialog.h" #include "stashdialog.h" #include "logchangedialog.h" -#include "mergetool.h" #include "gitutils.h" #include "gitgrep.h" @@ -86,7 +85,6 @@ #include #include -#include #include #include #include @@ -267,7 +265,7 @@ public: const QString &reference) final { menu->addAction(tr("&Copy \"%1\"").arg(reference), - [reference] { QApplication::clipboard()->setText(reference); }); + [reference] { setClipboardAndSelection(reference); }); QAction *action = menu->addAction(tr("&Describe Change %1").arg(reference), [=] { vcsDescribe(workingDirectory, reference); }); menu->setDefaultAction(action); diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index f08e49424a2..1227da350b0 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -26,6 +26,7 @@ #include "helpplugin.h" #include "bookmarkmanager.h" +#include "contentwindow.h" #include "docsettingspage.h" #include "filtersettingspage.h" #include "generalsettingspage.h" @@ -38,23 +39,21 @@ #include "helptr.h" #include "helpviewer.h" #include "helpwidget.h" +#include "indexwindow.h" #include "localhelpmanager.h" #include "openpagesmanager.h" #include "searchtaskhandler.h" -#include "searchwidget.h" #include "topicchooser.h" -#include -#include -#include - #include -#include + #include +#include #include #include #include #include +#include #include #include #include @@ -62,17 +61,19 @@ #include #include #include + #include -#include + #include + #include #include #include #include +#include #include #include -#include #include #include #include @@ -644,8 +645,7 @@ void HelpPluginPrivate::slotSystemInformation() connect(buttonBox, &QDialogButtonBox::rejected, dialog, &QDialog::reject); layout->addWidget(buttonBox); connect(dialog, &QDialog::accepted, info, [info]() { - if (QApplication::clipboard()) - QApplication::clipboard()->setText(info->toPlainText()); + setClipboardAndSelection(info->toPlainText()); }); connect(dialog, &QDialog::rejected, dialog, [dialog]{ dialog->close(); }); dialog->resize(700, 400); diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp index 62683ef897e..40f12e350d6 100644 --- a/src/plugins/help/openpagesmanager.cpp +++ b/src/plugins/help/openpagesmanager.cpp @@ -48,7 +48,8 @@ #include using namespace Core; -using namespace Help::Internal; + +namespace Help::Internal { // -- OpenPagesManager @@ -252,5 +253,7 @@ void OpenPagesManager::openPagesContextMenu(const QPoint &point) QMenu menu; menu.addAction(Tr::tr("Copy Full Path to Clipboard")); if (menu.exec(m_comboBox->mapToGlobal(point))) - QApplication::clipboard()->setText(fileName); + Utils::setClipboardAndSelection(fileName); } + +} // Help::Internal diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index 70a8d0c8435..399f0854147 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -24,11 +24,10 @@ ****************************************************************************/ #include "searchwidget.h" + #include "helpconstants.h" -#include "helpplugin.h" #include "helptr.h" #include "localhelpmanager.h" -#include "openpagesmanager.h" #include #include @@ -40,7 +39,6 @@ #include #include -#include #include #include #include @@ -56,7 +54,7 @@ #include #include -using namespace Help::Internal; +namespace Help::Internal { SearchWidget::SearchWidget() = default; @@ -264,7 +262,7 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent) else if (usedAction == openLinkInNewTab) emit linkActivated(link, currentSearchTerms(), true/*newPage*/); else if (usedAction == copyAnchorAction) - QApplication::clipboard()->setText(link.toString()); + Utils::setClipboardAndSelection(link.toString()); } QStringList SearchWidget::currentSearchTerms() const @@ -291,3 +289,5 @@ QList SearchSideBarItem::createToolBarWidgets() static_cast(widget()), &SearchWidget::reindexDocumentation); return {reindexButton}; } + +} // Help::Internal diff --git a/src/plugins/help/textbrowserhelpviewer.cpp b/src/plugins/help/textbrowserhelpviewer.cpp index a4c72ac6f21..fe179f9c986 100644 --- a/src/plugins/help/textbrowserhelpviewer.cpp +++ b/src/plugins/help/textbrowserhelpviewer.cpp @@ -30,11 +30,11 @@ #include "localhelpmanager.h" #include + #include #include +#include -#include -#include #include #include #include @@ -43,8 +43,7 @@ #include #include -using namespace Help; -using namespace Help::Internal; +namespace Help::Internal { // -- HelpViewer @@ -342,7 +341,7 @@ void TextBrowserHelpWidget::contextMenuEvent(QContextMenuEvent *event) } if (copyAnchorAction == menu.exec(event->globalPos())) - QApplication::clipboard()->setText(link.toString()); + Utils::setClipboardAndSelection(link.toString()); } bool TextBrowserHelpWidget::eventFilter(QObject *obj, QEvent *event) @@ -409,3 +408,5 @@ void TextBrowserHelpWidget::resizeEvent(QResizeEvent *e) QTextBrowser::resizeEvent(e); scrollToTextPosition(topTextPosition); } + +} // Help::Internal diff --git a/src/plugins/languageclient/diagnosticmanager.cpp b/src/plugins/languageclient/diagnosticmanager.cpp index e81bda7bd8a..7422f5890ab 100644 --- a/src/plugins/languageclient/diagnosticmanager.cpp +++ b/src/plugins/languageclient/diagnosticmanager.cpp @@ -28,18 +28,20 @@ #include "client.h" #include + #include + #include #include #include #include #include #include + +#include #include #include -#include -#include using namespace LanguageServerProtocol; using namespace Utils; @@ -147,7 +149,7 @@ TextEditor::TextMark *DiagnosticManager::createTextMark(const FilePath &filePath action->setIcon(icon); action->setToolTip(tooltip); QObject::connect(action, &QAction::triggered, [text = diagnostic.message()]() { - QApplication::clipboard()->setText(text); + setClipboardAndSelection(text); }); auto mark = new TextMark(filePath, diagnostic, m_client->id()); mark->setActions({action}); diff --git a/src/plugins/projectexplorer/copytaskhandler.cpp b/src/plugins/projectexplorer/copytaskhandler.cpp index 4f9257cb01d..17abd6c3aeb 100644 --- a/src/plugins/projectexplorer/copytaskhandler.cpp +++ b/src/plugins/projectexplorer/copytaskhandler.cpp @@ -27,12 +27,11 @@ #include -#include -#include -#include +#include -using namespace ProjectExplorer; -using namespace ProjectExplorer::Internal; +#include + +namespace ProjectExplorer::Internal { void CopyTaskHandler::handle(const Tasks &tasks) { @@ -54,7 +53,7 @@ void CopyTaskHandler::handle(const Tasks &tasks) lines << task.file.toUserOutput() + ':' + QString::number(task.line) + ": " + type + task.description(); } - QApplication::clipboard()->setText(lines.join('\n')); + Utils::setClipboardAndSelection(lines.join('\n')); } Utils::Id CopyTaskHandler::actionManagerId() const @@ -66,3 +65,5 @@ QAction *CopyTaskHandler::createAction(QObject *parent) const { return new QAction(parent); } + +} // ProjectExplorer::Internal diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 36de99ca394..182b11205a7 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -36,28 +36,29 @@ #include #include #include + #include #include #include #include #include + #include #include #include #include +#include #include -#include #include +#include #include +#include +#include #include #include #include -#include -#include -#include -#include using namespace ProjectExplorer; using namespace Utils; @@ -356,14 +357,14 @@ void ResourceEditorPluginPrivate::copyPathContextMenu() { auto node = dynamic_cast(ProjectTree::currentNode()); QTC_ASSERT(node, return); - QApplication::clipboard()->setText(QLatin1String(resourcePrefix) + node->qrcPath()); + setClipboardAndSelection(QLatin1String(resourcePrefix) + node->qrcPath()); } void ResourceEditorPluginPrivate::copyUrlContextMenu() { auto node = dynamic_cast(ProjectTree::currentNode()); QTC_ASSERT(node, return); - QApplication::clipboard()->setText(QLatin1String(urlPrefix) + node->qrcPath()); + setClipboardAndSelection(QLatin1String(urlPrefix) + node->qrcPath()); } void ResourceEditorPluginPrivate::renamePrefixContextMenu() diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 30414a6bc69..232117824a4 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -24,27 +24,25 @@ ****************************************************************************/ #include "resourceeditorw.h" -#include "resourceeditorplugin.h" + #include "resourceeditorconstants.h" +#include "resourceeditorplugin.h" -#include #include +#include -#include #include #include #include -#include -#include +#include -#include -#include -#include -#include +#include +#include +#include + +#include #include #include -#include -#include using namespace Utils; @@ -319,7 +317,7 @@ void ResourceEditorW::renameCurrentFile() void ResourceEditorW::copyCurrentResourcePath() { - QApplication::clipboard()->setText(m_resourceEditor->currentResourcePath()); + setClipboardAndSelection(m_resourceEditor->currentResourcePath()); } void ResourceEditorW::orderList() diff --git a/src/plugins/squish/objectsmapeditorwidget.cpp b/src/plugins/squish/objectsmapeditorwidget.cpp index 221abecfe5f..40a2fe03421 100644 --- a/src/plugins/squish/objectsmapeditorwidget.cpp +++ b/src/plugins/squish/objectsmapeditorwidget.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -575,7 +576,7 @@ void ObjectsMapEditorWidget::onPasteSymbolicNameTriggered() void ObjectsMapEditorWidget::onCopyRealNameTriggered() { if (ObjectsMapTreeItem *item = selectedObjectItem()) - QApplication::clipboard()->setText(QLatin1String(item->propertiesToByteArray())); + Utils::setClipboardAndSelection(QLatin1String(item->propertiesToByteArray())); } void ObjectsMapEditorWidget::onCutSymbolicNameTriggered() diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 8a2be2d6049..5e2c5f9ed55 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -36,37 +36,41 @@ #include #include #include + #include + #include + #include #include #include #include + #include #include + #include #include #include #include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include /*! \enum VcsBase::EditorContentType @@ -337,7 +341,7 @@ void ChangeTextCursorHandler::slotDescribe() void ChangeTextCursorHandler::slotCopyRevision() { - QApplication::clipboard()->setText(m_currentChange); + setClipboardAndSelection(m_currentChange); } void ChangeTextCursorHandler::addDescribeAction(QMenu *menu, const QString &change) const @@ -486,7 +490,7 @@ void UrlTextCursorHandler::setUrlPattern(const QString &pattern) void UrlTextCursorHandler::slotCopyUrl() { - QApplication::clipboard()->setText(m_urlData.url); + setClipboardAndSelection(m_urlData.url); } void UrlTextCursorHandler::slotOpenUrl() diff --git a/src/plugins/vcsbase/vcsoutputformatter.cpp b/src/plugins/vcsbase/vcsoutputformatter.cpp index f812019e74b..0a268693e80 100644 --- a/src/plugins/vcsbase/vcsoutputformatter.cpp +++ b/src/plugins/vcsbase/vcsoutputformatter.cpp @@ -21,15 +21,15 @@ ** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ + #include "vcsoutputformatter.h" #include #include #include +#include -#include -#include #include #include #include @@ -90,11 +90,11 @@ void VcsOutputLineParser::fillLinkContextMenu( [href] { QDesktopServices::openUrl(QUrl(href)); }); menu->setDefaultAction(action); menu->addAction(tr("&Copy to clipboard: \"%1\"").arg(href), - [href] { QApplication::clipboard()->setText(href); }); + [href] { setClipboardAndSelection(href); }); return; } if (Core::IVersionControl *vcs = Core::VcsManager::findVersionControlForDirectory(workingDirectory)) vcs->fillLinkContextMenu(menu, workingDirectory, href); } -} +} // VcsBase diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp index e63ec8fedb0..55e89fd5f9b 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp @@ -24,12 +24,15 @@ ****************************************************************************/ #include "crashhandlerdialog.h" + #include "crashhandler.h" #include "ui_crashhandlerdialog.h" #include "utils.h" #include + #include +#include #include #include @@ -250,7 +253,7 @@ void CrashHandlerDialog::selectLineWithContents(const QString &text) void CrashHandlerDialog::copyToClipboardClicked() { - QApplication::clipboard()->setText(m_ui->debugInfoEdit->toPlainText()); + Utils::setClipboardAndSelection(m_ui->debugInfoEdit->toPlainText()); } void CrashHandlerDialog::close()