removed some warnings

preferencesAboutTextFull
Claudio Valerio 13 years ago
parent f6c3ee89b7
commit 21d8a69a03
  1. 2
      src/board/UBBoardPaletteManager.cpp
  2. 4
      src/desktop/UBDesktopAnnotationController.cpp
  3. 10
      src/tools/UBAbstractDrawRuler.cpp
  4. 6
      src/tools/UBGraphicsTriangle.cpp

@ -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)

@ -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)
, 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)
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();

@ -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()
{} {}

@ -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);

Loading…
Cancel
Save