kindred/create
1
1
Fork 0
Code Issues 43 Pull Requests Actions 2 Packages Projects 9 Releases 2 Wiki Activity

Material: use QStringLiteral 2

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-02-14 12:27:52 +01:00
parent 239e4522ec
commit bfb5dfe5da
21 changed files with 209 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/Material/App/MaterialLoader.cpp
View File

@@ -82,7 +82,7 @@ std::shared_ptr<QList<QVariant>> MaterialYamlEntry::readList(const YAML::Node& n
QVariant nodeValue;
if (isImageList) {
nodeValue = QString::fromStdString(it->as<std::string>())
.remove(QRegularExpression(QString::fromStdString("[\r\n]")));
.remove(QRegularExpression(QStringLiteral("[\r\n]")));
}
else {
nodeValue = QString::fromStdString(it->as<std::string>());
@@ -168,8 +168,8 @@ void MaterialYamlEntry::addToTree(
std::shared_ptr<std::map<QString, std::shared_ptr<Material>>> materialMap)
{
std::set<QString> exclude;
exclude.insert(QString::fromStdString("General"));
exclude.insert(QString::fromStdString("Inherits"));
exclude.insert(QStringLiteral("General"));
exclude.insert(QStringLiteral("Inherits"));
auto yamlModel = getModel();
auto library = getLibrary();
@@ -244,7 +244,7 @@ void MaterialYamlEntry::addToTree(
QString::fromStdString((itp->second).as<std::string>());
if (type == MaterialValue::Image) {
propertyValue = propertyValue.remove(
QRegularExpression(QString::fromStdString("[\r\n]")));
QRegularExpression(QStringLiteral("[\r\n]")));
}
finalModel->setPhysicalValue(QString::fromStdString(propertyName),
propertyValue);
@@ -311,7 +311,7 @@ void MaterialYamlEntry::addToTree(
QString::fromStdString((itp->second).as<std::string>());
if (type == MaterialValue::Image) {
propertyValue = propertyValue.remove(
QRegularExpression(QString::fromStdString("[\r\n]")));
QRegularExpression(QStringLiteral("[\r\n]")));
}
finalModel->setAppearanceValue(QString::fromStdString(propertyName),
propertyValue);
@@ -368,7 +368,7 @@ MaterialLoader::getMaterialFromYAML(const std::shared_ptr<MaterialLibrary>& libr
// Always get the name from the filename
QFileInfo filepath(path);
QString name =
filepath.fileName().remove(QString::fromStdString(".FCMat"), Qt::CaseInsensitive);
filepath.fileName().remove(QStringLiteral(".FCMat"), Qt::CaseInsensitive);
model = std::make_shared<MaterialYamlEntry>(library,
name,
@@ -568,9 +568,9 @@ std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>> MaterialLoader::get
QString resourceDir = QString::fromStdString(App::Application::getResourceDir()
+ "/Mod/Material/Resources/Materials");
auto libData =
std::make_shared<MaterialLibrary>(QString::fromStdString("System"),
std::make_shared<MaterialLibrary>(QStringLiteral("System"),
resourceDir,
QString::fromStdString(":/icons/freecad.svg"),
QStringLiteral(":/icons/freecad.svg"),
true);
_libraryList->push_back(libData);
}
@@ -612,9 +612,9 @@ std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>> MaterialLoader::get
}
if (materialDir.exists()) {
auto libData = std::make_shared<MaterialLibrary>(
QString::fromStdString("User"),
QStringLiteral("User"),
resourceDir,
QString::fromStdString(":/icons/preferences-general.svg"),
QStringLiteral(":/icons/preferences-general.svg"),
false);
_libraryList->push_back(libData);
}
@@ -627,9 +627,9 @@ std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>> MaterialLoader::get
QDir materialDir(resourceDir);
if (materialDir.exists()) {
auto libData =
std::make_shared<MaterialLibrary>(QString::fromStdString("Custom"),
std::make_shared<MaterialLibrary>(QStringLiteral("Custom"),
resourceDir,
QString::fromStdString(":/icons/user.svg"),
QStringLiteral(":/icons/user.svg"),
false);
_libraryList->push_back(libData);
}
@@ -649,7 +649,7 @@ MaterialLoader::getMaterialFolders(const MaterialLibrary& library)
QFileInfo file(pathname);
if (file.isDir()) {
QString path = QDir(library.getDirectory()).relativeFilePath(file.absoluteFilePath());
if (!path.startsWith(QString::fromStdString("."))) {
if (!path.startsWith(QStringLiteral("."))) {
pathList->push_back(path);
}
}