From c28c971801d6beba87ecc5e2ee7ebd78abe113b9 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 27 Sep 2012 08:20:22 +0200 Subject: [PATCH] some estitics --- src/board/UBBoardView.cpp | 5 +---- src/domain/UBGraphicsScene.cpp | 4 ++-- src/domain/UBGraphicsWidgetItem.cpp | 4 +--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index a29e8e63..1d68cc8a 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -308,7 +308,6 @@ UBBoardView::event (QEvent * e) if (gestureEvent) { QSwipeGesture* swipe = dynamic_cast (gestureEvent->gesture (Qt::SwipeGesture)); - if (swipe) { if (swipe->horizontalDirection () == QSwipeGesture::Left) @@ -363,9 +362,7 @@ void UBBoardView::tabletEvent (QTabletEvent * event) QPointF scenePos = viewportTransform ().inverted ().map (tabletPos); qreal pressure = 1.0; - if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) - && mPenPressureSensitive) - || (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive)) + if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) && mPenPressureSensitive) || (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive)) pressure = event->pressure (); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 1b48cbf0..b36c1e13 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -582,8 +582,8 @@ bool UBGraphicsScene::inputDeviceRelease() addItem(pStrokes); mDrawWithCompass = false; - }else if (mCurrentStroke) - { + } + else if (mCurrentStroke){ UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup(); // Remove the strokes that were just drawn here and replace them by a stroke item diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 1178219a..53ecc53a 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -563,10 +563,8 @@ void UBGraphicsWidgetItem::injectInlineJavaScript() void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - if(!scene() || !scene()->renderingContext()) - return; - if (scene()->renderingContext() != UBGraphicsScene::Screen) + if (scene() && scene()->renderingContext() != UBGraphicsScene::Screen) { painter->drawPixmap(0, 0, snapshot()); }