[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/kolourpaint/tools/selection
From:       Clarence Dang <dang () kde ! org>
Date:       2006-11-20 14:03:39
Message-ID: 1164031419.638308.25993.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 606458 by dang:

Push down kpToolSelection::onSelectionToSelectText() into kpToolText; we lose some \
debug doing this in kpToolSelection::cursor(), oh well


 M  +1 -12     kptoolselection.cpp  
 M  +0 -1      kptoolselection.h  
 M  +12 -0     kptooltext.cpp  
 M  +3 -0      kptooltext.h  


--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kptoolselection.cpp \
#606457:606458 @@ -122,17 +122,7 @@
     return v->mouseOnSelectionResizeHandle (m_currentViewPoint);
 }
 
-// protected
-bool kpToolSelection::onSelectionToSelectText () const
-{
-    kpView *v = viewManager ()->viewUnderCursor ();
-    if (!v)
-        return 0;
 
-    return v->mouseOnSelectionToSelectText (m_currentViewPoint);
-}
-
-
 // protected virtual
 QString kpToolSelection::haventBegunDrawUserMessageOnResizeHandle () const
 {
@@ -424,8 +414,7 @@
     else if (sel && sel->contains (m_currentPoint))
     {
     #if DEBUG_KP_TOOL_SELECTION && 1
-        kDebug () << "\tsel contains currentPoint; selecting text? "
-                   << onSelectionToSelectText () << endl;
+        kDebug () << "\tsel contains currentPoint" << endl;
     #endif
         return /*virtual*/cursorInsideSelection ();
     }
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kptoolselection.h \
#606457:606458 @@ -72,7 +72,6 @@
 protected:
     bool onSelectionToMove () const;
     int onSelectionResizeHandle () const;
-    bool onSelectionToSelectText () const;
 
 protected:
     // Appropriate one called by haventBegunDrawUserMessage().
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kptooltext.cpp #606457:606458
@@ -47,6 +47,7 @@
 #include <kpToolTextEnterCommand.h>
 #include <kpToolTextInsertCommand.h>
 #include <kptoolwidgetopaqueortransparent.h>
+#include <kpview.h>
 #include <kpviewmanager.h>
 
 
@@ -66,6 +67,17 @@
 }
 
 
+// private
+bool kpToolText::onSelectionToSelectText () const
+{
+    kpView *v = viewManager ()->viewUnderCursor ();
+    if (!v)
+        return 0;
+
+    return v->mouseOnSelectionToSelectText (m_currentViewPoint);
+}
+
+
 // protected virtual [base kpToolSelection]
 QString kpToolText::haventBegunDrawUserMessageOnResizeHandle () const
 {
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kptooltext.h #606457:606458
@@ -55,6 +55,9 @@
     kpToolText (kpMainWindow *mainWindow);
     virtual ~kpToolText ();
 
+private:
+    bool onSelectionToSelectText () const;
+
 protected:
     virtual QString haventBegunDrawUserMessageOnResizeHandle () const;
     virtual QString haventBegunDrawUserMessageInsideSelection () const;


[prev in list] [next in list] [prev in thread] [next in thread]