MAC warnings fix

preferencesAboutTextFull
Anatoly Mihalchenko 12 years ago
parent d42b4dfe70
commit 312505e5bb
  1. 9
      src/board/UBBoardView.cpp
  2. 2
      src/domain/UBGraphicsMediaItem.cpp
  3. 2
      src/domain/UBGraphicsScene.cpp
  4. 2
      src/gui/UBRubberBand.cpp
  5. 2
      src/podcast/quicktime/UBAudioQueueRecorder.cpp
  6. 2
      src/podcast/quicktime/UBQuickTimeFile.cpp

@ -426,7 +426,10 @@ bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item)
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool(); UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
if ((currentTool == UBStylusTool::Play) && UBGraphicsGroupContainerItem::Type == movingItem->type()) if ((currentTool == UBStylusTool::Play) && UBGraphicsGroupContainerItem::Type == movingItem->type())
return movingItem = NULL; {
movingItem = NULL;
return false;
}
switch(item->type()) switch(item->type())
{ {
@ -534,11 +537,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
return true; return true;
case UBGraphicsTextItem::Type: case UBGraphicsTextItem::Type:
return !item->isSelected(); return !item->isSelected();
default:
false;
} }
return false; return false;
} }

@ -57,10 +57,10 @@ UBGraphicsMediaItem::UBGraphicsMediaItem(const QUrl& pMediaFileUrl, QGraphicsIte
, mMuted(sIsMutedByDefault) , mMuted(sIsMutedByDefault)
, mMutedByUserAction(sIsMutedByDefault) , mMutedByUserAction(sIsMutedByDefault)
, mMediaFileUrl(pMediaFileUrl) , mMediaFileUrl(pMediaFileUrl)
, mInitialPos(0)
, mVideoWidget(NULL) , mVideoWidget(NULL)
, mAudioWidget(NULL) , mAudioWidget(NULL)
, mLinkedImage(NULL) , mLinkedImage(NULL)
, mInitialPos(0)
{ {
update(); update();

@ -256,8 +256,8 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
, mDocument(parent) , mDocument(parent)
, mDarkBackground(false) , mDarkBackground(false)
, mCrossedBackground(false) , mCrossedBackground(false)
, mZoomFactor(1)
, mIsDesktopMode(false) , mIsDesktopMode(false)
, mZoomFactor(1)
, mIsModified(true) , mIsModified(true)
, mBackgroundObject(0) , mBackgroundObject(0)
, mPreviousWidth(0) , mPreviousWidth(0)

@ -33,8 +33,8 @@ UBRubberBand::UBRubberBand(Shape s, QWidget * p)
: QRubberBand(s, p) : QRubberBand(s, p)
, mResizingMode(None) , mResizingMode(None)
, mMouseIsPressed(false) , mMouseIsPressed(false)
, mLastPressedPoint(QPoint())
, mResizingBorderHeight(20) , mResizingBorderHeight(20)
, mLastPressedPoint(QPoint())
{ {
customStyle = NULL; customStyle = NULL;

@ -139,7 +139,7 @@ QString UBAudioQueueRecorder::deviceUIDFromDeviceID(AudioDeviceID id)
{ {
char *cname = new char[1024]; char *cname = new char[1024];
bool result = CFStringGetCString (name, cname, 1024, kCFStringEncodingASCII); CFStringGetCString (name, cname, 1024, kCFStringEncodingASCII);
int length = CFStringGetLength (name); int length = CFStringGetLength (name);
uid = QString::fromAscii(cname, length); uid = QString::fromAscii(cname, length);

@ -151,7 +151,7 @@ bool UBQuickTimeFile::createCompressionSession()
} }
OSStatus err = noErr; OSStatus err = noErr;
ICMEncodedFrameOutputRecord encodedFrameOutputRecord = {0}; ICMEncodedFrameOutputRecord encodedFrameOutputRecord = {NULL, NULL, NULL};
ICMCompressionSessionOptionsRef sessionOptions = 0; ICMCompressionSessionOptionsRef sessionOptions = 0;
err = ICMCompressionSessionOptionsCreate(0, &sessionOptions); err = ICMCompressionSessionOptionsCreate(0, &sessionOptions);

Loading…
Cancel
Save