From cf0a3e3cd0b64cfff29f619c6f018d3ea265eb64 Mon Sep 17 00:00:00 2001
From: Jekyll Wu <adaptee@gmail.com>
Date: Fri, 16 Mar 2012 16:46:29 +0800
Subject: [PATCH] Merge Profile::TripleClickModeEnum and
 TerminalDisplay::TripleClickMode into Enum::TripleClickModeEnum

---
 src/Enumeration.h       |  8 ++++++++
 src/Profile.cpp         |  2 +-
 src/Profile.h           |  8 --------
 src/TerminalDisplay.cpp |  6 +++---
 src/TerminalDisplay.h   | 16 +++-------------
 src/ViewManager.cpp     |  2 +-
 6 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/Enumeration.h b/src/Enumeration.h
index 120dc66e5..0e0588452 100644
--- a/src/Enumeration.h
+++ b/src/Enumeration.h
@@ -76,6 +76,14 @@ public:
         UnderlineCursor = 2
     };
 
+    /** This enum describes the behavior of triple click action . */
+    enum TripleClickModeEnum {
+        /** Select the whole line underneath the cursor. */
+        SelectWholeLine = 0,
+        /** Select from the current cursor position to the end of the line. */
+        SelectForwardsFromCursor = 1
+    };
+
 };
 
 }
diff --git a/src/Profile.cpp b/src/Profile.cpp
index 8ed41f125..78fbbf53a 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -166,7 +166,7 @@ FallbackProfile::FallbackProfile()
     setProperty(FlowControlEnabled, true);
     setProperty(BlinkingTextEnabled, true);
     setProperty(UnderlineLinksEnabled, true);
-    setProperty(TripleClickMode, SelectWholeLine);
+    setProperty(TripleClickMode, Enum::SelectWholeLine);
 
     setProperty(BlinkingCursorEnabled, false);
     setProperty(BidiRenderingEnabled, true);
diff --git a/src/Profile.h b/src/Profile.h
index 9e487af9a..5a7035232 100644
--- a/src/Profile.h
+++ b/src/Profile.h
@@ -211,14 +211,6 @@ public:
         MenuIndex
     };
 
-    /** This enum describes the behavior of triple click action . */
-    enum TripleClickModeEnum {
-        /** Select the whole line underneath the cursor. */
-        SelectWholeLine = 0,
-        /** Select from the current cursor position to the end of the line. */
-        SelectForwardsFromCursor = 1
-    };
-
     /** This enum describes the behavior of bell . */
     enum BellModeEnum {
         /** trigger system beep. */
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index cab1187ef..8570bc58a 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -292,7 +292,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent)
     , _underlineLinks(true)
     , _isFixedSize(false)
     , _ctrlDrag(true)
-    , _tripleClickMode(SelectWholeLine)
+    , _tripleClickMode(Enum::SelectWholeLine)
     , _possibleTripleClick(false)
     , _resizeWidget(0)
     , _resizeTimer(0)
@@ -2325,7 +2325,7 @@ void TerminalDisplay::mouseTripleClickEvent(QMouseEvent* ev)
     while (_iPntSel.y() > 0 && (_lineProperties[_iPntSel.y() - 1] & LINE_WRAPPED))
         _iPntSel.ry()--;
 
-    if (_tripleClickMode == SelectForwardsFromCursor) {
+    if (_tripleClickMode == Enum::SelectForwardsFromCursor) {
         // find word boundary start
         int i = loc(_iPntSel.x(), _iPntSel.y());
         const QChar selClass = charClass(_image[i]);
@@ -2346,7 +2346,7 @@ void TerminalDisplay::mouseTripleClickEvent(QMouseEvent* ev)
 
         _screenWindow->setSelectionStart(x , _iPntSel.y() , false);
         _tripleSelBegin = QPoint(x, _iPntSel.y());
-    } else if (_tripleClickMode == SelectWholeLine) {
+    } else if (_tripleClickMode == Enum::SelectWholeLine) {
         _screenWindow->setSelectionStart(0 , _iPntSel.y() , false);
         _tripleSelBegin = QPoint(0, _iPntSel.y());
     }
diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
index 6c39d1b5e..e5d4b6109 100644
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@@ -158,22 +158,12 @@ public:
         return _ctrlDrag;
     }
 
-    /**
-     *  This enum describes the methods for selecting text when
-      *  the user triple-clicks within the display.
-      */
-    enum TripleClickMode {
-        /** Select the whole line underneath the cursor. */
-        SelectWholeLine,
-        /** Select from the current cursor position to the end of the line. */
-        SelectForwardsFromCursor
-    };
     /** Sets how the text is selected when the user triple clicks within the display. */
-    void setTripleClickMode(TripleClickMode mode) {
+    void setTripleClickMode(Enum::TripleClickModeEnum mode) {
         _tripleClickMode = mode;
     }
     /** See setTripleClickSelectionMode() */
-    TripleClickMode tripleClickMode() const {
+    Enum::TripleClickModeEnum tripleClickMode() const {
         return _tripleClickMode;
     }
 
@@ -787,7 +777,7 @@ private:
 
     bool _ctrlDrag; // require Ctrl key for drag selected text
 
-    TripleClickMode _tripleClickMode;
+    Enum::TripleClickModeEnum _tripleClickMode;
     bool _possibleTripleClick;  // is set in mouseDoubleClickEvent and deleted
     // after QApplication::doubleClickInterval() delay
 
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index f3da6ef5b..efb170e05 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -803,7 +803,7 @@ void ViewManager::applyProfileToView(TerminalDisplay* view , const Profile::Ptr
     view->setBlinkingTextEnabled(blinkingText);
 
     int tripleClickMode = profile->property<int>(Profile::TripleClickMode);
-    view->setTripleClickMode(TerminalDisplay::TripleClickMode(tripleClickMode));
+    view->setTripleClickMode(Enum::TripleClickModeEnum(tripleClickMode));
 
     view->setUnderlineLinks(profile->property<bool>(Profile::UnderlineLinksEnabled));