Rename pasteFromSelection to pasteFromXSelection

This commit is contained in:
Jekyll Wu
2011-10-13 09:40:38 +08:00
parent c4a3398ef8
commit 354033e6f0
4 changed files with 7 additions and 7 deletions

View File

@@ -449,7 +449,7 @@ void SessionController::setupActions()
// TODO: this shortcut conflict with the 'close-active-view' action
//action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S));
action = collection->addAction("paste-selection", this, SLOT(pasteFromSelection()));
action = collection->addAction("paste-selection", this, SLOT(pasteFromXSelection()));
action->setText(i18n("Paste Selection"));
action->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_Insert));
@@ -714,9 +714,9 @@ void SessionController::paste()
{
_view->pasteFromClipboard();
}
void SessionController::pasteFromSelection()
void SessionController::pasteFromXSelection()
{
_view->pasteFromSelection();
_view->pasteFromXSelection();
}
void SessionController::selectAll()
{