kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions 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 04d2bcbf45
commit f68ec76277
21 changed files with 209 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Mod/Material/App/MaterialConfigLoader.cpp
View File

@@ -96,11 +96,11 @@ bool MaterialConfigLoader::readFile(const QString& path, QMap<QString, QString>&
// read prefix
auto end = line.indexOf(QLatin1Char(']'));
if (end > 1) {
prefix = line.mid(1, end - 1) + QString::fromStdString("/");
prefix = line.mid(1, end - 1) + QStringLiteral("/");
// Render WB uses both Render and Rendering
if (prefix == QString::fromStdString("Rendering/")) {
prefix = QString::fromStdString("Render/");
if (prefix == QStringLiteral("Rendering/")) {
prefix = QStringLiteral("Render/");
}
}
}
@@ -152,9 +152,9 @@ void MaterialConfigLoader::splitTextureObject(const QString& value,
QString* object)
{
splitTexture(value, texture, remain);
if (*remain == QString::fromStdString("Object")) {
if (*remain == QStringLiteral("Object")) {
*remain = QString(); // Empty string
*object = QString::fromStdString("true");
*object = QStringLiteral("true");
}
}
@@ -279,17 +279,17 @@ void MaterialConfigLoader::addRendering(const QMap<QString, QString>& fcmat,
QString MaterialConfigLoader::multiLineKey(QMap<QString, QString>& fcmat, const QString& prefix)
{
// fcmat.beginGroup(QString::fromStdString("Render"));
// fcmat.beginGroup(QStringLiteral("Render"));
QString multiLineString;
auto keys = fcmat.keys();
for (const auto& key : keys) {
if (key.startsWith(prefix) || key.startsWith(QString::fromStdString("Render/") + prefix)) {
if (key.startsWith(prefix) || key.startsWith(QStringLiteral("Render/") + prefix)) {
QString string = value(fcmat, key.toStdString(), "");
if (multiLineString.isEmpty()) {
multiLineString += string;
}
else {
multiLineString += QString::fromStdString("\n") + string;
multiLineString += QStringLiteral("\n") + string;
}
}
}
@@ -301,7 +301,7 @@ QString MaterialConfigLoader::multiLineKey(QMap<QString, QString>& fcmat, const
void MaterialConfigLoader::addRenderAppleseed(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Appleseed");
QString prefix = QStringLiteral("Render.Appleseed");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -346,7 +346,7 @@ void MaterialConfigLoader::addRenderCarpaint(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderCycles(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Cycles");
QString prefix = QStringLiteral("Render.Cycles");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
finalModel->addAppearance(ModelUUIDs::ModelUUID_Render_Cycles);
@@ -569,7 +569,7 @@ void MaterialConfigLoader::addRenderGlass(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderLuxcore(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Luxcore");
QString prefix = QStringLiteral("Render.Luxcore");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -583,7 +583,7 @@ void MaterialConfigLoader::addRenderLuxcore(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderLuxrender(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Luxrender");
QString prefix = QStringLiteral("Render.Luxrender");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -658,7 +658,7 @@ void MaterialConfigLoader::addRenderMixed(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderOspray(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Ospray");
QString prefix = QStringLiteral("Render.Ospray");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -672,7 +672,7 @@ void MaterialConfigLoader::addRenderOspray(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderPbrt(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Pbrt");
QString prefix = QStringLiteral("Render.Pbrt");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -686,7 +686,7 @@ void MaterialConfigLoader::addRenderPbrt(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderPovray(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Povray");
QString prefix = QStringLiteral("Render.Povray");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -767,24 +767,24 @@ void MaterialConfigLoader::addRenderTexture(QMap<QString, QString>& fcmat,
auto keys = fcmat.keys();
for (const auto& key : keys) {
if (key.startsWith(QString::fromStdString("Render/Render.Textures."))) {
if (key.startsWith(QStringLiteral("Render/Render.Textures."))) {
QStringList list1 = key.split(QLatin1Char('.'));
if (renderName.isEmpty()) {
renderName = list1[2];
}
if (list1[3] == QString::fromStdString("Images")) {
if (list1[3] == QStringLiteral("Images")) {
renderImage->push_back(value(fcmat, key.toStdString(), ""));
}
else if (list1[3] == QString::fromStdString("Scale")) {
else if (list1[3] == QStringLiteral("Scale")) {
renderScale = value(fcmat, key.toStdString(), "");
}
else if (list1[3] == QString::fromStdString("Rotation")) {
else if (list1[3] == QStringLiteral("Rotation")) {
renderRotation = value(fcmat, key.toStdString(), "");
}
else if (list1[3] == QString::fromStdString("TranslationU")) {
else if (list1[3] == QStringLiteral("TranslationU")) {
renderTranslationU = value(fcmat, key.toStdString(), "");
}
else if (list1[3] == QString::fromStdString(" TranslationV")) {
else if (list1[3] == QStringLiteral(" TranslationV")) {
renderTranslationV = value(fcmat, key.toStdString(), "");
}
}
@@ -1049,7 +1049,7 @@ MaterialConfigLoader::getMaterialFromPath(const std::shared_ptr<MaterialLibrary>
// QString name = value(fcmat, "Name", ""); - 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);
QString uuid = QUuid::createUuid().toString(QUuid::WithoutBraces);
QString description = value(fcmat, "Description", "");