[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src: Merge branch '16.12'
From: Jean-Baptiste Mardelle <null () kde ! org>
Date: 2017-01-03 20:10:28
Message-ID: E1cOVPg-0006es-36 () code ! kde ! org
[Download RAW message or body]
Git commit 7da7e9f22325fe9ca3d5471cacaae2a600505fb6 by Jean-Baptiste Mardelle.
Committed on 03/01/2017 at 20:10.
Pushed by mardelle into branch 'master'.
Merge branch '16.12'
M +9 -9 src/doc/documentchecker.cpp
M +43 -43 src/project/dialogs/archivewidget.cpp
M +2 -2 src/project/dialogs/projectsettings.cpp
https://commits.kde.org/kdenlive/7da7e9f22325fe9ca3d5471cacaae2a600505fb6
diff --cc src/doc/documentchecker.cpp
index f97cc9396,c54a4f224..4b50d69eb
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@@ -532,11 -519,9 +532,11 @@@ void DocumentChecker::setProperty(cons
void DocumentChecker::slotSearchClips()
{
//QString clipFolder = KRecentDirs::dir(QStringLiteral(":KdenliveClipFolder"));
- QString clipFolder = m_url.adjusted(QUrl::RemoveFilename).path();
+ QString clipFolder = m_url.adjusted(QUrl::RemoveFilename).toLocalFile();
QString newpath = QFileDialog::getExistingDirectory(qApp->activeWindow(), \
i18n("Clips folder"), clipFolder);
- if (newpath.isEmpty()) return;
+ if (newpath.isEmpty()) {
+ return;
+ }
int ix = 0;
bool fixed = false;
m_ui.recursiveSearch->setChecked(true);
@@@ -721,32 -695,24 +721,32 @@@ void DocumentChecker::slotEditItem(QTre
//|| t == TITLE_IMAGE_ELEMENT) {
QUrl url = KUrlRequesterDialog::getUrl(QUrl::fromLocalFile(item->text(1)), \
m_dialog, i18n("Enter new location for file"));
- if (!url.isValid()) return;
+ if (!url.isValid()) {
+ return;
+ }
- item->setText(1, url.path());
+ item->setText(1, url.toLocalFile());
ClipType type = (ClipType) item->data(0, clipTypeRole).toInt();
bool fixed = false;
- if (type == SlideShow && \
QFile::exists(url.adjusted(QUrl::RemoveFilename).path())) { + if (type == \
SlideShow && QFile::exists(url.adjusted(QUrl::RemoveFilename).toLocalFile())) { \
fixed = true; }
- if (fixed || QFile::exists(url.path())) {
+ if (fixed || QFile::exists(url.toLocalFile())) {
- item->setIcon(0, KoIconUtils::themedIcon("dialog-ok"));
+ item->setIcon(0, KoIconUtils::themedIcon(QStringLiteral("dialog-ok")));
int id = item->data(0, statusRole).toInt();
- if (id < 10) item->setData(0, statusRole, CLIPOK);
- else item->setData(0, statusRole, LUMAOK);
+ if (id < 10) {
+ item->setData(0, statusRole, CLIPOK);
+ } else {
+ item->setData(0, statusRole, LUMAOK);
+ }
checkStatus();
} else {
- item->setIcon(0, KoIconUtils::themedIcon("dialog-close"));
+ item->setIcon(0, KoIconUtils::themedIcon(QStringLiteral("dialog-close")));
int id = item->data(0, statusRole).toInt();
- if (id < 10) item->setData(0, statusRole, CLIPMISSING);
- else item->setData(0, statusRole, LUMAMISSING);
+ if (id < 10) {
+ item->setData(0, statusRole, CLIPMISSING);
+ } else {
+ item->setData(0, statusRole, LUMAMISSING);
+ }
checkStatus();
}
}
diff --cc src/project/dialogs/archivewidget.cpp
index 83f7286df,7df6fdc2c..b7d62c521
--- a/src/project/dialogs/archivewidget.cpp
+++ b/src/project/dialogs/archivewidget.cpp
@@@ -117,30 -119,27 +117,30 @@@ ArchiveWidget::ArchiveWidget(const QStr
if (t == SlideShow) {
QUrl slideUrl = clip->clipUrl();
//TODO: Slideshow files
- slideUrls.insert(id, slideUrl.path());
+ slideUrls.insert(id, slideUrl.toLocalFile());
- }
- else if (t == Image) imageUrls.insert(id, clip->clipUrl().toLocalFile());
- else if (t == QText) allFonts << clip->property(QStringLiteral("family"));
- else if (t == Text) {
+ } else if (t == Image) {
- imageUrls.insert(id, clip->clipUrl().path());
++ imageUrls.insert(id, clip->clipUrl().toLocalFile());
+ } else if (t == QText) {
+ allFonts << clip->property(QStringLiteral("family"));
+ } else if (t == Text) {
QStringList imagefiles = \
TitleWidget::extractImageList(clip->property(QStringLiteral("xmldata")));
QStringList fonts = \
TitleWidget::extractFontList(clip->property(QStringLiteral("xmldata"))); \
extraImageUrls << imagefiles; allFonts << fonts;
} else if (t == Playlist) {
- playlistUrls.insert(id, clip->clipUrl().path());
- QStringList files = \
ProjectSettings::extractPlaylistUrls(clip->clipUrl().path()); + \
playlistUrls.insert(id, clip->clipUrl().toLocalFile()); + QStringList \
files = ProjectSettings::extractPlaylistUrls(clip->clipUrl().toLocalFile()); \
otherUrls << files;
- }
- else if (!clip->clipUrl().isEmpty()) {
- if (t == Audio) audioUrls.insert(id, clip->clipUrl().toLocalFile());
- else {
+ } else if (!clip->clipUrl().isEmpty()) {
+ if (t == Audio) {
- audioUrls.insert(id, clip->clipUrl().path());
++ audioUrls.insert(id, clip->clipUrl().toLocalFile());
+ } else {
- videoUrls.insert(id, clip->clipUrl().path());
+ videoUrls.insert(id, clip->clipUrl().toLocalFile());
// Check if we have a proxy
QString proxy = clip->property(QStringLiteral("kdenlive:proxy"));
- if (!proxy.isEmpty() && proxy != QLatin1String("-") && \
QFile::exists(proxy)) proxyUrls.insert(id, proxy); + if \
(!proxy.isEmpty() && proxy != QLatin1String("-") && QFile::exists(proxy)) { + \
proxyUrls.insert(id, proxy); + }
}
}
}
@@@ -263,9 -262,9 +263,9 @@@ void ArchiveWidget::slotJobResult(bool
void ArchiveWidget::openArchiveForExtraction()
{
emit showMessage(QStringLiteral("system-run"), i18n("Opening archive..."));
- m_extractArchive = new KTar(m_extractUrl.path());
+ m_extractArchive = new KTar(m_extractUrl.toLocalFile());
- if (!m_extractArchive->isOpen() && !m_extractArchive->open( QIODevice::ReadOnly \
)) { + if (!m_extractArchive->isOpen() && \
!m_extractArchive->open(QIODevice::ReadOnly)) {
- emit showMessage(QStringLiteral("dialog-close"), i18n("Cannot open archive \
file:\n %1", m_extractUrl.path())); + emit \
showMessage(QStringLiteral("dialog-close"), i18n("Cannot open archive file:\n %1", \
m_extractUrl.toLocalFile())); groupBox->setEnabled(false);
return;
}
@@@ -282,9 -281,9 +282,9 @@@
}
if (!isProjectArchive) {
- emit showMessage(QStringLiteral("dialog-close"), i18n("File %1\n is not an \
archived Kdenlive project", m_extractUrl.path())); + emit \
showMessage(QStringLiteral("dialog-close"), i18n("File %1\n is not an archived \
Kdenlive project", m_extractUrl.toLocalFile())); groupBox->setEnabled(false);
- buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
+ buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
return;
}
buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true);
@@@ -336,24 -330,25 +336,24 @@@ void ArchiveWidget::generateItems(QTree
item->setData(0, Qt::UserRole, ix);
ix++;
QUrl slideUrl = QUrl::fromLocalFile(file);
- QDir dir(slideUrl.adjusted(QUrl::RemoveFilename).path());
+ QDir dir(slideUrl.adjusted(QUrl::RemoveFilename).toLocalFile());
if (slideUrl.fileName().startsWith(QLatin1String(".all."))) {
// mimetype slideshow (for example *.png)
- QStringList filters;
- // TODO: improve jpeg image detection with extension like jpeg, \
requires change in MLT image producers
- filters << "*." + slideUrl.fileName().section('.', -1);
- dir.setNameFilters(filters);
- QFileInfoList resultList = dir.entryInfoList(QDir::Files);
- QStringList slideImages;
- qint64 totalSize = 0;
- for (int i = 0; i < resultList.count(); ++i) {
- totalSize += resultList.at(i).size();
- slideImages << resultList.at(i).absoluteFilePath();
- }
- item->setData(0, Qt::UserRole + 1, slideImages);
- item->setData(0, Qt::UserRole + 3, totalSize);
- m_requestedSize += totalSize;
- }
- else {
+ QStringList filters;
+ // TODO: improve jpeg image detection with extension like jpeg, \
requires change in MLT image producers + filters << "*." + \
slideUrl.fileName().section('.', -1); + dir.setNameFilters(filters);
+ QFileInfoList resultList = dir.entryInfoList(QDir::Files);
+ QStringList slideImages;
+ qint64 totalSize = 0;
+ for (int i = 0; i < resultList.count(); ++i) {
+ totalSize += resultList.at(i).size();
+ slideImages << resultList.at(i).absoluteFilePath();
+ }
+ item->setData(0, Qt::UserRole + 1, slideImages);
+ item->setData(0, Qt::UserRole + 3, totalSize);
+ m_requestedSize += totalSize;
+ } else {
// pattern url (like clip%.3d.png)
QStringList result = dir.entryList(QDir::Files);
QString filter = slideUrl.fileName();
@@@ -420,24 -415,25 +420,24 @@@ void ArchiveWidget::generateItems(QTree
item->setData(0, Qt::UserRole, ix);
ix++;
QUrl slideUrl = QUrl::fromLocalFile(file);
- QDir dir(slideUrl.adjusted(QUrl::RemoveFilename).path());
+ QDir dir(slideUrl.adjusted(QUrl::RemoveFilename).toLocalFile());
if (slideUrl.fileName().startsWith(QLatin1String(".all."))) {
// mimetype slideshow (for example *.png)
- QStringList filters;
- // TODO: improve jpeg image detection with extension like jpeg, \
requires change in MLT image producers
- filters << "*." + slideUrl.fileName().section('.', -1);
- dir.setNameFilters(filters);
- QFileInfoList resultList = dir.entryInfoList(QDir::Files);
- QStringList slideImages;
- qint64 totalSize = 0;
- for (int i = 0; i < resultList.count(); ++i) {
- totalSize += resultList.at(i).size();
- slideImages << resultList.at(i).absoluteFilePath();
- }
- item->setData(0, Qt::UserRole + 1, slideImages);
- item->setData(0, Qt::UserRole + 3, totalSize);
- m_requestedSize += totalSize;
- }
- else {
+ QStringList filters;
+ // TODO: improve jpeg image detection with extension like jpeg, \
requires change in MLT image producers + filters << "*." + \
slideUrl.fileName().section('.', -1); + dir.setNameFilters(filters);
+ QFileInfoList resultList = dir.entryInfoList(QDir::Files);
+ QStringList slideImages;
+ qint64 totalSize = 0;
+ for (int i = 0; i < resultList.count(); ++i) {
+ totalSize += resultList.at(i).size();
+ slideImages << resultList.at(i).absoluteFilePath();
+ }
+ item->setData(0, Qt::UserRole + 1, slideImages);
+ item->setData(0, Qt::UserRole + 3, totalSize);
+ m_requestedSize += totalSize;
+ } else {
// pattern url (like clip%.3d.png)
QStringList result = dir.entryList(QDir::Files);
QString filter = slideUrl.fileName();
@@@ -489,7 -485,7 +489,7 @@@
void ArchiveWidget::slotCheckSpace()
{
- KDiskFreeSpaceInfo inf = \
KDiskFreeSpaceInfo::freeSpaceInfo(archive_url->url().path());
- KDiskFreeSpaceInfo inf = KDiskFreeSpaceInfo::freeSpaceInfo( \
archive_url->url().toLocalFile()); ++ KDiskFreeSpaceInfo inf = \
KDiskFreeSpaceInfo::freeSpaceInfo(archive_url->url().toLocalFile()); KIO::filesize_t \
freeSize = inf.available(); if (freeSize > m_requestedSize) {
// everything is ok
@@@ -543,13 -537,12 +543,13 @@@ bool ArchiveWidget::slotStartArchiving(
}
if (parentItem->childCount() > 0) {
if (parentItem->data(0, Qt::UserRole).toString() == \
QLatin1String("slideshows")) {
- QUrl slideFolder = QUrl::fromLocalFile(archive_url->url().path() + \
"/slideshows"); + QUrl slideFolder = \
QUrl::fromLocalFile(archive_url->url().toLocalFile() + \
"/slideshows");
- if (isArchive) m_foldersList.append(QStringLiteral("slideshows"));
- else {
+ if (isArchive) {
+ m_foldersList.append(QStringLiteral("slideshows"));
+ } else {
- QDir dir(slideFolder.path());
+ QDir dir(slideFolder.toLocalFile());
if (!dir.mkpath(QStringLiteral("."))) {
- KMessageBox::sorry(this, i18n("Cannot create directory %1", \
slideFolder.path())); + KMessageBox::sorry(this, i18n("Cannot \
create directory %1", slideFolder.toLocalFile())); }
}
isSlideshow = true;
@@@ -563,14 -555,12 +563,14 @@@
QTreeWidgetItem *item;
for (int j = 0; j < parentItem->childCount(); ++j) {
item = parentItem->child(j);
- if (item->isDisabled()) continue;
+ if (item->isDisabled()) {
+ continue;
+ }
// Special case: slideshows
- items++;
+ items++;
if (isSlideshow) {
destPath += item->data(0, Qt::UserRole).toString() + '/';
- destUrl = QUrl::fromLocalFile(archive_url->url().path() + \
QDir::separator() + destPath); + destUrl = \
QUrl::fromLocalFile(archive_url->url().toLocalFile() + \
QDir::separator() + destPath);
QStringList srcFiles = item->data(0, Qt::UserRole + \
1).toStringList(); for (int k = 0; k < srcFiles.count(); ++k) {
files << QUrl::fromLocalFile(srcFiles.at(k));
@@@ -588,14 -580,11 +588,14 @@@
//TODO: monitor progress
if (isArchive) {
m_filesList.insert(item->text(0), destPath + item->data(0, \
Qt::UserRole).toString()); + } else {
- m_duplicateFiles.insert(QUrl::fromLocalFile(item->text(0)), \
QUrl::fromLocalFile(destUrl.path() + "/" + item->data(0, Qt::UserRole).toString())); \
++ m_duplicateFiles.insert(QUrl::fromLocalFile(item->text(0)), \
QUrl::fromLocalFile(destUrl.toLocalFile() + "/" + item->data(0, \
Qt::UserRole).toString())); }
- else \
m_duplicateFiles.insert(QUrl::fromLocalFile(item->text(0)), \
QUrl::fromLocalFile(destUrl.toLocalFile() + "/" + item->data(0, \
Qt::UserRole).toString())); }
}
- if (!isSlideshow) parentItem->setDisabled(true);
+ if (!isSlideshow) {
+ parentItem->setDisabled(true);
+ }
break;
}
}
@@@ -626,19 -613,21 +626,19 @@@
if (isArchive) {
m_foldersList.append(destPath);
for (int i = 0; i < files.count(); ++i) {
- m_filesList.insert(files.at(i).path(), destPath + \
files.at(i).fileName()); + m_filesList.insert(files.at(i).toLocalFile(), \
destPath + files.at(i).fileName()); }
slotArchivingFinished();
- }
- else if (files.isEmpty()) {
+ } else if (files.isEmpty()) {
slotStartArchiving(false);
- }
- else {
+ } else {
- QDir dir(destUrl.path());
+ QDir dir(destUrl.toLocalFile());
if (!dir.mkpath(QStringLiteral("."))) {
- KMessageBox::sorry(this, i18n("Cannot create directory %1", \
destUrl.path())); + KMessageBox::sorry(this, i18n("Cannot create \
directory %1", destUrl.toLocalFile())); }
- m_copyJob = KIO::copy (files, destUrl, KIO::HideProgressInfo);
- connect(m_copyJob, SIGNAL(result(KJob*)), this, \
SLOT(slotArchivingFinished(KJob*)));
- connect(m_copyJob, SIGNAL(processedSize(KJob*,qulonglong)), this, \
SLOT(slotArchivingProgress(KJob*,qulonglong))); + m_copyJob = \
KIO::copy(files, destUrl, KIO::HideProgressInfo); + connect(m_copyJob, \
SIGNAL(result(KJob *)), this, SLOT(slotArchivingFinished(KJob *))); + \
connect(m_copyJob, SIGNAL(processedSize(KJob *, qulonglong)), this, \
SLOT(slotArchivingProgress(KJob *, qulonglong))); }
if (firstPass) {
progressBar->setValue(0);
@@@ -703,11 -693,13 +703,11 @@@ bool ArchiveWidget::processProjectFile(
QUrl src = QUrl::fromLocalFile(item->text(0));
QUrl dest = destUrl;
if (isSlideshow) {
- dest = QUrl::fromLocalFile(destUrl.path() + QDir::separator() + \
item->data(0, Qt::UserRole).toString() + "/" + src.fileName()); + \
dest = QUrl::fromLocalFile(destUrl.toLocalFile() + QDir::separator() + item->data(0, \
Qt::UserRole).toString() + "/" + src.fileName());
- }
- else if (item->data(0, Qt::UserRole).isNull()) {
+ } else if (item->data(0, Qt::UserRole).isNull()) {
- dest = QUrl::fromLocalFile(destUrl.path() + QDir::separator() + \
src.fileName()); + dest = \
QUrl::fromLocalFile(destUrl.toLocalFile() + QDir::separator() + \
src.fileName());
- }
- else {
+ } else {
- dest = QUrl::fromLocalFile(destUrl.path() + "/" + item->data(0, \
Qt::UserRole).toString()); + dest = \
QUrl::fromLocalFile(destUrl.toLocalFile() + "/" + item->data(0, \
Qt::UserRole).toString()); }
m_replacementList.insert(src, dest);
}
@@@ -719,11 -711,8 +719,11 @@@
// Adjust global settings
QString basePath;
- if (isArchive) basePath = QStringLiteral("$CURRENTPATH");
- else basePath = \
archive_url->url().adjusted(QUrl::StripTrailingSlash).toLocalFile(); + if \
(isArchive) { + basePath = QStringLiteral("$CURRENTPATH");
+ } else {
- basePath = archive_url->url().adjusted(QUrl::StripTrailingSlash).path();
++ basePath = \
archive_url->url().adjusted(QUrl::StripTrailingSlash).toLocalFile(); + }
mlt.setAttribute(QStringLiteral("root"), basePath);
QDomElement project = mlt.firstChildElement(QStringLiteral("kdenlivedoc"));
project.setAttribute(QStringLiteral("projectfolder"), basePath);
@@@ -738,16 -725,12 +738,16 @@@
if (e.hasAttribute(QStringLiteral("resource"))) {
QUrl src = \
QUrl::fromLocalFile(e.attribute(QStringLiteral("resource"))); QUrl dest = \
m_replacementList.value(src);
- if (!dest.isEmpty()) e.setAttribute(QStringLiteral("resource"), \
dest.toLocalFile()); + if (!dest.isEmpty()) {
- e.setAttribute(QStringLiteral("resource"), dest.path());
++ e.setAttribute(QStringLiteral("resource"), dest.toLocalFile());
+ }
}
if (e.hasAttribute(QStringLiteral("kdenlive:proxy")) && \
e.attribute(QStringLiteral("kdenlive:proxy")) != QLatin1String("-")) \
{
QUrl src = \
QUrl::fromLocalFile(e.attribute(QStringLiteral("kdenlive:proxy"))); QUrl dest = \
m_replacementList.value(src);
- if (!dest.isEmpty()) e.setAttribute(QStringLiteral("kdenlive:proxy"), \
dest.toLocalFile()); + if (!dest.isEmpty()) {
- e.setAttribute(QStringLiteral("kdenlive:proxy"), dest.path());
++ e.setAttribute(QStringLiteral("kdenlive:proxy"), \
dest.toLocalFile()); + }
}
}
@@@ -755,19 -738,15 +755,19 @@@
prods = mlt.elementsByTagName(QStringLiteral("producer"));
for (int i = 0; i < prods.count(); ++i) {
QDomElement e = prods.item(i).toElement();
- if (e.isNull()) continue;
+ if (e.isNull()) {
+ continue;
+ }
QString src = EffectsList::property(e, QStringLiteral("resource"));
if (!src.isEmpty()) {
- if (!src.startsWith('/')) {
+ if (QFileInfo(src).isRelative()) {
src.prepend(root);
}
QUrl srcUrl = QUrl::fromLocalFile(src);
QUrl dest = m_replacementList.value(srcUrl);
- if (!dest.isEmpty()) EffectsList::setProperty(e, \
QStringLiteral("resource"), dest.toLocalFile()); + if (!dest.isEmpty()) {
- EffectsList::setProperty(e, QStringLiteral("resource"), \
dest.path()); ++ EffectsList::setProperty(e, \
QStringLiteral("resource"), dest.toLocalFile()); + }
}
}
@@@ -776,24 -755,18 +776,24 @@@
QString attribute;
for (int i = 0; i < prods.count(); ++i) {
QDomElement e = prods.item(i).toElement();
- if (e.isNull()) continue;
+ if (e.isNull()) {
+ continue;
+ }
attribute = QStringLiteral("resource");
QString src = EffectsList::property(e, attribute);
- if (src.isEmpty()) attribute = QStringLiteral("luma");
+ if (src.isEmpty()) {
+ attribute = QStringLiteral("luma");
+ }
src = EffectsList::property(e, attribute);
if (!src.isEmpty()) {
- if (!src.startsWith('/')) {
+ if (QFileInfo(src).isRelative()) {
src.prepend(root);
}
QUrl srcUrl = QUrl::fromLocalFile(src);
QUrl dest = m_replacementList.value(srcUrl);
- if (!dest.isEmpty()) EffectsList::setProperty(e, attribute, \
dest.toLocalFile()); + if (!dest.isEmpty()) {
- EffectsList::setProperty(e, attribute, dest.path());
++ EffectsList::setProperty(e, attribute, dest.toLocalFile());
+ }
}
}
@@@ -820,10 -791,10 +820,10 @@@
return true;
}
- QString path = archive_url->url().path() + QDir::separator() + m_name + \
".kdenlive"; + QString path = archive_url->url().toLocalFile() + \
QDir::separator() + m_name + ".kdenlive"; QFile file(path);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- qWarning() << "////// ERROR writing to file: " << path;
+ qCWarning(KDENLIVE_LOG) << "////// ERROR writing to file: " << path;
KMessageBox::error(this, i18n("Cannot write to file %1", path));
return false;
}
@@@ -840,14 -811,14 +840,14 @@@
void ArchiveWidget::createArchive()
{
- QFileInfo dirInfo(archive_url->url().path());
+ QFileInfo dirInfo(archive_url->url().toLocalFile());
QString user = dirInfo.owner();
QString group = dirInfo.group();
- KTar archive(archive_url->url().path() + QDir::separator() + m_name + \
".tar.gz", QStringLiteral("application/x-gzip")); + KTar \
archive(archive_url->url().toLocalFile() + QDir::separator() + m_name + ".tar.gz", \
QStringLiteral("application/x-gzip"));
- archive.open( QIODevice::WriteOnly );
+ archive.open(QIODevice::WriteOnly);
// Create folders
- foreach(const QString &path, m_foldersList) {
+ foreach (const QString &path, m_foldersList) {
archive.writeDir(path, user, group);
}
@@@ -933,9 -904,9 +933,9 @@@ void ArchiveWidget::slotGotProgress(KJo
void ArchiveWidget::doExtracting()
{
- m_extractArchive->directory()->copyTo(archive_url->url().path() + \
QDir::separator()); + \
m_extractArchive->directory()->copyTo(archive_url->url().toLocalFile() + \
QDir::separator()); m_extractArchive->close();
- emit extractingFinished();
+ emit extractingFinished();
}
QString ArchiveWidget::extractedProjectFile() const
@@@ -956,12 -928,14 +956,12 @@@ void ArchiveWidget::slotExtractingFinis
file.close();
if (playList.isEmpty()) {
error = true;
- }
- else {
+ } else {
- playList.replace(QLatin1String("$CURRENTPATH"), \
archive_url->url().adjusted(QUrl::StripTrailingSlash).path()); + \
playList.replace(QLatin1String("$CURRENTPATH"), \
archive_url->url().adjusted(QUrl::StripTrailingSlash).toLocalFile()); if \
(!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- qWarning() << "////// ERROR writing to file: ";
+ qCWarning(KDENLIVE_LOG) << "////// ERROR writing to file: ";
error = true;
- }
- else {
+ } else {
file.write(playList.toUtf8());
if (file.error() != QFile::NoError) {
error = true;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic