diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 4953c018..c6abca0d 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -426,7 +426,10 @@ bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item) UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool(); if ((currentTool == UBStylusTool::Play) && UBGraphicsGroupContainerItem::Type == movingItem->type()) - return movingItem = NULL; + { + movingItem = NULL; + return false; + } switch(item->type()) { @@ -534,11 +537,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item) return true; case UBGraphicsTextItem::Type: return !item->isSelected(); - - default: - false; } - return false; } diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp index e14aac6f..977aa8d9 100644 --- a/src/domain/UBGraphicsMediaItem.cpp +++ b/src/domain/UBGraphicsMediaItem.cpp @@ -57,10 +57,10 @@ UBGraphicsMediaItem::UBGraphicsMediaItem(const QUrl& pMediaFileUrl, QGraphicsIte , mMuted(sIsMutedByDefault) , mMutedByUserAction(sIsMutedByDefault) , mMediaFileUrl(pMediaFileUrl) - , mInitialPos(0) , mVideoWidget(NULL) , mAudioWidget(NULL) , mLinkedImage(NULL) + , mInitialPos(0) { update(); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 1c45145f..5267fa71 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -256,8 +256,8 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent) , mDocument(parent) , mDarkBackground(false) , mCrossedBackground(false) - , mZoomFactor(1) , mIsDesktopMode(false) + , mZoomFactor(1) , mIsModified(true) , mBackgroundObject(0) , mPreviousWidth(0) diff --git a/src/gui/UBRubberBand.cpp b/src/gui/UBRubberBand.cpp index a2919c60..1ca224f3 100644 --- a/src/gui/UBRubberBand.cpp +++ b/src/gui/UBRubberBand.cpp @@ -33,8 +33,8 @@ UBRubberBand::UBRubberBand(Shape s, QWidget * p) : QRubberBand(s, p) , mResizingMode(None) , mMouseIsPressed(false) - , mLastPressedPoint(QPoint()) , mResizingBorderHeight(20) + , mLastPressedPoint(QPoint()) { customStyle = NULL; diff --git a/src/podcast/quicktime/UBAudioQueueRecorder.cpp b/src/podcast/quicktime/UBAudioQueueRecorder.cpp index 12c94b63..cfe3b81a 100644 --- a/src/podcast/quicktime/UBAudioQueueRecorder.cpp +++ b/src/podcast/quicktime/UBAudioQueueRecorder.cpp @@ -139,7 +139,7 @@ QString UBAudioQueueRecorder::deviceUIDFromDeviceID(AudioDeviceID id) { char *cname = new char[1024]; - bool result = CFStringGetCString (name, cname, 1024, kCFStringEncodingASCII); + CFStringGetCString (name, cname, 1024, kCFStringEncodingASCII); int length = CFStringGetLength (name); uid = QString::fromAscii(cname, length); diff --git a/src/podcast/quicktime/UBQuickTimeFile.cpp b/src/podcast/quicktime/UBQuickTimeFile.cpp index 105cf83d..4caef665 100644 --- a/src/podcast/quicktime/UBQuickTimeFile.cpp +++ b/src/podcast/quicktime/UBQuickTimeFile.cpp @@ -151,7 +151,7 @@ bool UBQuickTimeFile::createCompressionSession() } OSStatus err = noErr; - ICMEncodedFrameOutputRecord encodedFrameOutputRecord = {0}; + ICMEncodedFrameOutputRecord encodedFrameOutputRecord = {NULL, NULL, NULL}; ICMCompressionSessionOptionsRef sessionOptions = 0; err = ICMCompressionSessionOptionsCreate(0, &sessionOptions);