From cb2608fd0d740e74dab68ec6fc2482c2e1351782 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 12 Oct 2012 14:50:27 +0200 Subject: [PATCH] zero warning build on linux --- src/adaptors/UBSvgSubsetAdaptor.cpp | 3 -- src/board/UBBoardPaletteManager.cpp | 31 ++++++++-------- src/domain/UBGraphicsDelegateFrame.cpp | 51 ++++++++++++-------------- src/domain/UBGraphicsDelegateFrame.h | 1 - src/gui/UBFeaturesWidget.cpp | 3 -- src/gui/UBToolWidget.cpp | 12 +++--- 6 files changed, 45 insertions(+), 56 deletions(-) diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 18c433e9..8392dc68 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1002,9 +1002,6 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() UBGraphicsGroupContainerItem *group = new UBGraphicsGroupContainerItem(); QMultiMap strokesGroupsContainer; QList groupContainer; - QString currentStrokeIdentifier; - - QUuid groupUuid = QUuid(mXmlReader.attributes().value(aId).toString()); mXmlReader.readNext(); while (!mXmlReader.atEnd()) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 612813cd..78f3241a 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -148,8 +148,8 @@ void UBBoardPaletteManager::setupDockPaletteWidgets() // RIGHT palette widgets #ifndef USE_WEB_WIDGET mpFeaturesWidget = new UBFeaturesWidget(); - mRightPalette->registerWidget(mpFeaturesWidget); - mRightPalette->addTab(mpFeaturesWidget); + mRightPalette->registerWidget(mpFeaturesWidget); + mRightPalette->addTab(mpFeaturesWidget); #endif //Do not show deprecated lib widget to prevent collisions. Uncomment to return lib widget @@ -332,15 +332,15 @@ void UBBoardPaletteManager::pagePaletteButtonReleased() { if( mPageButtonPressedTime.msecsTo(QTime::currentTime()) > 900) { - // The palette is reinstanciated because the duplication depends on the current scene - delete(mPagePalette); - mPagePalette = 0; - QListpageActions; - pageActions << UBApplication::mainWindow->actionNewPage; - UBBoardController* boardController = UBApplication::boardController; - if(UBApplication::documentController->pageCanBeDuplicated(UBDocumentContainer::pageFromSceneIndex(boardController->activeSceneIndex()))){ - pageActions << UBApplication::mainWindow->actionDuplicatePage; - } + // The palette is reinstanciated because the duplication depends on the current scene + delete(mPagePalette); + mPagePalette = 0; + QListpageActions; + pageActions << UBApplication::mainWindow->actionNewPage; + UBBoardController* boardController = UBApplication::boardController; + if(UBApplication::documentController->pageCanBeDuplicated(UBDocumentContainer::pageFromSceneIndex(boardController->activeSceneIndex()))){ + pageActions << UBApplication::mainWindow->actionDuplicatePage; + } pageActions << UBApplication::mainWindow->actionImportPage; mPagePalette = new UBActionPalette(pageActions, Qt::Horizontal , mContainer); @@ -351,9 +351,9 @@ void UBBoardPaletteManager::pagePaletteButtonReleased() // As we recreate the pagePalette every time, we must reconnect the slots connect(UBApplication::mainWindow->actionNewPage, SIGNAL(triggered()), mPagePalette, SLOT(close())); - connect(UBApplication::mainWindow->actionDuplicatePage, SIGNAL(triggered()), mPagePalette, SLOT(close())); - connect(UBApplication::mainWindow->actionImportPage, SIGNAL(triggered()), mPagePalette, SLOT(close())); - connect(mPagePalette, SIGNAL(closed()), this, SLOT(pagePaletteClosed())); + connect(UBApplication::mainWindow->actionDuplicatePage, SIGNAL(triggered()), mPagePalette, SLOT(close())); + connect(UBApplication::mainWindow->actionImportPage, SIGNAL(triggered()), mPagePalette, SLOT(close())); + connect(mPagePalette, SIGNAL(closed()), this, SLOT(pagePaletteClosed())); togglePagePalette(true); } @@ -955,7 +955,7 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var) bool bVertical = var.toBool(); bool bVisible = mStylusPalette->isVisible(); - // Clean the old palette + // Clean the old palette if(NULL != mStylusPalette) { // TODO : check why this line creates a crash in the application. @@ -995,7 +995,6 @@ void UBBoardPaletteManager::startDownloads() mDownloadInProgress = true; mpDownloadWidget->setVisibleState(true); mRightPalette->addTab(mpDownloadWidget); - mpDownloadWidget; } } diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp index 71351090..24a17ffc 100644 --- a/src/domain/UBGraphicsDelegateFrame.cpp +++ b/src/domain/UBGraphicsDelegateFrame.cpp @@ -243,7 +243,7 @@ void UBGraphicsDelegateFrame::setCursorFromAngle(QString angle) QSize cursorSize(45,30); - + QImage mask_img(cursorSize, QImage::Format_Mono); mask_img.fill(0xff); QPainter mask_ptr(&mask_img); @@ -252,7 +252,7 @@ void UBGraphicsDelegateFrame::setCursorFromAngle(QString angle) QBitmap bmpMask = QBitmap::fromImage(mask_img); - QPixmap pixCursor(cursorSize); + QPixmap pixCursor(cursorSize); pixCursor.fill(QColor(Qt::white)); QPainter painter(&pixCursor); @@ -293,12 +293,12 @@ QPointF UBGraphicsDelegateFrame::getFixedPointFromPos() QPointF fixedPoint; if (!moving() && !rotating()) { - if (resizingTop()) + if (resizingTop()) { if (mMirrorX && mMirrorY) { if ((0 < mAngle) && (mAngle < 90)) - fixedPoint = delegated()->sceneBoundingRect().topLeft(); + fixedPoint = delegated()->sceneBoundingRect().topLeft(); else fixedPoint = delegated()->sceneBoundingRect().topRight(); } @@ -310,12 +310,12 @@ QPointF UBGraphicsDelegateFrame::getFixedPointFromPos() fixedPoint = delegated()->sceneBoundingRect().bottomLeft(); } } - else if (resizingLeft()) + else if (resizingLeft()) { if (mMirrorX && mMirrorY) { if ((0 < mAngle) && (mAngle < 90)) - fixedPoint = delegated()->sceneBoundingRect().bottomLeft(); + fixedPoint = delegated()->sceneBoundingRect().bottomLeft(); else fixedPoint = delegated()->sceneBoundingRect().topLeft(); } @@ -337,14 +337,14 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY) qreal dPosX = 0; qreal dPosY = 0; - if (resizingTop()) + if (resizingTop()) { if (mMirrorX && mMirrorY) dPosY = moveY; else dPosY = -moveY; } - else if (resizingLeft()) + else if (resizingLeft()) { if (mMirrorX && mMirrorY) dPosX = moveX; @@ -354,7 +354,7 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY) else if (resizingRight()) dPosX = (mMirrorX) ? -moveX : moveX; - else if (resizingBottom()) + else if (resizingBottom()) dPosY = mMirrorY ? -moveY : moveY; return QSizeF(dPosX, dPosY); @@ -363,7 +363,7 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY) QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY) { QSizeF incVector; - mFixedPoint = getFixedPointFromPos(); + mFixedPoint = getFixedPointFromPos(); UBResizableGraphicsItem* resizableItem = dynamic_cast(delegated()); if (resizableItem) @@ -382,15 +382,10 @@ QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY) } -void UBGraphicsDelegateFrame::scaleByPos(qreal scaleX, qreal scaleY) -{ - -} - void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if (None == mCurrentTool) - return; + return; QLineF move = QLineF(mStartingPoint, event->scenePos()); qreal moveX = move.length() * cos((move.angle() - mAngle) * PI / 180); @@ -399,7 +394,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) qreal height = delegated()->boundingRect().height() * mTotalScaleY; if (mOperationMode == Scaling) - { + { if(!rotating()) { mTranslateX = moveX; @@ -504,7 +499,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } } } - + if (rotating()) { mTranslateX = 0; @@ -597,7 +592,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) delegated()->setTransform(buildTransform()); } else // resizing/resizing horizontally - { + { if (resizingBottomRight()) { @@ -609,9 +604,9 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) else mCurrentTool = ResizeBottom; - incV = resizeDelegate(moveX, moveY); + incV = resizeDelegate(moveX, moveY); mOriginalSize += incV; - + if (mMirrorX && mMirrorY) mCurrentTool = ResizeLeft; else @@ -623,7 +618,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) mFixedPoint = getFixedPointFromPos(); - incH = resizeDelegate(moveX, moveY); + incH = resizeDelegate(moveX, moveY); mOriginalSize -= incV; mOriginalSize += incH; @@ -631,7 +626,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) mCurrentTool = ResizeBottomRight; } else - resizeDelegate(moveX, moveY); + resizeDelegate(moveX, moveY); } event->accept(); } @@ -660,11 +655,11 @@ void UBGraphicsDelegateFrame::prepareFramesToMove(QListprepareLinkedFrameToMove(); - } + } } void UBGraphicsDelegateFrame::prepareLinkedFrameToMove() -{ +{ mDelegate->startUndoStep(); mStartingPoint = QPointF(0,0); @@ -685,12 +680,12 @@ void UBGraphicsDelegateFrame::prepareLinkedFrameToMove() void UBGraphicsDelegateFrame::moveLinkedItems(QLineF movingVector, bool bLinked) { if (bLinked) - { + { mCurrentTool = Move; mTranslateX = movingVector.dx(); mTranslateY = movingVector.dy(); - + delegated()->setTransform(buildTransform(), false); } else @@ -777,7 +772,7 @@ void UBGraphicsDelegateFrame::setVisible(bool visible) void UBGraphicsDelegateFrame::positionHandles() { QRectF itemRect = delegated()->boundingRect(); - + if (mDelegate->getToolBarItem() && mDelegate->getToolBarItem()->isVisibleOnBoard() && mDelegate->getToolBarItem()->isShifting()) { diff --git a/src/domain/UBGraphicsDelegateFrame.h b/src/domain/UBGraphicsDelegateFrame.h index e171358b..87c11863 100644 --- a/src/domain/UBGraphicsDelegateFrame.h +++ b/src/domain/UBGraphicsDelegateFrame.h @@ -40,7 +40,6 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject QPointF getFixedPointFromPos(); QSizeF getResizeVector(qreal moveX, qreal moveY); QSizeF resizeDelegate(qreal moveX, qreal moveY); - void scaleByPos(qreal scaleX, qreal scaleY); virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index 176b6c02..fff1e8c9 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -234,9 +234,6 @@ void UBFeaturesWidget::onDisplayMetadata( QMap metadata ) QString widgetsUrl = QUrl::fromEncoded(metadata["Url"].toAscii()).toString()/*metadata.value("Url", QString())*/; QString widgetsThumbsUrl = QUrl::fromEncoded(metadata["thumbnailUrl"].toAscii()).toString(); - bool isLocal = QFileInfo(widgetsUrl).exists(); - - QString strType = UBFileSystemUtils::mimeTypeFromFileName(widgetsUrl); UBMimeType::Enum thumbType = UBFileSystemUtils::mimeTypeFromString(strType); diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp index 84afd33d..c3a213bd 100644 --- a/src/gui/UBToolWidget.cpp +++ b/src/gui/UBToolWidget.cpp @@ -34,11 +34,12 @@ QPixmap* UBToolWidget::sUnpinPixmap = 0; UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget *pParent) : QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint) + , mWebView(0) + , mToolWidget(0) , mShouldMoveWidget(false) , mContentMargin(0) , mFrameWidth(0) - , mWebView(0) - , mToolWidget(0) + { int widgetType = UBGraphicsWidgetItem::widgetType(pUrl); if (widgetType == UBWidgetType::Apple) @@ -53,11 +54,12 @@ UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget *pParent) UBToolWidget::UBToolWidget(UBGraphicsWidgetItem *pWidget, QWidget *pParent) : QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint) + , mWebView(0) + , mToolWidget(pWidget) , mShouldMoveWidget(false) , mContentMargin(0) , mFrameWidth(0) - , mWebView(0) - , mToolWidget(pWidget) + { initialize(); javaScriptWindowObjectCleared(); @@ -92,7 +94,7 @@ void UBToolWidget::initialize() mWebView->installEventFilter(this); - + mFrameWidth = UBSettings::settings()->objectFrameWidth; mContentMargin = sClosePixmap->width() / 2 + mFrameWidth; setLayout(new QVBoxLayout());