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

List:       kde-commits
Subject:    koffice/plugins/defaultTools/defaulttool
From:       Thomas Zander <zander () kde ! org>
Date:       2010-04-23 18:21:41
Message-ID: 20100423182141.1B9ACAC8A7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1118042 by zander:

Don't pass unused variable and rename method.

Also whitespace fixes (follow coding style)

 M  +10 -13    ShapeMoveStrategy.cpp  
 M  +1 -1      ShapeMoveStrategy.h  


--- trunk/koffice/plugins/defaultTools/defaulttool/ShapeMoveStrategy.cpp \
#1118041:1118042 @@ -40,7 +40,7 @@
     QList<KoShape*> selectedShapes = \
tool->canvas()->shapeManager()->selection()->selectedShapes(KoFlake::TopLevelSelection);
  QRectF boundingRect;
     foreach(KoShape *shape, selectedShapes) {
-        if( ! shape->isEditable() )
+        if (! shape->isEditable())
             continue;
         m_selectedShapes << shape;
         m_previousPositions << shape->position();
@@ -52,7 +52,7 @@
     m_initialSelectionPosition = selection->position();
     tool->canvas()->snapGuide()->setIgnoredShapes( selection->selectedShapes( \
KoFlake::FullSelection ) );  
-    tool->setStatusText( i18n("Press ALT to hold x- or y-position.") );
+    tool->setStatusText(i18n("Press ALT to hold x- or y-position."));
 }
 
 void ShapeMoveStrategy::handleMouseMove(const QPointF &point, Qt::KeyboardModifiers \
modifiers) @@ -61,15 +61,13 @@
         return;
     QPointF diff = point - m_start;
 
-    if(modifiers & (Qt::AltModifier | Qt::ControlModifier)) {
+    if (modifiers & (Qt::AltModifier | Qt::ControlModifier)) {
         // keep x or y position unchanged
         if(qAbs(diff.x()) < qAbs(diff.y()))
             diff.setX(0);
         else
             diff.setY(0);
-    }
-    else
-    {
+    } else {
         QPointF positionToSnap = point + m_initialOffset;
         tool()->canvas()->updateCanvas( \
                tool()->canvas()->snapGuide()->boundingRect() );
         QPointF snappedPosition = tool()->canvas()->snapGuide()->snap( \
positionToSnap, modifiers ); @@ -79,14 +77,14 @@
 
     m_diff = diff;
 
-    moveBy( diff );
+    moveSelection();
 }
 
-void ShapeMoveStrategy::handleCustomEvent( KoPointerEvent * event )
+void ShapeMoveStrategy::handleCustomEvent(KoPointerEvent *event)
 {
-    QPointF diff = tool()->canvas()->viewConverter()->viewToDocument( event->pos() \
); +    QPointF diff = \
tool()->canvas()->viewConverter()->viewToDocument(event->pos());  
-    if( event->modifiers() & (Qt::AltModifier | Qt::ControlModifier)) {
+    if (event->modifiers() & (Qt::AltModifier | Qt::ControlModifier)) {
         // keep x or y position unchanged
         if(qAbs(diff.x()) < qAbs(diff.y()))
             diff.setX(0);
@@ -96,12 +94,11 @@
 
     m_diff += 0.1 * diff ;
 
-    moveBy( diff );
+    moveSelection();
 }
 
-void ShapeMoveStrategy::moveBy( const QPointF &diff )
+void ShapeMoveStrategy::moveSelection()
 {
-    Q_UNUSED(diff);
     Q_ASSERT(m_newPositions.count());
 
     int i=0;
--- trunk/koffice/plugins/defaultTools/defaulttool/ShapeMoveStrategy.h \
#1118041:1118042 @@ -52,7 +52,7 @@
     virtual void paint( QPainter &painter, const KoViewConverter &converter);
     virtual void handleCustomEvent( KoPointerEvent * event );
 private:
-    void moveBy( const QPointF &diff );
+    void moveSelection();
     QList<QPointF> m_previousPositions;
     QList<QPointF> m_newPositions;
     QPointF m_start, m_diff, m_initialSelectionPosition, m_initialOffset;


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