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

Material: Use QStringLiteral

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-02-09 18:16:01 +01:00
parent b5517aa9f4
commit 6c61769d8c
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Material/App/MaterialManager.cpp
View File

@@ -190,17 +190,17 @@ std::shared_ptr<Material> MaterialManager::defaultMaterial()
material = manager.getMaterial(QLatin1String("7f9fd73b-50c9-41d8-b7b2-575a030c1eeb"));
}
if (material->hasAppearanceModel(ModelUUIDs::ModelUUID_Rendering_Basic)) {
material->getAppearanceProperty(QString::fromLatin1("DiffuseColor"))
material->getAppearanceProperty(QStringLiteral("DiffuseColor"))
->setColor(mat->diffuseColor);
material->getAppearanceProperty(QString::fromLatin1("AmbientColor"))
material->getAppearanceProperty(QStringLiteral("AmbientColor"))
->setColor(mat->ambientColor);
material->getAppearanceProperty(QString::fromLatin1("EmissiveColor"))
material->getAppearanceProperty(QStringLiteral("EmissiveColor"))
->setColor(mat->emissiveColor);
material->getAppearanceProperty(QString::fromLatin1("SpecularColor"))
material->getAppearanceProperty(QStringLiteral("SpecularColor"))
->setColor(mat->specularColor);
material->getAppearanceProperty(QString::fromLatin1("Transparency"))
material->getAppearanceProperty(QStringLiteral("Transparency"))
->setFloat(mat->transparency);
material->getAppearanceProperty(QString::fromLatin1("Shininess"))
material->getAppearanceProperty(QStringLiteral("Shininess"))
->setFloat(mat->shininess);
}

8
src/Mod/Material/App/MaterialValue.cpp
View File

@@ -293,13 +293,13 @@ QString MaterialValue::getYAMLString() const
else if (getType() == MaterialValue::Float) {
auto value = getValue();
if (!value.isNull()) {
yaml += QString::fromLatin1("%1").arg(value.toFloat(), 0, 'g', 6);
yaml += QStringLiteral("%1").arg(value.toFloat(), 0, 'g', 6);
}
}
else if (getType() == MaterialValue::List) {
for (auto& it : getList()) {
yaml += QString::fromLatin1("\n - \"") + escapeString(it.toString())
+ QString::fromLatin1("\"");
yaml += QStringLiteral("\n - \"") + escapeString(it.toString())
+ QStringLiteral("\"");
}
return yaml;
}
@@ -307,7 +307,7 @@ QString MaterialValue::getYAMLString() const
yaml += getValue().toString();
}
}
yaml = QString::fromLatin1(" \"") + escapeString(yaml) + QString::fromLatin1("\"");
yaml = QStringLiteral(" \"") + escapeString(yaml) + QStringLiteral("\"");
return yaml;
}

8
src/Mod/Material/Gui/MaterialTreeWidget.cpp
View File

@@ -425,7 +425,7 @@ void MaterialTreeWidget::getFavorites()
"User parameter:BaseApp/Preferences/Mod/Material/Favorites");
auto count = param->GetInt("Favorites", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("FAV%1").arg(i);
QString key = QStringLiteral("FAV%1").arg(i);
QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), ""));
if (!_filter || _filter->modelIncluded(uuid)) {
_favorites.push_back(uuid);
@@ -442,7 +442,7 @@ void MaterialTreeWidget::getRecents()
_recentMax = static_cast<int>(param->GetInt("RecentMax", defaultRecents));
auto count = param->GetInt("Recent", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("MRU%1").arg(i);
QString key = QStringLiteral("MRU%1").arg(i);
QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), ""));
if (!_filter || _filter->modelIncluded(uuid)) {
_recents.push_back(uuid);
@@ -458,7 +458,7 @@ void MaterialTreeWidget::saveRecents()
// Clear out the existing favorites
int count = param->GetInt("Recent", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("MRU%1").arg(i);
QString key = QStringLiteral("MRU%1").arg(i);
param->RemoveASCII(key.toStdString().c_str());
}
@@ -470,7 +470,7 @@ void MaterialTreeWidget::saveRecents()
param->SetInt("Recent", size);
int j = 0;
for (auto& recent : _recents) {
QString key = QString::fromLatin1("MRU%1").arg(j);
QString key = QStringLiteral("MRU%1").arg(j);
param->SetASCII(key.toStdString().c_str(), recent.toStdString());
j++;

16
src/Mod/Material/Gui/MaterialsEditor.cpp
View File

@@ -179,7 +179,7 @@ void MaterialsEditor::getFavorites()
"User parameter:BaseApp/Preferences/Mod/Material/Favorites");
int count = param->GetInt("Favorites", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("FAV%1").arg(i);
QString key = QStringLiteral("FAV%1").arg(i);
QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), ""));
if (!_filter || _filter->modelIncluded(uuid)) {
_favorites.push_back(uuid);
@@ -195,7 +195,7 @@ void MaterialsEditor::saveFavorites()
// Clear out the existing favorites
int count = param->GetInt("Favorites", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("FAV%1").arg(i);
QString key = QStringLiteral("FAV%1").arg(i);
param->RemoveASCII(key.toStdString().c_str());
}
@@ -203,7 +203,7 @@ void MaterialsEditor::saveFavorites()
param->SetInt("Favorites", _favorites.size());
int j = 0;
for (auto& favorite : _favorites) {
QString key = QString::fromLatin1("FAV%1").arg(j);
QString key = QStringLiteral("FAV%1").arg(j);
param->SetASCII(key.toStdString().c_str(), favorite.toStdString());
j++;
@@ -257,7 +257,7 @@ void MaterialsEditor::getRecents()
_recentMax = param->GetInt("RecentMax", 5);
int count = param->GetInt("Recent", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("MRU%1").arg(i);
QString key = QStringLiteral("MRU%1").arg(i);
QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), ""));
if (!_filter || _filter->modelIncluded(uuid)) {
_recents.push_back(uuid);
@@ -273,7 +273,7 @@ void MaterialsEditor::saveRecents()
// Clear out the existing favorites
int count = param->GetInt("Recent", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("MRU%1").arg(i);
QString key = QStringLiteral("MRU%1").arg(i);
param->RemoveASCII(key.toStdString().c_str());
}
@@ -285,7 +285,7 @@ void MaterialsEditor::saveRecents()
param->SetInt("Recent", size);
int j = 0;
for (auto& recent : _recents) {
QString key = QString::fromLatin1("MRU%1").arg(j);
QString key = QStringLiteral("MRU%1").arg(j);
param->SetASCII(key.toStdString().c_str(), recent.toStdString());
j++;
@@ -1177,12 +1177,12 @@ QString MaterialsEditor::libraryPath(const std::shared_ptr<Materials::Material>&
QString path;
auto library = material->getLibrary();
if (library) {
path = QString::fromLatin1("/%1/%2")
path = QStringLiteral("/%1/%2")
.arg(material->getLibrary()->getName())
.arg(material->getDirectory());
}
else {
path = QString::fromLatin1("%1").arg(material->getDirectory());
path = QStringLiteral("%1").arg(material->getDirectory());
}
return path;

12
src/Mod/Material/Gui/ModelSelect.cpp
View File

@@ -83,7 +83,7 @@ void ModelSelect::getFavorites()
"User parameter:BaseApp/Preferences/Mod/Material/Models/Favorites");
int count = param->GetInt("Favorites", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("FAV%1").arg(i);
QString key = QStringLiteral("FAV%1").arg(i);
QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), ""));
_favorites.push_back(uuid);
}
@@ -97,7 +97,7 @@ void ModelSelect::saveFavorites()
// Clear out the existing favorites
int count = param->GetInt("Favorites", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("FAV%1").arg(i);
QString key = QStringLiteral("FAV%1").arg(i);
param->RemoveASCII(key.toStdString().c_str());
}
@@ -105,7 +105,7 @@ void ModelSelect::saveFavorites()
param->SetInt("Favorites", _favorites.size());
int j = 0;
for (auto& favorite : _favorites) {
QString key = QString::fromLatin1("FAV%1").arg(j);
QString key = QStringLiteral("FAV%1").arg(j);
param->SetASCII(key.toStdString().c_str(), favorite.toStdString());
j++;
@@ -150,7 +150,7 @@ void ModelSelect::getRecents()
_recentMax = param->GetInt("RecentMax", 5);
int count = param->GetInt("Recent", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("MRU%1").arg(i);
QString key = QStringLiteral("MRU%1").arg(i);
QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), ""));
_recents.push_back(uuid);
}
@@ -164,7 +164,7 @@ void ModelSelect::saveRecents()
// Clear out the existing favorites
int count = param->GetInt("Recent", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("MRU%1").arg(i);
QString key = QStringLiteral("MRU%1").arg(i);
param->RemoveASCII(key.toStdString().c_str());
}
@@ -176,7 +176,7 @@ void ModelSelect::saveRecents()
param->SetInt("Recent", size);
int j = 0;
for (auto& recent : _recents) {
QString key = QString::fromLatin1("MRU%1").arg(j);
QString key = QStringLiteral("MRU%1").arg(j);
param->SetASCII(key.toStdString().c_str(), recent.toStdString());
j++;

14
tests/src/Mod/Material/App/TestMaterialFilter.cpp
View File

@@ -116,28 +116,28 @@ TEST_F(TestMaterialFilter, TestFilters)
// First check that our materials are loading
auto material = _materialManager->getMaterial(QString::fromLatin1(UUIDAluminumAppearance));
ASSERT_TRUE(material);
ASSERT_EQ(material->getName(), QString::fromLatin1("TestAluminumAppearance"));
ASSERT_EQ(material->getName(), QStringLiteral("TestAluminumAppearance"));
ASSERT_EQ(material->getUUID(), QString::fromLatin1(UUIDAluminumAppearance));
material = _materialManager->getMaterial(QString::fromLatin1(UUIDAluminumMixed));
ASSERT_TRUE(material);
ASSERT_EQ(material->getName(), QString::fromLatin1("TestAluminumMixed"));
ASSERT_EQ(material->getName(), QStringLiteral("TestAluminumMixed"));
ASSERT_EQ(material->getUUID(), QString::fromLatin1(UUIDAluminumMixed));
material = _materialManager->getMaterial(QString::fromLatin1(UUIDAluminumPhysical));
ASSERT_TRUE(material);
ASSERT_EQ(material->getName(), QString::fromLatin1("TestAluminumPhysical"));
ASSERT_EQ(material->getName(), QStringLiteral("TestAluminumPhysical"));
ASSERT_EQ(material->getUUID(), QString::fromLatin1(UUIDAluminumPhysical));
material = _materialManager->getMaterial(QString::fromLatin1(UUIDBrassAppearance));
ASSERT_TRUE(material);
ASSERT_EQ(material->getName(), QString::fromLatin1("TestBrassAppearance"));
ASSERT_EQ(material->getName(), QStringLiteral("TestBrassAppearance"));
ASSERT_EQ(material->getUUID(), QString::fromLatin1(UUIDBrassAppearance));
material = _materialManager->getMaterialByPath(QString::fromLatin1("TestAcrylicLegacy.FCMat"),
QString::fromLatin1("Custom"));
material = _materialManager->getMaterialByPath(QStringLiteral("TestAcrylicLegacy.FCMat"),
QStringLiteral("Custom"));
ASSERT_TRUE(material);
ASSERT_EQ(material->getName(), QString::fromLatin1("TestAcrylicLegacy"));
ASSERT_EQ(material->getName(), QStringLiteral("TestAcrylicLegacy"));
ASSERT_EQ(material->getUUID().size(), 36); // We don't know the UUID
// Create an empty filter