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
cb2608fd
Commit
cb2608fd
authored
Oct 12, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zero warning build on linux
parent
9aa11485
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
56 deletions
+45
-56
UBSvgSubsetAdaptor.cpp
src/adaptors/UBSvgSubsetAdaptor.cpp
+0
-3
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+15
-16
UBGraphicsDelegateFrame.cpp
src/domain/UBGraphicsDelegateFrame.cpp
+23
-28
UBGraphicsDelegateFrame.h
src/domain/UBGraphicsDelegateFrame.h
+0
-1
UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.cpp
+0
-3
UBToolWidget.cpp
src/gui/UBToolWidget.cpp
+7
-5
No files found.
src/adaptors/UBSvgSubsetAdaptor.cpp
View file @
cb2608fd
...
@@ -1002,9 +1002,6 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup()
...
@@ -1002,9 +1002,6 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup()
UBGraphicsGroupContainerItem
*
group
=
new
UBGraphicsGroupContainerItem
();
UBGraphicsGroupContainerItem
*
group
=
new
UBGraphicsGroupContainerItem
();
QMultiMap
<
QString
,
UBGraphicsPolygonItem
*>
strokesGroupsContainer
;
QMultiMap
<
QString
,
UBGraphicsPolygonItem
*>
strokesGroupsContainer
;
QList
<
QGraphicsItem
*>
groupContainer
;
QList
<
QGraphicsItem
*>
groupContainer
;
QString
currentStrokeIdentifier
;
QUuid
groupUuid
=
QUuid
(
mXmlReader
.
attributes
().
value
(
aId
).
toString
());
mXmlReader
.
readNext
();
mXmlReader
.
readNext
();
while
(
!
mXmlReader
.
atEnd
())
while
(
!
mXmlReader
.
atEnd
())
...
...
src/board/UBBoardPaletteManager.cpp
View file @
cb2608fd
...
@@ -995,7 +995,6 @@ void UBBoardPaletteManager::startDownloads()
...
@@ -995,7 +995,6 @@ void UBBoardPaletteManager::startDownloads()
mDownloadInProgress
=
true
;
mDownloadInProgress
=
true
;
mpDownloadWidget
->
setVisibleState
(
true
);
mpDownloadWidget
->
setVisibleState
(
true
);
mRightPalette
->
addTab
(
mpDownloadWidget
);
mRightPalette
->
addTab
(
mpDownloadWidget
);
mpDownloadWidget
;
}
}
}
}
...
...
src/domain/UBGraphicsDelegateFrame.cpp
View file @
cb2608fd
...
@@ -382,11 +382,6 @@ QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY)
...
@@ -382,11 +382,6 @@ QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY)
}
}
void
UBGraphicsDelegateFrame
::
scaleByPos
(
qreal
scaleX
,
qreal
scaleY
)
{
}
void
UBGraphicsDelegateFrame
::
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
)
void
UBGraphicsDelegateFrame
::
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
)
{
{
if
(
None
==
mCurrentTool
)
if
(
None
==
mCurrentTool
)
...
...
src/domain/UBGraphicsDelegateFrame.h
View file @
cb2608fd
...
@@ -40,7 +40,6 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
...
@@ -40,7 +40,6 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
QPointF
getFixedPointFromPos
();
QPointF
getFixedPointFromPos
();
QSizeF
getResizeVector
(
qreal
moveX
,
qreal
moveY
);
QSizeF
getResizeVector
(
qreal
moveX
,
qreal
moveY
);
QSizeF
resizeDelegate
(
qreal
moveX
,
qreal
moveY
);
QSizeF
resizeDelegate
(
qreal
moveX
,
qreal
moveY
);
void
scaleByPos
(
qreal
scaleX
,
qreal
scaleY
);
virtual
void
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
);
...
...
src/gui/UBFeaturesWidget.cpp
View file @
cb2608fd
...
@@ -234,9 +234,6 @@ void UBFeaturesWidget::onDisplayMetadata( QMap<QString,QString> metadata )
...
@@ -234,9 +234,6 @@ void UBFeaturesWidget::onDisplayMetadata( QMap<QString,QString> metadata )
QString
widgetsUrl
=
QUrl
::
fromEncoded
(
metadata
[
"Url"
].
toAscii
()).
toString
()
/*metadata.value("Url", QString())*/
;
QString
widgetsUrl
=
QUrl
::
fromEncoded
(
metadata
[
"Url"
].
toAscii
()).
toString
()
/*metadata.value("Url", QString())*/
;
QString
widgetsThumbsUrl
=
QUrl
::
fromEncoded
(
metadata
[
"thumbnailUrl"
].
toAscii
()).
toString
();
QString
widgetsThumbsUrl
=
QUrl
::
fromEncoded
(
metadata
[
"thumbnailUrl"
].
toAscii
()).
toString
();
bool
isLocal
=
QFileInfo
(
widgetsUrl
).
exists
();
QString
strType
=
UBFileSystemUtils
::
mimeTypeFromFileName
(
widgetsUrl
);
QString
strType
=
UBFileSystemUtils
::
mimeTypeFromFileName
(
widgetsUrl
);
UBMimeType
::
Enum
thumbType
=
UBFileSystemUtils
::
mimeTypeFromString
(
strType
);
UBMimeType
::
Enum
thumbType
=
UBFileSystemUtils
::
mimeTypeFromString
(
strType
);
...
...
src/gui/UBToolWidget.cpp
View file @
cb2608fd
...
@@ -34,11 +34,12 @@ QPixmap* UBToolWidget::sUnpinPixmap = 0;
...
@@ -34,11 +34,12 @@ QPixmap* UBToolWidget::sUnpinPixmap = 0;
UBToolWidget
::
UBToolWidget
(
const
QUrl
&
pUrl
,
QWidget
*
pParent
)
UBToolWidget
::
UBToolWidget
(
const
QUrl
&
pUrl
,
QWidget
*
pParent
)
:
QWidget
(
pParent
,
Qt
::
FramelessWindowHint
|
Qt
::
WindowStaysOnTopHint
)
:
QWidget
(
pParent
,
Qt
::
FramelessWindowHint
|
Qt
::
WindowStaysOnTopHint
)
,
mWebView
(
0
)
,
mToolWidget
(
0
)
,
mShouldMoveWidget
(
false
)
,
mShouldMoveWidget
(
false
)
,
mContentMargin
(
0
)
,
mContentMargin
(
0
)
,
mFrameWidth
(
0
)
,
mFrameWidth
(
0
)
,
mWebView
(
0
)
,
mToolWidget
(
0
)
{
{
int
widgetType
=
UBGraphicsWidgetItem
::
widgetType
(
pUrl
);
int
widgetType
=
UBGraphicsWidgetItem
::
widgetType
(
pUrl
);
if
(
widgetType
==
UBWidgetType
::
Apple
)
if
(
widgetType
==
UBWidgetType
::
Apple
)
...
@@ -53,11 +54,12 @@ UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget *pParent)
...
@@ -53,11 +54,12 @@ UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget *pParent)
UBToolWidget
::
UBToolWidget
(
UBGraphicsWidgetItem
*
pWidget
,
QWidget
*
pParent
)
UBToolWidget
::
UBToolWidget
(
UBGraphicsWidgetItem
*
pWidget
,
QWidget
*
pParent
)
:
QWidget
(
pParent
,
Qt
::
FramelessWindowHint
|
Qt
::
WindowStaysOnTopHint
)
:
QWidget
(
pParent
,
Qt
::
FramelessWindowHint
|
Qt
::
WindowStaysOnTopHint
)
,
mWebView
(
0
)
,
mToolWidget
(
pWidget
)
,
mShouldMoveWidget
(
false
)
,
mShouldMoveWidget
(
false
)
,
mContentMargin
(
0
)
,
mContentMargin
(
0
)
,
mFrameWidth
(
0
)
,
mFrameWidth
(
0
)
,
mWebView
(
0
)
,
mToolWidget
(
pWidget
)
{
{
initialize
();
initialize
();
javaScriptWindowObjectCleared
();
javaScriptWindowObjectCleared
();
...
...
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