diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 1e00c4e1..11cc58df 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -60,11 +60,11 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardController* pBoardController) : QObject(container) + , mKeyboardPalette(0) , mContainer(container) , mBoardControler(pBoardController) , mStylusPalette(0) , mZoomPalette(0) - , mKeyboardPalette(0) , mNavigPalette(NULL) , mLibPalette(NULL) , mBackgroundsPalette(0) diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 1bd1b45c..fb1c9907 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -51,6 +51,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) , mTransparentDrawingView(0) , mTransparentDrawingScene(0) , mDesktopPalette(NULL) + , mKeyboardPalette(0) , mDesktopToolsPalette(NULL) , mDesktopPenPalette(NULL) , mDesktopMarkerPalette(NULL) @@ -65,7 +66,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) , mbArrowClicked(false) , mBoardStylusTool(UBStylusTool::Pen) , mDesktopStylusTool(UBStylusTool::Selector) - , mKeyboardPalette(0) { mTransparentDrawingView = new UBBoardView(UBApplication::boardController, 0); // deleted in UBDesktopAnnotationController::destructor @@ -385,7 +385,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool) if(eTool != UBStylusTool::Selector && eTool != UBStylusTool::Text) { if(mKeyboardPalette->m_isVisible) - UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger); + UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger); } updateBackground(); diff --git a/src/tools/UBAbstractDrawRuler.cpp b/src/tools/UBAbstractDrawRuler.cpp index 4c39f789..3c8b8169 100644 --- a/src/tools/UBAbstractDrawRuler.cpp +++ b/src/tools/UBAbstractDrawRuler.cpp @@ -107,9 +107,15 @@ QFont UBAbstractDrawRuler::font() const } void UBAbstractDrawRuler::StartLine(const QPointF& position, qreal width) -{} +{ + Q_UNUSED(position); + Q_UNUSED(width); +} void UBAbstractDrawRuler::DrawLine(const QPointF& position, qreal width) -{} +{ + Q_UNUSED(position); + Q_UNUSED(width); +} void UBAbstractDrawRuler::EndLine() {} diff --git a/src/tools/UBGraphicsTriangle.cpp b/src/tools/UBGraphicsTriangle.cpp index ea60c4e0..f6459f97 100644 --- a/src/tools/UBGraphicsTriangle.cpp +++ b/src/tools/UBGraphicsTriangle.cpp @@ -29,12 +29,12 @@ const UBGraphicsTriangle::UBGraphicsTriangleOrientation UBGraphicsTriangle::sDef UBGraphicsTriangle::BottomLeft; UBGraphicsTriangle::UBGraphicsTriangle() - : QGraphicsPolygonItem() - , UBAbstractDrawRuler() + : UBAbstractDrawRuler() + , QGraphicsPolygonItem() + , angle(0) , mResizing1(false) , mResizing2(false) , mRotating(false) - , angle(0) { setRect(sDefaultRect, sDefaultOrientation);