@@ -297,37 +297,37 @@ void QgsComposerItem::mouseReleaseEvent( QGraphicsSceneMouseEvent * event )
297
297
scene ()->update ();
298
298
299
299
// reset default action
300
- mCurrentMouseMoveAction = QgsComposerItem::moveItem ;
300
+ mCurrentMouseMoveAction = QgsComposerItem::MoveItem ;
301
301
setCursor ( Qt::ArrowCursor );
302
302
}
303
303
304
304
Qt::CursorShape QgsComposerItem::cursorForPosition ( const QPointF& itemCoordPos )
305
305
{
306
- QgsComposerItem::mouseMoveAction mouseAction = mouseMoveActionForPosition ( itemCoordPos );
306
+ QgsComposerItem::MouseMoveAction mouseAction = mouseMoveActionForPosition ( itemCoordPos );
307
307
308
- if ( mouseAction == QgsComposerItem::moveItem )
308
+ if ( mouseAction == QgsComposerItem::MoveItem )
309
309
{
310
310
return Qt::ClosedHandCursor;
311
311
}
312
- else if ( mouseAction == QgsComposerItem::resizeDLeftUp || mouseAction == QgsComposerItem::resizeDRightDown )
312
+ else if ( mouseAction == QgsComposerItem::ResizeLeftUp || mouseAction == QgsComposerItem::ResizeRightDown )
313
313
{
314
314
return Qt::SizeFDiagCursor;
315
315
}
316
- else if ( mouseAction == QgsComposerItem::resizeDLeftDown || mouseAction == QgsComposerItem::resizeDRightUp )
316
+ else if ( mouseAction == QgsComposerItem::ResizeLeftDown || mouseAction == QgsComposerItem::ResizeRightUp )
317
317
{
318
318
return Qt::SizeBDiagCursor;
319
319
}
320
- else if ( mouseAction == QgsComposerItem::resizeUp || mouseAction == QgsComposerItem::resizeDown )
320
+ else if ( mouseAction == QgsComposerItem::ResizeUp || mouseAction == QgsComposerItem::ResizeDown )
321
321
{
322
322
return Qt::SizeVerCursor;
323
323
}
324
- else // if(mouseAction == QgsComposerItem::resizeLeft || mouseAction == QgsComposerItem::resizeRight )
324
+ else // if(mouseAction == QgsComposerItem::ResizeLeft || mouseAction == QgsComposerItem::ResizeRight )
325
325
{
326
326
return Qt::SizeHorCursor;
327
327
}
328
328
}
329
329
330
- QgsComposerItem::mouseMoveAction QgsComposerItem::mouseMoveActionForPosition ( const QPointF& itemCoordPos )
330
+ QgsComposerItem::MouseMoveAction QgsComposerItem::mouseMoveActionForPosition ( const QPointF& itemCoordPos )
331
331
{
332
332
333
333
// move content tool
@@ -357,38 +357,38 @@ QgsComposerItem::mouseMoveAction QgsComposerItem::mouseMoveActionForPosition( co
357
357
358
358
if ( nearLeftBorder && nearUpperBorder )
359
359
{
360
- return QgsComposerItem::resizeDLeftUp ;
360
+ return QgsComposerItem::ResizeLeftUp ;
361
361
}
362
362
else if ( nearLeftBorder && nearLowerBorder )
363
363
{
364
- return QgsComposerItem::resizeDLeftDown ;
364
+ return QgsComposerItem::ResizeLeftDown ;
365
365
}
366
366
else if ( nearRightBorder && nearUpperBorder )
367
367
{
368
- return QgsComposerItem::resizeDRightUp ;
368
+ return QgsComposerItem::ResizeRightUp ;
369
369
}
370
370
else if ( nearRightBorder && nearLowerBorder )
371
371
{
372
- return QgsComposerItem::resizeDRightDown ;
372
+ return QgsComposerItem::ResizeRightDown ;
373
373
}
374
374
else if ( nearLeftBorder )
375
375
{
376
- return QgsComposerItem::resizeLeft ;
376
+ return QgsComposerItem::ResizeLeft ;
377
377
}
378
378
else if ( nearRightBorder )
379
379
{
380
- return QgsComposerItem::resizeRight ;
380
+ return QgsComposerItem::ResizeRight ;
381
381
}
382
382
else if ( nearUpperBorder )
383
383
{
384
- return QgsComposerItem::resizeUp ;
384
+ return QgsComposerItem::ResizeUp ;
385
385
}
386
386
else if ( nearLowerBorder )
387
387
{
388
- return QgsComposerItem::resizeDown ;
388
+ return QgsComposerItem::ResizeDown ;
389
389
}
390
390
391
- return QgsComposerItem::moveItem ; // default
391
+ return QgsComposerItem::MoveItem ; // default
392
392
}
393
393
394
394
@@ -397,41 +397,41 @@ void QgsComposerItem::rectangleChange( double dx, double dy, double& mx, double&
397
397
switch ( mCurrentMouseMoveAction )
398
398
{
399
399
// vertical resize
400
- case QgsComposerItem::resizeUp :
400
+ case QgsComposerItem::ResizeUp :
401
401
mx = 0 ; my = dy; rx = 0 ; ry = -dy;
402
402
break ;
403
403
404
- case QgsComposerItem::resizeDown :
404
+ case QgsComposerItem::ResizeDown :
405
405
mx = 0 ; my = 0 ; rx = 0 ; ry = dy;
406
406
break ;
407
407
408
408
// horizontal resize
409
- case QgsComposerItem::resizeLeft :
409
+ case QgsComposerItem::ResizeLeft :
410
410
mx = dx, my = 0 ; rx = -dx; ry = 0 ;
411
411
break ;
412
412
413
- case QgsComposerItem::resizeRight :
413
+ case QgsComposerItem::ResizeRight :
414
414
mx = 0 ; my = 0 ; rx = dx, ry = 0 ;
415
415
break ;
416
416
417
417
// diagonal resize
418
- case QgsComposerItem::resizeDLeftUp :
418
+ case QgsComposerItem::ResizeLeftUp :
419
419
mx = dx, my = dy; rx = -dx; ry = -dy;
420
420
break ;
421
421
422
- case QgsComposerItem::resizeDRightDown :
422
+ case QgsComposerItem::ResizeRightDown :
423
423
mx = 0 ; my = 0 ; rx = dx, ry = dy;
424
424
break ;
425
425
426
- case QgsComposerItem::resizeDRightUp :
426
+ case QgsComposerItem::ResizeRightUp :
427
427
mx = 0 ; my = dy, rx = dx, ry = -dy;
428
428
break ;
429
429
430
- case QgsComposerItem::resizeDLeftDown :
430
+ case QgsComposerItem::ResizeLeftDown :
431
431
mx = dx, my = 0 ; rx = -dx; ry = dy;
432
432
break ;
433
433
434
- case QgsComposerItem::moveItem :
434
+ case QgsComposerItem::MoveItem :
435
435
mx = dx; my = dy; rx = 0 , ry = 0 ;
436
436
break ;
437
437
}
0 commit comments