From 354033e6f0b6e4c2fb5875eaabe515d2af046ec3 Mon Sep 17 00:00:00 2001
From: Jekyll Wu <adaptee@gmail.com>
Date: Thu, 13 Oct 2011 09:40:38 +0800
Subject: [PATCH] Rename pasteFromSelection to pasteFromXSelection

---
 src/SessionController.cpp | 6 +++---
 src/SessionController.h   | 2 +-
 src/TerminalDisplay.cpp   | 2 +-
 src/TerminalDisplay.h     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 5b614cf7c..da2ee58c5 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -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()
 {
diff --git a/src/SessionController.h b/src/SessionController.h
index c4c12f713..147a8119a 100644
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -184,7 +184,7 @@ private slots:
     void copy();
     void paste();
     void selectAll();
-    void pasteFromSelection(); // shortcut only
+    void pasteFromXSelection(); // shortcut only
     void copyInputToAllTabs();
     void copyInputToSelectedTabs();
     void copyInputToNone();
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index e24eb9bc8..df5db8c54 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -2512,7 +2512,7 @@ void TerminalDisplay::pasteFromClipboard()
   emitSelection(false,false);
 }
 
-void TerminalDisplay::pasteFromSelection()
+void TerminalDisplay::pasteFromXSelection()
 {
   emitSelection(true,false);
 }
diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
index f9a050803..95db0b5f5 100644
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@@ -447,10 +447,10 @@ public slots:
      */
     void pasteFromClipboard();
     /**
-     * Pastes the content of the selection into the
+     * Pastes the content of the X selection into the
      * display.
      */
-    void pasteFromSelection();
+    void pasteFromXSelection();
 
     /** 
        * Changes whether the flow control warning box should be shown when the flow control