diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index 223d9b2f..9f7b608f 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -729,10 +729,8 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele QTransform transform; QString textTransform = element.attribute(aTransform); - bool hastransform = false; if (!textTransform.isNull()) { transform = transformFromString(textTransform); - hastransform = true; } repositionSvgItem(flashItem, width, height, x, y, true, transform); hashSceneItem(element, flashItem); @@ -923,13 +921,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbElement(QDomElement &element } bool locked = false; - bool isBackground = false; bool isEditableItem = false; bool isEditable = false; //Text items to convert to UBGraphicsTextItem only QString IDRef = element.attribute(aRef); if (!IDRef.isNull()) { - isBackground = element.hasAttribute(aBackground) ? strToBool(element.attribute(aBackground)) : false; + element.hasAttribute(aBackground) ? strToBool(element.attribute(aBackground)) : false; locked = element.hasAttribute(aBackground) ? strToBool(element.attribute(aBackground)) : false; isEditableItem = element.hasAttribute(aEditable); if (isEditableItem) diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp index fb38f59a..a5dded62 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp @@ -90,8 +90,6 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy) xmlWriter.writeStartElement("Description"); xmlWriter.writeAttribute("about", proxy->metaData(UBSettings::documentIdentifer).toString()); - QDate today = QDate::currentDate(); - xmlWriter.writeTextElement(nsDc, "title", proxy->metaData(UBSettings::documentName).toString()); xmlWriter.writeTextElement(nsDc, "type", proxy->metaData(UBSettings::documentGroupName).toString()); xmlWriter.writeTextElement(nsDc, "date", QDate::currentDate().toString("yyyy-MM-dd")); diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp index 02f8d900..d3ec39dd 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.cpp +++ b/src/adaptors/publishing/UBDocumentPublisher.cpp @@ -240,8 +240,6 @@ void UBDocumentPublisher::upgradeDocumentForPublishing() { UBGraphicsScene *scene = UBSvgSubsetAdaptor::loadScene(mPublishingDocument, pageIndex); - bool sceneHasWidget = false; - QList widgets; foreach(QGraphicsItem* item, scene->items()){ @@ -249,7 +247,6 @@ void UBDocumentPublisher::upgradeDocumentForPublishing() if(widgetItem){ generateWidgetPropertyScript(widgetItem, pageIndex + 1); - sceneHasWidget = true; widgets << widgetItem; } } diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 986a8356..bbd23925 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -81,8 +81,8 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll , mpLibWidget(NULL) , mpCachePropWidget(NULL) , mpTeacherBarWidget(NULL) - , mpDesktopLibWidget(NULL) , mpDownloadWidget(NULL) + , mpDesktopLibWidget(NULL) , mDownloadInProgress(false) { setupPalettes(); diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 0d39c960..c709c4e9 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -854,8 +854,6 @@ QString UBSettings::uniboardUserVideoDirectory() QString valideUserVideoDirectory = UBDesktopServices::storageLocation(QDesktopServices::MoviesLocation); - bool hasCreatedDir = false; - // first look into the application settings if (sAppSettings && getAppSettings()->contains("App/UserVideoDirectory")) { @@ -889,7 +887,6 @@ QString UBSettings::uniboardUserVideoDirectory() if (!dir.exists()) { dir.mkpath(userVideoDirectory); - hasCreatedDir = true; } if (dir.exists()) @@ -898,7 +895,6 @@ QString UBSettings::uniboardUserVideoDirectory() } else { - hasCreatedDir = false; qWarning() << "Failed to interpret App/UserVideoDirectory config : " + getAppSettings()->value("App/UserVideoDirectory").toString() + ", defaulting to " + valideUserVideoDirectory; @@ -929,8 +925,6 @@ QString UBSettings::podcastRecordingDirectory() QString validePodcastRecordingDirectory = UBDesktopServices::storageLocation(QDesktopServices::DesktopLocation); - bool hasCreatedDir = false; - // first look into the application settings if (sAppSettings && getAppSettings()->contains("Podcast/RecordingDirectory")) { @@ -964,7 +958,6 @@ QString UBSettings::podcastRecordingDirectory() if (!dir.exists()) { dir.mkpath(userPodcastRecordingDirectory); - hasCreatedDir = true; } if (dir.exists()) @@ -973,7 +966,6 @@ QString UBSettings::podcastRecordingDirectory() } else { - hasCreatedDir = false; qWarning() << "Failed to interpret Podcast/RecordingDirectory config : " + getAppSettings()->value("Podcast/RecordingDirectory").toString() + ", defaulting to user Desktop"; @@ -1099,8 +1091,6 @@ QString UBSettings::uniboardInteractiveUserDirectory() { QString valideUserInteractiveDirectory = uniboardDataDirectory() + "/interactive content"; - bool hasCreatedDir = false; - // first look into the application settings if (sAppSettings && getAppSettings()->contains("App/UserInteractiveContentDirectory")) { @@ -1129,7 +1119,6 @@ QString UBSettings::uniboardInteractiveUserDirectory() if (!dir.exists()) { dir.mkpath(userWidgetDirectory); - hasCreatedDir = true; } if (dir.exists()) @@ -1138,7 +1127,6 @@ QString UBSettings::uniboardInteractiveUserDirectory() } else { - hasCreatedDir = false; qWarning() << "Failed to interpret App/UserInteractiveContentDirectory config : " + getAppSettings()->value("App/UserInteractiveContentDirectory").toString() + ", defaulting to " + valideUserInteractiveDirectory; @@ -1194,8 +1182,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory() { QString valideUserInteractiveDirectory = uniboardDataDirectory() + "/interactive favorites"; - bool hasCreatedDir = false; - // first look into the application settings if (sAppSettings && getAppSettings()->contains("App/UserInteractiveFavoritesDirectory")) { @@ -1224,7 +1210,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory() if (!dir.exists()) { dir.mkpath(userWidgetDirectory); - hasCreatedDir = true; } if (dir.exists()) @@ -1233,7 +1218,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory() } else { - hasCreatedDir = false; qWarning() << "Failed to interpret App/UserInteractiveFavoritesDirectory config : " + getAppSettings()->value("App/UserInteractiveFavoritesDirectory").toString() + ", defaulting to " + valideUserInteractiveDirectory; diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 476dd289..4698cc48 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1586,8 +1586,6 @@ void UBGraphicsScene::addMagnifier(UBMagnifierParams params) QGraphicsView *cView = (QGraphicsView*)UBApplication::boardController->controlView(); QGraphicsView *dView = (QGraphicsView*)UBApplication::boardController->displayView(); - QPoint ccZeroPoint = cContainer->mapToGlobal(QPoint(0,0)); - QPoint cvZeroPoint = cView->mapToGlobal(QPoint(0,0)); QPoint dvZeroPoint = dView->mapToGlobal(QPoint(0,0)); int cvW = cView->width(); @@ -1635,8 +1633,6 @@ void UBGraphicsScene::moveMagnifier(QPoint newPos) QGraphicsView *cView = (QGraphicsView*)UBApplication::boardController->controlView(); QGraphicsView *dView = (QGraphicsView*)UBApplication::boardController->displayView(); - QPoint ccZeroPoint = cContainer->mapToGlobal(QPoint(0,0)); - QPoint cvZeroPoint = cView->mapToGlobal(QPoint(0,0)); QPoint dvZeroPoint = dView->mapToGlobal(QPoint(0,0)); int cvW = cView->width(); @@ -1711,16 +1707,7 @@ void UBGraphicsScene::addCache() { UBGraphicsCache* cache = new UBGraphicsCache(); mTools << cache; - QGraphicsView* view; - if(UBApplication::applicationController->displayManager()->hasDisplay()) - { - view = (QGraphicsView*)(UBApplication::boardController->displayView()); - } - else - { - view = (QGraphicsView*)(UBApplication::boardController->controlView()); - } addItem(cache); cache->setVisible(true); cache->setSelected(true); diff --git a/src/gui/UBDocumentNavigator.cpp b/src/gui/UBDocumentNavigator.cpp index fea695f4..1526a087 100644 --- a/src/gui/UBDocumentNavigator.cpp +++ b/src/gui/UBDocumentNavigator.cpp @@ -105,7 +105,6 @@ void UBDocumentNavigator::generateThumbnails() // Get the thumbnails QList thumbs = UBThumbnailAdaptor::load(mCrntDoc); - QGraphicsPixmapItem* selection = NULL; for(int i = 0; i < thumbs.count(); i++) { @@ -115,7 +114,6 @@ void UBDocumentNavigator::generateThumbnails() // Get the selected item if(UBApplication::boardController->activeSceneIndex() == i) { - selection = pixmapItem; mCrntItem = dynamic_cast(pixmapItem); mCrntItem->setSelected(true); } @@ -289,11 +287,6 @@ void UBDocumentNavigator::refreshScene() mLabels.at(i)->setPos(pos); } } - - QScrollBar *vertScrollBar = verticalScrollBar(); - int scrollBarThickness = 0; - if (vertScrollBar && vertScrollBar->isVisible()) - scrollBarThickness = vertScrollBar->width(); } /** diff --git a/src/gui/UBLibraryWidget.cpp b/src/gui/UBLibraryWidget.cpp index 53a0b2a1..31371a83 100644 --- a/src/gui/UBLibraryWidget.cpp +++ b/src/gui/UBLibraryWidget.cpp @@ -39,9 +39,9 @@ */ UBLibraryWidget::UBLibraryWidget(QWidget *parent, const char *name):UBThumbnailWidget(parent) , chainedElements(NULL) + , mLibraryController(NULL) , mpCrntDir(NULL) , mpCrntElem(NULL) - , mLibraryController(NULL) , mpTmpElem(NULL) { setObjectName(name); diff --git a/src/gui/UBMagnifer.cpp b/src/gui/UBMagnifer.cpp index c1a779a7..b98edf18 100644 --- a/src/gui/UBMagnifer.cpp +++ b/src/gui/UBMagnifer.cpp @@ -204,7 +204,6 @@ void UBMagnifier::mouseMoveEvent ( QMouseEvent * event ) { if(mShouldMoveWidget && (event->buttons() & Qt::LeftButton)) { - QPoint offset = event->pos() - mMousePressPos; move(pos() - mMousePressPos + event->pos()); event->accept(); diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp index ea1bdee1..5bea3f1a 100644 --- a/src/gui/UBToolWidget.cpp +++ b/src/gui/UBToolWidget.cpp @@ -183,7 +183,6 @@ void UBToolWidget::mouseMoveEvent ( QMouseEvent * event ) { if(mShouldMoveWidget && (event->buttons() & Qt::LeftButton)) { - QPoint offset = event->pos() - mMousePressPos; move(pos() - mMousePressPos + event->pos()); event->accept(); }