diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h --- a/src/TerminalDisplay.h +++ b/src/TerminalDisplay.h @@ -591,13 +591,6 @@ void swapFGBGColors(); void viewScrolledByUser(); - /** - * Called from the drag-and-drop popup. Causes the dropped URLs to be pasted as text. - */ - void dropMenuPasteActionTriggered(); - - void dropMenuCdActionTriggered(); - void dismissOutputSuspendedMessage(); private: diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -3712,7 +3712,7 @@ QAction* pasteAction = new QAction(i18n("&Paste Location"), this); pasteAction->setData(dropText); - connect(pasteAction, &QAction::triggered, this, &TerminalDisplay::dropMenuPasteActionTriggered); + connect(pasteAction, &QAction::triggered, this, [this, dropText]{ sendStringToEmu(dropText.toLocal8Bit());} ); QList additionalActions; additionalActions.append(pasteAction); @@ -3730,7 +3730,7 @@ QAction* cdAction = new QAction(i18n("Change &Directory To"), this); dropText = QLatin1String(" cd ") + dropText + QLatin1Char('\n'); cdAction->setData(dropText); - connect(cdAction, &QAction::triggered, this, &TerminalDisplay::dropMenuCdActionTriggered); + connect(cdAction, &QAction::triggered, this, [this, dropText]{ sendStringToEmu(dropText.toLocal8Bit());} ); additionalActions.append(cdAction); } } @@ -3755,26 +3755,6 @@ } } -void TerminalDisplay::dropMenuPasteActionTriggered() -{ - if (sender() != nullptr) { - const auto* action = qobject_cast(sender()); - if (action != nullptr) { - emit sendStringToEmu(action->data().toString().toLocal8Bit()); - } - } -} - -void TerminalDisplay::dropMenuCdActionTriggered() -{ - if (sender() != nullptr) { - const auto* action = qobject_cast(sender()); - if (action != nullptr) { - emit sendStringToEmu(action->data().toString().toLocal8Bit()); - } - } -} - void TerminalDisplay::doDrag() { const QMimeData *clipboardMimeData = QApplication::clipboard()->mimeData(QClipboard::Selection);