Skip to content

Commit b0a539a

Browse files
author
timlinux
committed
Api cleanups
git-svn-id: http://svn.osgeo.org/qgis/trunk@9562 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 785dd83 commit b0a539a

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

src/core/composer/qgscomposeritem.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -297,37 +297,37 @@ void QgsComposerItem::mouseReleaseEvent( QGraphicsSceneMouseEvent * event )
297297
scene()->update();
298298

299299
//reset default action
300-
mCurrentMouseMoveAction = QgsComposerItem::moveItem;
300+
mCurrentMouseMoveAction = QgsComposerItem::MoveItem;
301301
setCursor( Qt::ArrowCursor );
302302
}
303303

304304
Qt::CursorShape QgsComposerItem::cursorForPosition( const QPointF& itemCoordPos )
305305
{
306-
QgsComposerItem::mouseMoveAction mouseAction = mouseMoveActionForPosition( itemCoordPos );
306+
QgsComposerItem::MouseMoveAction mouseAction = mouseMoveActionForPosition( itemCoordPos );
307307

308-
if ( mouseAction == QgsComposerItem::moveItem )
308+
if ( mouseAction == QgsComposerItem::MoveItem )
309309
{
310310
return Qt::ClosedHandCursor;
311311
}
312-
else if ( mouseAction == QgsComposerItem::resizeDLeftUp || mouseAction == QgsComposerItem::resizeDRightDown )
312+
else if ( mouseAction == QgsComposerItem::ResizeLeftUp || mouseAction == QgsComposerItem::ResizeRightDown )
313313
{
314314
return Qt::SizeFDiagCursor;
315315
}
316-
else if ( mouseAction == QgsComposerItem::resizeDLeftDown || mouseAction == QgsComposerItem::resizeDRightUp )
316+
else if ( mouseAction == QgsComposerItem::ResizeLeftDown || mouseAction == QgsComposerItem::ResizeRightUp )
317317
{
318318
return Qt::SizeBDiagCursor;
319319
}
320-
else if ( mouseAction == QgsComposerItem::resizeUp || mouseAction == QgsComposerItem::resizeDown )
320+
else if ( mouseAction == QgsComposerItem::ResizeUp || mouseAction == QgsComposerItem::ResizeDown )
321321
{
322322
return Qt::SizeVerCursor;
323323
}
324-
else //if(mouseAction == QgsComposerItem::resizeLeft || mouseAction == QgsComposerItem::resizeRight)
324+
else //if(mouseAction == QgsComposerItem::ResizeLeft || mouseAction == QgsComposerItem::ResizeRight)
325325
{
326326
return Qt::SizeHorCursor;
327327
}
328328
}
329329

330-
QgsComposerItem::mouseMoveAction QgsComposerItem::mouseMoveActionForPosition( const QPointF& itemCoordPos )
330+
QgsComposerItem::MouseMoveAction QgsComposerItem::mouseMoveActionForPosition( const QPointF& itemCoordPos )
331331
{
332332

333333
//move content tool
@@ -357,38 +357,38 @@ QgsComposerItem::mouseMoveAction QgsComposerItem::mouseMoveActionForPosition( co
357357

358358
if ( nearLeftBorder && nearUpperBorder )
359359
{
360-
return QgsComposerItem::resizeDLeftUp;
360+
return QgsComposerItem::ResizeLeftUp;
361361
}
362362
else if ( nearLeftBorder && nearLowerBorder )
363363
{
364-
return QgsComposerItem::resizeDLeftDown;
364+
return QgsComposerItem::ResizeLeftDown;
365365
}
366366
else if ( nearRightBorder && nearUpperBorder )
367367
{
368-
return QgsComposerItem::resizeDRightUp;
368+
return QgsComposerItem::ResizeRightUp;
369369
}
370370
else if ( nearRightBorder && nearLowerBorder )
371371
{
372-
return QgsComposerItem::resizeDRightDown;
372+
return QgsComposerItem::ResizeRightDown;
373373
}
374374
else if ( nearLeftBorder )
375375
{
376-
return QgsComposerItem::resizeLeft;
376+
return QgsComposerItem::ResizeLeft;
377377
}
378378
else if ( nearRightBorder )
379379
{
380-
return QgsComposerItem::resizeRight;
380+
return QgsComposerItem::ResizeRight;
381381
}
382382
else if ( nearUpperBorder )
383383
{
384-
return QgsComposerItem::resizeUp;
384+
return QgsComposerItem::ResizeUp;
385385
}
386386
else if ( nearLowerBorder )
387387
{
388-
return QgsComposerItem::resizeDown;
388+
return QgsComposerItem::ResizeDown;
389389
}
390390

391-
return QgsComposerItem::moveItem; //default
391+
return QgsComposerItem::MoveItem; //default
392392
}
393393

394394

@@ -397,41 +397,41 @@ void QgsComposerItem::rectangleChange( double dx, double dy, double& mx, double&
397397
switch ( mCurrentMouseMoveAction )
398398
{
399399
//vertical resize
400-
case QgsComposerItem::resizeUp:
400+
case QgsComposerItem::ResizeUp:
401401
mx = 0; my = dy; rx = 0; ry = -dy;
402402
break;
403403

404-
case QgsComposerItem::resizeDown:
404+
case QgsComposerItem::ResizeDown:
405405
mx = 0; my = 0; rx = 0; ry = dy;
406406
break;
407407

408408
//horizontal resize
409-
case QgsComposerItem::resizeLeft:
409+
case QgsComposerItem::ResizeLeft:
410410
mx = dx, my = 0; rx = -dx; ry = 0;
411411
break;
412412

413-
case QgsComposerItem::resizeRight:
413+
case QgsComposerItem::ResizeRight:
414414
mx = 0; my = 0; rx = dx, ry = 0;
415415
break;
416416

417417
//diagonal resize
418-
case QgsComposerItem::resizeDLeftUp:
418+
case QgsComposerItem::ResizeLeftUp:
419419
mx = dx, my = dy; rx = -dx; ry = -dy;
420420
break;
421421

422-
case QgsComposerItem::resizeDRightDown:
422+
case QgsComposerItem::ResizeRightDown:
423423
mx = 0; my = 0; rx = dx, ry = dy;
424424
break;
425425

426-
case QgsComposerItem::resizeDRightUp:
426+
case QgsComposerItem::ResizeRightUp:
427427
mx = 0; my = dy, rx = dx, ry = -dy;
428428
break;
429429

430-
case QgsComposerItem::resizeDLeftDown:
430+
case QgsComposerItem::ResizeLeftDown:
431431
mx = dx, my = 0; rx = -dx; ry = dy;
432432
break;
433433

434-
case QgsComposerItem::moveItem:
434+
case QgsComposerItem::MoveItem:
435435
mx = dx; my = dy; rx = 0, ry = 0;
436436
break;
437437
}

src/core/composer/qgscomposeritem.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
3535
public:
3636

3737
/**Describes the action (move or resize in different directon) to be done during mouse move*/
38-
enum mouseMoveAction
38+
enum MouseMoveAction
3939
{
40-
moveItem,
41-
resizeUp,
42-
resizeDown,
43-
resizeLeft,
44-
resizeRight,
45-
resizeDLeftUp,
46-
resizeDRightUp,
47-
resizeDLeftDown,
48-
resizeDRightDown
40+
MoveItem,
41+
ResizeUp,
42+
ResizeDown,
43+
ResizeLeft,
44+
ResizeRight,
45+
ResizeLeftUp,
46+
ResizeRightUp,
47+
ResizeLeftDown,
48+
ResizeRightDown
4949
};
5050

5151
QgsComposerItem( QgsComposition* composition );
@@ -139,7 +139,7 @@ class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
139139

140140
QgsComposition* mComposition;
141141

142-
QgsComposerItem::mouseMoveAction mCurrentMouseMoveAction;
142+
QgsComposerItem::MouseMoveAction mCurrentMouseMoveAction;
143143
/**Start point of the last mouse move action (in scene coordinates)*/
144144
QPointF mMouseMoveStartPos;
145145
/**Position of the last mouse move event (in item coordinates)*/
@@ -162,7 +162,7 @@ class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
162162
Qt::CursorShape cursorForPosition( const QPointF& itemCoordPos );
163163

164164
/**Finds out which mouse move action to choose depending on the cursor position inside the widget*/
165-
QgsComposerItem::mouseMoveAction mouseMoveActionForPosition( const QPointF& itemCoordPos );
165+
QgsComposerItem::MouseMoveAction mouseMoveActionForPosition( const QPointF& itemCoordPos );
166166

167167
/**Calculate rectangle changes according to mouse move (dx, dy) and the current mouse move action
168168
@param dx x-coordinate move of cursor

0 commit comments

Comments
 (0)