Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
312505e5
Commit
312505e5
authored
Aug 10, 2012
by
Anatoly Mihalchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MAC warnings fix
parent
d42b4dfe
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
10 deletions
+9
-10
UBBoardView.cpp
src/board/UBBoardView.cpp
+4
-5
UBGraphicsMediaItem.cpp
src/domain/UBGraphicsMediaItem.cpp
+1
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+1
-1
UBRubberBand.cpp
src/gui/UBRubberBand.cpp
+1
-1
UBAudioQueueRecorder.cpp
src/podcast/quicktime/UBAudioQueueRecorder.cpp
+1
-1
UBQuickTimeFile.cpp
src/podcast/quicktime/UBQuickTimeFile.cpp
+1
-1
No files found.
src/board/UBBoardView.cpp
View file @
312505e5
...
...
@@ -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
;
}
...
...
src/domain/UBGraphicsMediaItem.cpp
View file @
312505e5
...
...
@@ -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
();
...
...
src/domain/UBGraphicsScene.cpp
View file @
312505e5
...
...
@@ -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
)
...
...
src/gui/UBRubberBand.cpp
View file @
312505e5
...
...
@@ -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
;
...
...
src/podcast/quicktime/UBAudioQueueRecorder.cpp
View file @
312505e5
...
...
@@ -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
);
...
...
src/podcast/quicktime/UBQuickTimeFile.cpp
View file @
312505e5
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment