From 63d6e6d295cee2d89715f08139198e7848d9aeba Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 30 Jan 2012 20:40:37 +0200 Subject: [PATCH] Fix for SANKORE-3. --- src/adaptors/UBSvgSubsetAdaptor.cpp | 2 +- src/domain/UBGraphicsMediaItem.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index aab62431..57e01565 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1836,7 +1836,7 @@ UBGraphicsAudioItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::audioItemFromSvg() href = mDocumentPath + "/" + href.right(href.length() - indexOfAudioDirectory); } - UBGraphicsAudioItem* audioItem = new UBGraphicsAudioItem(href); + UBGraphicsAudioItem* audioItem = new UBGraphicsAudioItem(QUrl::fromLocalFile(href)); graphicsItemFromSvg(audioItem); QStringRef ubPos = mXmlReader.attributes().value(mNamespaceUri, "position"); diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp index d07ab08c..9342cb66 100644 --- a/src/domain/UBGraphicsMediaItem.cpp +++ b/src/domain/UBGraphicsMediaItem.cpp @@ -86,12 +86,13 @@ QVariant UBGraphicsMediaItem::itemChange(GraphicsItemChange change, const QVaria void UBGraphicsMediaItem::clearSource() { - QString path = mediaFileUrl().path(); + QString path = mediaFileUrl().toLocalFile(); //if path is absolute clean duplicated path string if (!path.contains(UBApplication::boardController->activeDocument()->persistencePath())) path = UBApplication::boardController->activeDocument()->persistencePath() + "/" + path; - UBFileSystemUtils::deleteFile(path); + if (!UBFileSystemUtils::deleteFile(path)) + qDebug() << "cannot delete file: " << path; } void UBGraphicsMediaItem::toggleMute()