[QGIS Commit] r9562 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-11-02 00:21:57 -0400 (Sun, 02 Nov 2008)
New Revision: 9562

Modified:
   trunk/qgis/src/core/composer/qgscomposeritem.cpp
   trunk/qgis/src/core/composer/qgscomposeritem.h
Log:
Api cleanups

Modified: trunk/qgis/src/core/composer/qgscomposeritem.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritem.cpp	2008-11-01 22:27:37 UTC (rev 9561)
+++ trunk/qgis/src/core/composer/qgscomposeritem.cpp	2008-11-02 04:21:57 UTC (rev 9562)
@@ -297,37 +297,37 @@
   scene()->update();
 
   //reset default action
-  mCurrentMouseMoveAction = QgsComposerItem::moveItem;
+  mCurrentMouseMoveAction = QgsComposerItem::MoveItem;
   setCursor( Qt::ArrowCursor );
 }
 
 Qt::CursorShape QgsComposerItem::cursorForPosition( const QPointF& itemCoordPos )
 {
-  QgsComposerItem::mouseMoveAction mouseAction = mouseMoveActionForPosition( itemCoordPos );
+  QgsComposerItem::MouseMoveAction mouseAction = mouseMoveActionForPosition( itemCoordPos );
 
-  if ( mouseAction == QgsComposerItem::moveItem )
+  if ( mouseAction == QgsComposerItem::MoveItem )
   {
     return Qt::ClosedHandCursor;
   }
-  else if ( mouseAction == QgsComposerItem::resizeDLeftUp || mouseAction == QgsComposerItem::resizeDRightDown )
+  else if ( mouseAction == QgsComposerItem::ResizeLeftUp || mouseAction == QgsComposerItem::ResizeRightDown )
   {
     return Qt::SizeFDiagCursor;
   }
-  else if ( mouseAction == QgsComposerItem::resizeDLeftDown || mouseAction == QgsComposerItem::resizeDRightUp )
+  else if ( mouseAction == QgsComposerItem::ResizeLeftDown || mouseAction == QgsComposerItem::ResizeRightUp )
   {
     return Qt::SizeBDiagCursor;
   }
-  else if ( mouseAction == QgsComposerItem::resizeUp || mouseAction == QgsComposerItem::resizeDown )
+  else if ( mouseAction == QgsComposerItem::ResizeUp || mouseAction == QgsComposerItem::ResizeDown )
   {
     return Qt::SizeVerCursor;
   }
-  else //if(mouseAction == QgsComposerItem::resizeLeft || mouseAction == QgsComposerItem::resizeRight)
+  else //if(mouseAction == QgsComposerItem::ResizeLeft || mouseAction == QgsComposerItem::ResizeRight)
   {
     return Qt::SizeHorCursor;
   }
 }
 
-QgsComposerItem::mouseMoveAction QgsComposerItem::mouseMoveActionForPosition( const QPointF& itemCoordPos )
+QgsComposerItem::MouseMoveAction QgsComposerItem::mouseMoveActionForPosition( const QPointF& itemCoordPos )
 {
 
   //move content tool
@@ -357,38 +357,38 @@
 
   if ( nearLeftBorder && nearUpperBorder )
   {
-    return QgsComposerItem::resizeDLeftUp;
+    return QgsComposerItem::ResizeLeftUp;
   }
   else if ( nearLeftBorder && nearLowerBorder )
   {
-    return QgsComposerItem::resizeDLeftDown;
+    return QgsComposerItem::ResizeLeftDown;
   }
   else if ( nearRightBorder && nearUpperBorder )
   {
-    return QgsComposerItem::resizeDRightUp;
+    return QgsComposerItem::ResizeRightUp;
   }
   else if ( nearRightBorder && nearLowerBorder )
   {
-    return QgsComposerItem::resizeDRightDown;
+    return QgsComposerItem::ResizeRightDown;
   }
   else if ( nearLeftBorder )
   {
-    return QgsComposerItem::resizeLeft;
+    return QgsComposerItem::ResizeLeft;
   }
   else if ( nearRightBorder )
   {
-    return QgsComposerItem::resizeRight;
+    return QgsComposerItem::ResizeRight;
   }
   else if ( nearUpperBorder )
   {
-    return QgsComposerItem::resizeUp;
+    return QgsComposerItem::ResizeUp;
   }
   else if ( nearLowerBorder )
   {
-    return QgsComposerItem::resizeDown;
+    return QgsComposerItem::ResizeDown;
   }
 
-  return QgsComposerItem::moveItem; //default
+  return QgsComposerItem::MoveItem; //default
 }
 
 
@@ -397,41 +397,41 @@
   switch ( mCurrentMouseMoveAction )
   {
       //vertical resize
-    case QgsComposerItem::resizeUp:
+    case QgsComposerItem::ResizeUp:
       mx = 0; my = dy; rx = 0; ry = -dy;
       break;
 
-    case QgsComposerItem::resizeDown:
+    case QgsComposerItem::ResizeDown:
       mx = 0; my = 0; rx = 0; ry = dy;
       break;
 
       //horizontal resize
-    case QgsComposerItem::resizeLeft:
+    case QgsComposerItem::ResizeLeft:
       mx = dx, my = 0; rx = -dx; ry = 0;
       break;
 
-    case QgsComposerItem::resizeRight:
+    case QgsComposerItem::ResizeRight:
       mx = 0; my = 0; rx = dx, ry = 0;
       break;
 
       //diagonal resize
-    case QgsComposerItem::resizeDLeftUp:
+    case QgsComposerItem::ResizeLeftUp:
       mx = dx, my = dy; rx = -dx; ry = -dy;
       break;
 
-    case QgsComposerItem::resizeDRightDown:
+    case QgsComposerItem::ResizeRightDown:
       mx = 0; my = 0; rx = dx, ry = dy;
       break;
 
-    case QgsComposerItem::resizeDRightUp:
+    case QgsComposerItem::ResizeRightUp:
       mx = 0; my = dy, rx = dx, ry = -dy;
       break;
 
-    case QgsComposerItem::resizeDLeftDown:
+    case QgsComposerItem::ResizeLeftDown:
       mx = dx, my = 0; rx = -dx; ry = dy;
       break;
 
-    case QgsComposerItem::moveItem:
+    case QgsComposerItem::MoveItem:
       mx = dx; my = dy; rx = 0, ry = 0;
       break;
   }

Modified: trunk/qgis/src/core/composer/qgscomposeritem.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritem.h	2008-11-01 22:27:37 UTC (rev 9561)
+++ trunk/qgis/src/core/composer/qgscomposeritem.h	2008-11-02 04:21:57 UTC (rev 9562)
@@ -35,17 +35,17 @@
   public:
 
     /**Describes the action (move or resize in different directon) to be done during mouse move*/
-    enum mouseMoveAction
+    enum MouseMoveAction
     {
-      moveItem,
-      resizeUp,
-      resizeDown,
-      resizeLeft,
-      resizeRight,
-      resizeDLeftUp,
-      resizeDRightUp,
-      resizeDLeftDown,
-      resizeDRightDown
+      MoveItem,
+      ResizeUp,
+      ResizeDown,
+      ResizeLeft,
+      ResizeRight,
+      ResizeLeftUp,
+      ResizeRightUp,
+      ResizeLeftDown,
+      ResizeRightDown
     };
 
     QgsComposerItem( QgsComposition* composition );
@@ -139,7 +139,7 @@
 
     QgsComposition* mComposition;
 
-    QgsComposerItem::mouseMoveAction mCurrentMouseMoveAction;
+    QgsComposerItem::MouseMoveAction mCurrentMouseMoveAction;
     /**Start point of the last mouse move action (in scene coordinates)*/
     QPointF mMouseMoveStartPos;
     /**Position of the last mouse move event (in item coordinates)*/
@@ -162,7 +162,7 @@
     Qt::CursorShape cursorForPosition( const QPointF& itemCoordPos );
 
     /**Finds out which mouse move action to choose depending on the cursor position inside the widget*/
-    QgsComposerItem::mouseMoveAction mouseMoveActionForPosition( const QPointF& itemCoordPos );
+    QgsComposerItem::MouseMoveAction mouseMoveActionForPosition( const QPointF& itemCoordPos );
 
     /**Calculate rectangle changes according to mouse move (dx, dy) and the current mouse move action
        @param dx x-coordinate move of cursor