feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

EffectComposer: Remove use of native separators from file paths

Browse Source 
Using native separators causes soft asserts in FilePath.

Change-Id: I45c5002a555a21dd3780ffd5c8df91b849a67c18
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-04-12 14:43:17 +03:00
parent b0eccd58f5
commit a5335f5371
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/effectcomposer/effectcomposermodel.cpp
View File

@@ -212,14 +212,14 @@ void EffectComposerModel::clear(bool clearName)
void EffectComposerModel::assignToSelected()
{
const QString effectsAssetsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
const QString path = effectsAssetsDir + QDir::separator() + m_currentComposition + ".qep";
const QString path = effectsAssetsDir + '/' + m_currentComposition + ".qep";
emit assignToSelectedTriggered(path);
}
QString EffectComposerModel::getUniqueEffectName() const
{
const QString effectsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
const QString path = effectsDir + QDir::separator() + "Effect%1.qep";
const QString path = effectsDir + '/' + "Effect%1.qep";
int num = 0;
@@ -232,7 +232,7 @@ QString EffectComposerModel::getUniqueEffectName() const
bool EffectComposerModel::nameExists(const QString &name) const
{
const QString effectsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
const QString path = effectsDir + QDir::separator() + "%1" + ".qep";
const QString path = effectsDir + '/' + "%1" + ".qep";
return QFile::exists(path.arg(name));
}
@@ -950,7 +950,7 @@ void EffectComposerModel::saveComposition(const QString &name)
}
const QString effectsAssetsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory();
const QString path = effectsAssetsDir + QDir::separator() + name + ".qep";
const QString path = effectsAssetsDir + '/' + name + ".qep";
auto saveFile = QFile(path);
if (!saveFile.open(QIODevice::WriteOnly)) {
QString error = QString("Error: Couldn't save composition file: '%1'").arg(path);
@@ -1080,7 +1080,7 @@ void EffectComposerModel::saveResources(const QString &name)
// Get effects dir
const Utils::FilePath effectsResDir = QmlDesigner::ModelNodeOperations::getEffectsImportDirectory();
const QString effectsResPath = effectsResDir.pathAppended(name).toString() + QDir::separator();
const QString effectsResPath = effectsResDir.pathAppended(name).toString() + '/';
Utils::FilePath effectPath = Utils::FilePath::fromString(effectsResPath);
// Create the qmldir for effects