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
21d8a69a
Commit
21d8a69a
authored
Aug 24, 2011
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed some warnings
parent
f6c3ee89
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
8 deletions
+14
-8
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+1
-1
UBDesktopAnnotationController.cpp
src/desktop/UBDesktopAnnotationController.cpp
+2
-2
UBAbstractDrawRuler.cpp
src/tools/UBAbstractDrawRuler.cpp
+8
-2
UBGraphicsTriangle.cpp
src/tools/UBGraphicsTriangle.cpp
+3
-3
No files found.
src/board/UBBoardPaletteManager.cpp
View file @
21d8a69a
...
@@ -60,11 +60,11 @@
...
@@ -60,11 +60,11 @@
UBBoardPaletteManager
::
UBBoardPaletteManager
(
QWidget
*
container
,
UBBoardController
*
pBoardController
)
UBBoardPaletteManager
::
UBBoardPaletteManager
(
QWidget
*
container
,
UBBoardController
*
pBoardController
)
:
QObject
(
container
)
:
QObject
(
container
)
,
mKeyboardPalette
(
0
)
,
mContainer
(
container
)
,
mContainer
(
container
)
,
mBoardControler
(
pBoardController
)
,
mBoardControler
(
pBoardController
)
,
mStylusPalette
(
0
)
,
mStylusPalette
(
0
)
,
mZoomPalette
(
0
)
,
mZoomPalette
(
0
)
,
mKeyboardPalette
(
0
)
,
mNavigPalette
(
NULL
)
,
mNavigPalette
(
NULL
)
,
mLibPalette
(
NULL
)
,
mLibPalette
(
NULL
)
,
mBackgroundsPalette
(
0
)
,
mBackgroundsPalette
(
0
)
...
...
src/desktop/UBDesktopAnnotationController.cpp
View file @
21d8a69a
...
@@ -51,6 +51,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
...
@@ -51,6 +51,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
,
mTransparentDrawingView
(
0
)
,
mTransparentDrawingView
(
0
)
,
mTransparentDrawingScene
(
0
)
,
mTransparentDrawingScene
(
0
)
,
mDesktopPalette
(
NULL
)
,
mDesktopPalette
(
NULL
)
,
mKeyboardPalette
(
0
)
,
mDesktopToolsPalette
(
NULL
)
,
mDesktopToolsPalette
(
NULL
)
,
mDesktopPenPalette
(
NULL
)
,
mDesktopPenPalette
(
NULL
)
,
mDesktopMarkerPalette
(
NULL
)
,
mDesktopMarkerPalette
(
NULL
)
...
@@ -65,7 +66,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
...
@@ -65,7 +66,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
,
mbArrowClicked
(
false
)
,
mbArrowClicked
(
false
)
,
mBoardStylusTool
(
UBStylusTool
::
Pen
)
,
mBoardStylusTool
(
UBStylusTool
::
Pen
)
,
mDesktopStylusTool
(
UBStylusTool
::
Selector
)
,
mDesktopStylusTool
(
UBStylusTool
::
Selector
)
,
mKeyboardPalette
(
0
)
{
{
mTransparentDrawingView
=
new
UBBoardView
(
UBApplication
::
boardController
,
0
);
// deleted in UBDesktopAnnotationController::destructor
mTransparentDrawingView
=
new
UBBoardView
(
UBApplication
::
boardController
,
0
);
// deleted in UBDesktopAnnotationController::destructor
...
@@ -385,7 +385,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool)
...
@@ -385,7 +385,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool)
if
(
eTool
!=
UBStylusTool
::
Selector
&&
eTool
!=
UBStylusTool
::
Text
)
if
(
eTool
!=
UBStylusTool
::
Selector
&&
eTool
!=
UBStylusTool
::
Text
)
{
{
if
(
mKeyboardPalette
->
m_isVisible
)
if
(
mKeyboardPalette
->
m_isVisible
)
UBApplication
::
mainWindow
->
actionVirtualKeyboard
->
activate
(
QAction
::
Trigger
);
UBApplication
::
mainWindow
->
actionVirtualKeyboard
->
activate
(
QAction
::
Trigger
);
}
}
updateBackground
();
updateBackground
();
...
...
src/tools/UBAbstractDrawRuler.cpp
View file @
21d8a69a
...
@@ -107,9 +107,15 @@ QFont UBAbstractDrawRuler::font() const
...
@@ -107,9 +107,15 @@ QFont UBAbstractDrawRuler::font() const
}
}
void
UBAbstractDrawRuler
::
StartLine
(
const
QPointF
&
position
,
qreal
width
)
void
UBAbstractDrawRuler
::
StartLine
(
const
QPointF
&
position
,
qreal
width
)
{}
{
Q_UNUSED
(
position
);
Q_UNUSED
(
width
);
}
void
UBAbstractDrawRuler
::
DrawLine
(
const
QPointF
&
position
,
qreal
width
)
void
UBAbstractDrawRuler
::
DrawLine
(
const
QPointF
&
position
,
qreal
width
)
{}
{
Q_UNUSED
(
position
);
Q_UNUSED
(
width
);
}
void
UBAbstractDrawRuler
::
EndLine
()
void
UBAbstractDrawRuler
::
EndLine
()
{}
{}
...
...
src/tools/UBGraphicsTriangle.cpp
View file @
21d8a69a
...
@@ -29,12 +29,12 @@ const UBGraphicsTriangle::UBGraphicsTriangleOrientation UBGraphicsTriangle::sDef
...
@@ -29,12 +29,12 @@ const UBGraphicsTriangle::UBGraphicsTriangleOrientation UBGraphicsTriangle::sDef
UBGraphicsTriangle
::
BottomLeft
;
UBGraphicsTriangle
::
BottomLeft
;
UBGraphicsTriangle
::
UBGraphicsTriangle
()
UBGraphicsTriangle
::
UBGraphicsTriangle
()
:
QGraphicsPolygonItem
()
:
UBAbstractDrawRuler
()
,
UBAbstractDrawRuler
()
,
QGraphicsPolygonItem
()
,
angle
(
0
)
,
mResizing1
(
false
)
,
mResizing1
(
false
)
,
mResizing2
(
false
)
,
mResizing2
(
false
)
,
mRotating
(
false
)
,
mRotating
(
false
)
,
angle
(
0
)
{
{
setRect
(
sDefaultRect
,
sDefaultOrientation
);
setRect
(
sDefaultRect
,
sDefaultOrientation
);
...
...
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