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

CAM: Use QStringLiteral

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

18
src/Mod/CAM/Gui/AppPathGuiPy.cpp
View File

@@ -84,12 +84,12 @@ private:
try {
std::string path = App::Application::getHomePath();
path += "Mod/CAM/Path/Post/scripts/";
QDir dir1(QString::fromUtf8(path.c_str()), QString::fromLatin1("*_pre.py"));
QDir dir1(QString::fromUtf8(path.c_str()), QStringLiteral("*_pre.py"));
std::string cMacroPath =
App::GetApplication()
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/Macro")
->GetASCII("MacroPath", App::Application::getUserMacroDir().c_str());
QDir dir2(QString::fromUtf8(cMacroPath.c_str()), QString::fromLatin1("*_pre.py"));
QDir dir2(QString::fromUtf8(cMacroPath.c_str()), QStringLiteral("*_pre.py"));
QFileInfoList list = dir1.entryInfoList();
list << dir2.entryInfoList();
std::vector<std::string> scripts;
@@ -116,7 +116,7 @@ private:
for (int i = 0; i < list.size(); ++i) {
QFileInfo fileInfo = list.at(i);
if (fileInfo.baseName().toStdString() == processor) {
if (fileInfo.absoluteFilePath().contains(QString::fromLatin1("scripts"))) {
if (fileInfo.absoluteFilePath().contains(QStringLiteral("scripts"))) {
pre << "from Path.Post.scripts import " << processor;
}
else {
@@ -157,12 +157,12 @@ private:
try {
std::string path = App::Application::getHomePath();
path += "Mod/CAM/Path/Post/scripts/";
QDir dir1(QString::fromUtf8(path.c_str()), QString::fromLatin1("*_pre.py"));
QDir dir1(QString::fromUtf8(path.c_str()), QStringLiteral("*_pre.py"));
std::string cMacroPath =
App::GetApplication()
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/Macro")
->GetASCII("MacroPath", App::Application::getUserMacroDir().c_str());
QDir dir2(QString::fromUtf8(cMacroPath.c_str()), QString::fromLatin1("*_pre.py"));
QDir dir2(QString::fromUtf8(cMacroPath.c_str()), QStringLiteral("*_pre.py"));
QFileInfoList list = dir1.entryInfoList();
list << dir2.entryInfoList();
std::vector<std::string> scripts;
@@ -200,7 +200,7 @@ private:
for (int i = 0; i < list.size(); ++i) {
QFileInfo fileInfo = list.at(i);
if (fileInfo.baseName().toStdString() == processor) {
if (fileInfo.absoluteFilePath().contains(QString::fromLatin1("scripts"))) {
if (fileInfo.absoluteFilePath().contains(QStringLiteral("scripts"))) {
pre << "from Path.Post.scripts import " << processor;
}
else {
@@ -242,12 +242,12 @@ private:
std::string path = App::Application::getHomePath();
path += "Mod/CAM/Path/Post/scripts/";
QDir dir1(QString::fromUtf8(path.c_str()), QString::fromLatin1("*_post.py"));
QDir dir1(QString::fromUtf8(path.c_str()), QStringLiteral("*_post.py"));
std::string cMacroPath =
App::GetApplication()
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/Macro")
->GetASCII("MacroPath", App::Application::getUserMacroDir().c_str());
QDir dir2(QString::fromUtf8(cMacroPath.c_str()), QString::fromLatin1("*_post.py"));
QDir dir2(QString::fromUtf8(cMacroPath.c_str()), QStringLiteral("*_post.py"));
QFileInfoList list = dir1.entryInfoList();
list << dir2.entryInfoList();
std::vector<std::string> scripts;
@@ -288,7 +288,7 @@ private:
for (int i = 0; i < list.size(); ++i) {
QFileInfo fileInfo = list.at(i);
if (fileInfo.baseName().toStdString() == processor) {
if (fileInfo.absoluteFilePath().contains(QString::fromLatin1("scripts"))) {
if (fileInfo.absoluteFilePath().contains(QStringLiteral("scripts"))) {
pre << "from Path.Post.scripts import " << processor;
}
else {

6
src/Mod/CAM/Gui/TaskDlgPathCompound.cpp
View File

@@ -62,9 +62,9 @@ TaskWidgetPathCompound::TaskWidgetPathCompound(ViewProviderPathCompound* Compoun
for (std::vector<App::DocumentObject*>::const_iterator it = Paths.begin(); it != Paths.end();
++it) {
QString name = QString::fromLatin1((*it)->getNameInDocument());
name += QString::fromLatin1(" (");
name += QStringLiteral(" (");
name += QString::fromUtf8((*it)->Label.getValue());
name += QString::fromLatin1(")");
name += QStringLiteral(")");
ui->PathsList->addItem(name);
}
}
@@ -81,7 +81,7 @@ std::vector<std::string> TaskWidgetPathCompound::getList() const
QListWidgetItem* item = ui->PathsList->item(i);
QString name = item->text();
QStringList result;
result = name.split(QRegularExpression(QString::fromLatin1("\\s+")));
result = name.split(QRegularExpression(QStringLiteral("\\s+")));
std::cout << result[0].toStdString() << std::endl;
names.push_back(result[0].toStdString());
}