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

Sketcher: Use QStringLiteral

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-02-09 18:07:20 +01:00
parent bada65edc3
commit c0c6df10ec
40 changed files with 275 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
View File

@@ -2103,7 +2103,7 @@ QString EditModeConstraintCoinManager::getPresentationString(const Constraint* c
Base::UnitSystem unitSys; // current unit system
if (!constraint->isActive) {
return QString::fromLatin1(" ");
return QStringLiteral(" ");
}
// Get the current name parameter string of the constraint
@@ -2152,8 +2152,8 @@ QString EditModeConstraintCoinManager::getPresentationString(const Constraint* c
if (baseUnitStr.compare(unitStr) == 0) {
// Example code from: Mod/TechDraw/App/DrawViewDimension.cpp:372
QRegularExpression rxUnits(
QString::fromUtf8(" \\D*$")); // space + any non digits at end of string
valueStr.remove(rxUnits); // getUserString(defaultDecimals) without units
QStringLiteral(" \\D*$")); // space + any non digits at end of string
valueStr.remove(rxUnits); // getUserString(defaultDecimals) without units
}
}
}
@@ -2182,8 +2182,7 @@ QString EditModeConstraintCoinManager::getPresentationString(const Constraint* c
else {
// user defined format string does not contain any valid parameter, using default format
// "%N = %V"
presentationStr =
QString::fromStdString(nameStr) + QString::fromLatin1(" = ") + valueStr;
presentationStr = QString::fromStdString(nameStr) + QStringLiteral(" = ") + valueStr;
}
return presentationStr;
@@ -2333,7 +2332,7 @@ std::set<int> EditModeConstraintCoinManager::detectPreselectionConstr(const SoPi
}
else {
// It's a constraint icon, not a combined one
QStringList constrIdStrings = constrIdsStr.split(QString::fromLatin1(","));
QStringList constrIdStrings = constrIdsStr.split(QStringLiteral(","));
while (!constrIdStrings.empty()) {
auto constraintid = constrIdStrings.takeAt(0).toInt();
constrIndices.insert(constraintid);
@@ -2552,7 +2551,7 @@ void EditModeConstraintCoinManager::combineConstraintIcons(IconQueue iconQueue)
// we group only icons not being Symmetry icons, because we want those on the line
// and only icons that are visible
if (init.type != QString::fromLatin1("Constraint_Symmetric") && init.visible) {
if (init.type != QStringLiteral("Constraint_Symmetric") && init.visible) {
IconQueue::iterator i = iconQueue.begin();
@@ -2565,7 +2564,7 @@ void EditModeConstraintCoinManager::combineConstraintIcons(IconQueue iconQueue)
float distSquared = pow(i->position[0] - j->position[0], 2)
+ pow(i->position[1] - j->position[1], 2);
if (distSquared <= maxDistSquared
&& (*i).type != QString::fromLatin1("Constraint_Symmetric")) {
&& (*i).type != QStringLiteral("Constraint_Symmetric")) {
// Found an icon in iconQueue that's close enough to
// a member of thisGroup, so move it into thisGroup
thisGroup.push_back(*i);
@@ -2646,7 +2645,7 @@ void EditModeConstraintCoinManager::drawMergedConstraintIcons(IconQueue iconQueu
maxColorPriority = constrColorPriority(i->constraintId);
if (idString.length()) {
idString.append(QString::fromLatin1(","));
idString.append(QStringLiteral(","));
}
idString.append(QString::number(i->constraintId));
@@ -2666,7 +2665,7 @@ void EditModeConstraintCoinManager::drawMergedConstraintIcons(IconQueue iconQueu
iconColor = constrColor(i->constraintId);
}
idString.append(QString::fromLatin1(",") + QString::number(i->constraintId));
idString.append(QStringLiteral(",") + QString::number(i->constraintId));
i = iconQueue.erase(i);
}
@@ -2758,7 +2757,7 @@ QImage EditModeConstraintCoinManager::renderConstrIcon(const QString& type,
int* vPad)
{
// Constants to help create constraint icons
QString joinStr = QString::fromLatin1(", ");
QString joinStr = QStringLiteral(", ");
QPixmap pxMap;
std::stringstream constraintName;
@@ -2871,25 +2870,25 @@ QString EditModeConstraintCoinManager::iconTypeFromConstraint(Constraint* constr
switch (constraint->Type) {
case Horizontal:
return QString::fromLatin1("Constraint_Horizontal");
return QStringLiteral("Constraint_Horizontal");
case Vertical:
return QString::fromLatin1("Constraint_Vertical");
return QStringLiteral("Constraint_Vertical");
case PointOnObject:
return QString::fromLatin1("Constraint_PointOnObject");
return QStringLiteral("Constraint_PointOnObject");
case Tangent:
return QString::fromLatin1("Constraint_Tangent");
return QStringLiteral("Constraint_Tangent");
case Parallel:
return QString::fromLatin1("Constraint_Parallel");
return QStringLiteral("Constraint_Parallel");
case Perpendicular:
return QString::fromLatin1("Constraint_Perpendicular");
return QStringLiteral("Constraint_Perpendicular");
case Equal:
return QString::fromLatin1("Constraint_EqualLength");
return QStringLiteral("Constraint_EqualLength");
case Symmetric:
return QString::fromLatin1("Constraint_Symmetric");
return QStringLiteral("Constraint_Symmetric");
case SnellsLaw:
return QString::fromLatin1("Constraint_SnellsLaw");
return QStringLiteral("Constraint_SnellsLaw");
case Block:
return QString::fromLatin1("Constraint_Block");
return QStringLiteral("Constraint_Block");
default:
return QString();
}