MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zero warning build on linux

Browse Source
preferencesAboutTextFull
Claudio Valerio 12 years ago
parent 9aa114857a
commit cb2608fd0d
6 changed files with 45 additions and 56 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      src/adaptors/UBSvgSubsetAdaptor.cpp
  2. 31
      src/board/UBBoardPaletteManager.cpp
  3. 51
      src/domain/UBGraphicsDelegateFrame.cpp
  4. 1
      src/domain/UBGraphicsDelegateFrame.h
  5. 3
      src/gui/UBFeaturesWidget.cpp
  6. 12
      src/gui/UBToolWidget.cpp

3
src/adaptors/UBSvgSubsetAdaptor.cpp
Unescape View File

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

31
src/board/UBBoardPaletteManager.cpp
Unescape View File

@ -148,8 +148,8 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
// RIGHT palette widgets // RIGHT palette widgets
#ifndef USE_WEB_WIDGET #ifndef USE_WEB_WIDGET
mpFeaturesWidget = new UBFeaturesWidget(); mpFeaturesWidget = new UBFeaturesWidget();
mRightPalette->registerWidget(mpFeaturesWidget); mRightPalette->registerWidget(mpFeaturesWidget);
mRightPalette->addTab(mpFeaturesWidget); mRightPalette->addTab(mpFeaturesWidget);
#endif #endif
//Do not show deprecated lib widget to prevent collisions. Uncomment to return lib widget //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) if( mPageButtonPressedTime.msecsTo(QTime::currentTime()) > 900)
{ {
// The palette is reinstanciated because the duplication depends on the current scene // The palette is reinstanciated because the duplication depends on the current scene
delete(mPagePalette); delete(mPagePalette);
mPagePalette = 0; mPagePalette = 0;
QList<QAction*>pageActions; QList<QAction*>pageActions;
pageActions << UBApplication::mainWindow->actionNewPage; pageActions << UBApplication::mainWindow->actionNewPage;
UBBoardController* boardController = UBApplication::boardController; UBBoardController* boardController = UBApplication::boardController;
if(UBApplication::documentController->pageCanBeDuplicated(UBDocumentContainer::pageFromSceneIndex(boardController->activeSceneIndex()))){ if(UBApplication::documentController->pageCanBeDuplicated(UBDocumentContainer::pageFromSceneIndex(boardController->activeSceneIndex()))){
pageActions << UBApplication::mainWindow->actionDuplicatePage; pageActions << UBApplication::mainWindow->actionDuplicatePage;
} }
pageActions << UBApplication::mainWindow->actionImportPage; pageActions << UBApplication::mainWindow->actionImportPage;
mPagePalette = new UBActionPalette(pageActions, Qt::Horizontal , mContainer); 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 // As we recreate the pagePalette every time, we must reconnect the slots
connect(UBApplication::mainWindow->actionNewPage, SIGNAL(triggered()), mPagePalette, SLOT(close())); connect(UBApplication::mainWindow->actionNewPage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
connect(UBApplication::mainWindow->actionDuplicatePage, SIGNAL(triggered()), mPagePalette, SLOT(close())); connect(UBApplication::mainWindow->actionDuplicatePage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
connect(UBApplication::mainWindow->actionImportPage, SIGNAL(triggered()), mPagePalette, SLOT(close())); connect(UBApplication::mainWindow->actionImportPage, SIGNAL(triggered()), mPagePalette, SLOT(close()));
connect(mPagePalette, SIGNAL(closed()), this, SLOT(pagePaletteClosed())); connect(mPagePalette, SIGNAL(closed()), this, SLOT(pagePaletteClosed()));
togglePagePalette(true); togglePagePalette(true);
} }
@ -955,7 +955,7 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var)
bool bVertical = var.toBool(); bool bVertical = var.toBool();
bool bVisible = mStylusPalette->isVisible(); bool bVisible = mStylusPalette->isVisible();
// Clean the old palette // Clean the old palette
if(NULL != mStylusPalette) if(NULL != mStylusPalette)
{ {
// TODO : check why this line creates a crash in the application. // TODO : check why this line creates a crash in the application.
@ -995,7 +995,6 @@ void UBBoardPaletteManager::startDownloads()
mDownloadInProgress = true; mDownloadInProgress = true;
mpDownloadWidget->setVisibleState(true); mpDownloadWidget->setVisibleState(true);
mRightPalette->addTab(mpDownloadWidget); mRightPalette->addTab(mpDownloadWidget);
mpDownloadWidget;
} }
} }

51
src/domain/UBGraphicsDelegateFrame.cpp
Unescape View File

@ -243,7 +243,7 @@ void UBGraphicsDelegateFrame::setCursorFromAngle(QString angle)
QSize cursorSize(45,30); QSize cursorSize(45,30);
QImage mask_img(cursorSize, QImage::Format_Mono); QImage mask_img(cursorSize, QImage::Format_Mono);
mask_img.fill(0xff); mask_img.fill(0xff);
QPainter mask_ptr(&mask_img); QPainter mask_ptr(&mask_img);
@ -252,7 +252,7 @@ void UBGraphicsDelegateFrame::setCursorFromAngle(QString angle)
QBitmap bmpMask = QBitmap::fromImage(mask_img); QBitmap bmpMask = QBitmap::fromImage(mask_img);
QPixmap pixCursor(cursorSize); QPixmap pixCursor(cursorSize);
pixCursor.fill(QColor(Qt::white)); pixCursor.fill(QColor(Qt::white));
QPainter painter(&pixCursor); QPainter painter(&pixCursor);
@ -293,12 +293,12 @@ QPointF UBGraphicsDelegateFrame::getFixedPointFromPos()
QPointF fixedPoint; QPointF fixedPoint;
if (!moving() && !rotating()) if (!moving() && !rotating())
{ {
if (resizingTop()) if (resizingTop())
{ {
if (mMirrorX && mMirrorY) if (mMirrorX && mMirrorY)
{ {
if ((0 < mAngle) && (mAngle < 90)) if ((0 < mAngle) && (mAngle < 90))
fixedPoint = delegated()->sceneBoundingRect().topLeft(); fixedPoint = delegated()->sceneBoundingRect().topLeft();
else else
fixedPoint = delegated()->sceneBoundingRect().topRight(); fixedPoint = delegated()->sceneBoundingRect().topRight();
} }
@ -310,12 +310,12 @@ QPointF UBGraphicsDelegateFrame::getFixedPointFromPos()
fixedPoint = delegated()->sceneBoundingRect().bottomLeft(); fixedPoint = delegated()->sceneBoundingRect().bottomLeft();
} }
} }
else if (resizingLeft()) else if (resizingLeft())
{ {
if (mMirrorX && mMirrorY) if (mMirrorX && mMirrorY)
{ {
if ((0 < mAngle) && (mAngle < 90)) if ((0 < mAngle) && (mAngle < 90))
fixedPoint = delegated()->sceneBoundingRect().bottomLeft(); fixedPoint = delegated()->sceneBoundingRect().bottomLeft();
else else
fixedPoint = delegated()->sceneBoundingRect().topLeft(); fixedPoint = delegated()->sceneBoundingRect().topLeft();
} }
@ -337,14 +337,14 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY)
qreal dPosX = 0; qreal dPosX = 0;
qreal dPosY = 0; qreal dPosY = 0;
if (resizingTop()) if (resizingTop())
{ {
if (mMirrorX && mMirrorY) if (mMirrorX && mMirrorY)
dPosY = moveY; dPosY = moveY;
else else
dPosY = -moveY; dPosY = -moveY;
} }
else if (resizingLeft()) else if (resizingLeft())
{ {
if (mMirrorX && mMirrorY) if (mMirrorX && mMirrorY)
dPosX = moveX; dPosX = moveX;
@ -354,7 +354,7 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY)
else if (resizingRight()) else if (resizingRight())
dPosX = (mMirrorX) ? -moveX : moveX; dPosX = (mMirrorX) ? -moveX : moveX;
else if (resizingBottom()) else if (resizingBottom())
dPosY = mMirrorY ? -moveY : moveY; dPosY = mMirrorY ? -moveY : moveY;
return QSizeF(dPosX, dPosY); return QSizeF(dPosX, dPosY);
@ -363,7 +363,7 @@ QSizeF UBGraphicsDelegateFrame::getResizeVector(qreal moveX, qreal moveY)
QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY) QSizeF UBGraphicsDelegateFrame::resizeDelegate(qreal moveX, qreal moveY)
{ {
QSizeF incVector; QSizeF incVector;
mFixedPoint = getFixedPointFromPos(); mFixedPoint = getFixedPointFromPos();
UBResizableGraphicsItem* resizableItem = dynamic_cast<UBResizableGraphicsItem*>(delegated()); UBResizableGraphicsItem* resizableItem = dynamic_cast<UBResizableGraphicsItem*>(delegated());
if (resizableItem) 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) void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{ {
if (None == mCurrentTool) if (None == mCurrentTool)
return; return;
QLineF move = QLineF(mStartingPoint, event->scenePos()); QLineF move = QLineF(mStartingPoint, event->scenePos());
qreal moveX = move.length() * cos((move.angle() - mAngle) * PI / 180); 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; qreal height = delegated()->boundingRect().height() * mTotalScaleY;
if (mOperationMode == Scaling) if (mOperationMode == Scaling)
{ {
if(!rotating()) if(!rotating())
{ {
mTranslateX = moveX; mTranslateX = moveX;
@ -504,7 +499,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
} }
} }
} }
if (rotating()) if (rotating())
{ {
mTranslateX = 0; mTranslateX = 0;
@ -597,7 +592,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
delegated()->setTransform(buildTransform()); delegated()->setTransform(buildTransform());
} }
else // resizing/resizing horizontally else // resizing/resizing horizontally
{ {
if (resizingBottomRight()) if (resizingBottomRight())
{ {
@ -609,9 +604,9 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
else else
mCurrentTool = ResizeBottom; mCurrentTool = ResizeBottom;
incV = resizeDelegate(moveX, moveY); incV = resizeDelegate(moveX, moveY);
mOriginalSize += incV; mOriginalSize += incV;
if (mMirrorX && mMirrorY) if (mMirrorX && mMirrorY)
mCurrentTool = ResizeLeft; mCurrentTool = ResizeLeft;
else else
@ -623,7 +618,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
mFixedPoint = getFixedPointFromPos(); mFixedPoint = getFixedPointFromPos();
incH = resizeDelegate(moveX, moveY); incH = resizeDelegate(moveX, moveY);
mOriginalSize -= incV; mOriginalSize -= incV;
mOriginalSize += incH; mOriginalSize += incH;
@ -631,7 +626,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
mCurrentTool = ResizeBottomRight; mCurrentTool = ResizeBottomRight;
} }
else else
resizeDelegate(moveX, moveY); resizeDelegate(moveX, moveY);
} }
event->accept(); event->accept();
} }
@ -660,11 +655,11 @@ void UBGraphicsDelegateFrame::prepareFramesToMove(QList<UBGraphicsDelegateFrame
foreach (UBGraphicsDelegateFrame *frame, mLinkedFrames) foreach (UBGraphicsDelegateFrame *frame, mLinkedFrames)
{ {
frame->prepareLinkedFrameToMove(); frame->prepareLinkedFrameToMove();
} }
} }
void UBGraphicsDelegateFrame::prepareLinkedFrameToMove() void UBGraphicsDelegateFrame::prepareLinkedFrameToMove()
{ {
mDelegate->startUndoStep(); mDelegate->startUndoStep();
mStartingPoint = QPointF(0,0); mStartingPoint = QPointF(0,0);
@ -685,12 +680,12 @@ void UBGraphicsDelegateFrame::prepareLinkedFrameToMove()
void UBGraphicsDelegateFrame::moveLinkedItems(QLineF movingVector, bool bLinked) void UBGraphicsDelegateFrame::moveLinkedItems(QLineF movingVector, bool bLinked)
{ {
if (bLinked) if (bLinked)
{ {
mCurrentTool = Move; mCurrentTool = Move;
mTranslateX = movingVector.dx(); mTranslateX = movingVector.dx();
mTranslateY = movingVector.dy(); mTranslateY = movingVector.dy();
delegated()->setTransform(buildTransform(), false); delegated()->setTransform(buildTransform(), false);
} }
else else
@ -777,7 +772,7 @@ void UBGraphicsDelegateFrame::setVisible(bool visible)
void UBGraphicsDelegateFrame::positionHandles() void UBGraphicsDelegateFrame::positionHandles()
{ {
QRectF itemRect = delegated()->boundingRect(); QRectF itemRect = delegated()->boundingRect();
if (mDelegate->getToolBarItem() && mDelegate->getToolBarItem()->isVisibleOnBoard() if (mDelegate->getToolBarItem() && mDelegate->getToolBarItem()->isVisibleOnBoard()
&& mDelegate->getToolBarItem()->isShifting()) && mDelegate->getToolBarItem()->isShifting())
{ {

1
src/domain/UBGraphicsDelegateFrame.h
Unescape View File

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

3
src/gui/UBFeaturesWidget.cpp
Unescape View File

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

12
src/gui/UBToolWidget.cpp
Unescape View File

@ -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)
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();
@ -92,7 +94,7 @@ void UBToolWidget::initialize()
mWebView->installEventFilter(this); mWebView->installEventFilter(this);
mFrameWidth = UBSettings::settings()->objectFrameWidth; mFrameWidth = UBSettings::settings()->objectFrameWidth;
mContentMargin = sClosePixmap->width() / 2 + mFrameWidth; mContentMargin = sClosePixmap->width() / 2 + mFrameWidth;
setLayout(new QVBoxLayout()); setLayout(new QVBoxLayout());

Write Preview
Loading…
Cancel
Save