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

Gui: Use QStringLiteral

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-02-09 18:33:01 +01:00
parent bad9499d50
commit f647d4a1eb
83 changed files with 519 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp
View File

@@ -63,12 +63,12 @@ DlgSettingsCacheDirectory::DlgSettingsCacheDirectory(QWidget* parent)
QString path = QString::fromStdString(App::Application::getUserCachePath());
ui->cacheLocation->setText(path);
ui->comboBoxLimit->addItem(QString::fromLatin1("100 MB"), 100);
ui->comboBoxLimit->addItem(QString::fromLatin1("300 MB"), 300);
ui->comboBoxLimit->addItem(QString::fromLatin1("500 MB"), 500);
ui->comboBoxLimit->addItem(QString::fromLatin1("1 GB"), 1024);
ui->comboBoxLimit->addItem(QString::fromLatin1("2 GB"), 2048);
ui->comboBoxLimit->addItem(QString::fromLatin1("3 GB"), 3072);
ui->comboBoxLimit->addItem(QStringLiteral("100 MB"), 100);
ui->comboBoxLimit->addItem(QStringLiteral("300 MB"), 300);
ui->comboBoxLimit->addItem(QStringLiteral("500 MB"), 500);
ui->comboBoxLimit->addItem(QStringLiteral("1 GB"), 1024);
ui->comboBoxLimit->addItem(QStringLiteral("2 GB"), 2048);
ui->comboBoxLimit->addItem(QStringLiteral("3 GB"), 3072);
connect(ui->pushButtonCheck, &QPushButton::clicked, this, &DlgSettingsCacheDirectory::runCheck);
connect(ui->openButton, &QPushButton::clicked, this, &DlgSettingsCacheDirectory::openDirectory);
@@ -92,7 +92,7 @@ void DlgSettingsCacheDirectory::loadSettings()
// if not found then add a new item with this value
if (index < 0) {
ui->comboBoxLimit->addItem(QString::fromLatin1("%1 MB").arg(limit), limit);
ui->comboBoxLimit->addItem(QStringLiteral("%1 MB").arg(limit), limit);
index = ui->comboBoxLimit->count() - 1;
}
ui->comboBoxLimit->setCurrentIndex(index);
@@ -208,7 +208,7 @@ bool ApplicationCache::periodicCheckOfSize() const
QString application = QString::fromStdString(App::Application::getExecutableName());
QSettings settings(vendor, application);
QString key = QString::fromLatin1("LastCacheCheck");
QString key = QStringLiteral("LastCacheCheck");
QDate date = settings.value(key).toDate();
QDate now = QDate::currentDate();
@@ -245,7 +245,7 @@ bool ApplicationCache::performAction(qint64 total)
QString warn = tr("Warning: Please make sure that this is the only running %1 instance "
"and that no documents are opened as this may result into data loss!").arg(QCoreApplication::applicationName());
msgBox.setText(QString::fromLatin1("%1 %2\n\n\n%3").arg(hint, ask, warn));
msgBox.setText(QStringLiteral("%1 %2\n\n\n%3").arg(hint, ask, warn));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No | QMessageBox::Open);
msgBox.setDefaultButton(QMessageBox::No);
@@ -286,7 +286,7 @@ void ApplicationCache::clearDirectory(const QString& path)
{
// Add the transient directories and the lock files to the ignore list
QDir tmp = QString::fromUtf8(App::Application::getUserCachePath().c_str());
tmp.setNameFilters(QStringList() << QString::fromLatin1("*.lock"));
tmp.setNameFilters(QStringList() << QStringLiteral("*.lock"));
tmp.setFilter(QDir::Files);
QList<QFileInfo> dirs;
@@ -347,10 +347,10 @@ qint64 ApplicationCache::toBytes(unsigned int sizeInMB)
QString ApplicationCache::toString(qint64 size)
{
QStringList units = {QString::fromLatin1("Bytes"),
QString::fromLatin1("KB"),
QString::fromLatin1("MB"),
QString::fromLatin1("GB")};
QStringList units = {QStringLiteral("Bytes"),
QStringLiteral("KB"),
QStringLiteral("MB"),
QStringLiteral("GB")};
int i;
double outputSize = size;
for (i=0; i<units.size()-1; i++) {
@@ -359,7 +359,7 @@ QString ApplicationCache::toString(qint64 size)
outputSize /= 1024;
}
return QString::fromLatin1("%1 %2").arg(QLocale().toString(outputSize, 'f', 2), units[i]);
return QStringLiteral("%1 %2").arg(QLocale().toString(outputSize, 'f', 2), units[i]);
}
// ----------------------------------------------------------------------------

2
src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp
View File

@@ -48,7 +48,7 @@ DlgSettingsDocumentImp::DlgSettingsDocumentImp( QWidget* parent )
ui->prefSaveTransaction->hide();
ui->prefDiscardTransaction->hide();
QString tip = QString::fromLatin1("<html><head/><body><p>%1</p>"
QString tip = QStringLiteral("<html><head/><body><p>%1</p>"
"<p>%2: %Y%m%d-%H%M%S</p>"
"<p>%3: <a href=\"http://www.cplusplus.com/reference/ctime/strftime/\">C++ strftime</a>"
"</p></body></html>").arg(tr("The format of the date to use."), tr("Default"), tr("Format"));

2
src/Gui/PreferencePages/DlgSettingsEditor.cpp
View File

@@ -253,7 +253,7 @@ void DlgSettingsEditor::loadSettings()
ui->radioSpaces->onRestore();
setEditorTabWidth(ui->tabSize->value());
ui->textEdit1->setPlainText(QString::fromLatin1("# Short Python sample\n"
ui->textEdit1->setPlainText(QStringLiteral("# Short Python sample\n"
"import sys\n"
"\n"
"def foo(begin, end):\n"

4
src/Gui/PreferencePages/DlgSettingsGeneral.cpp
View File

@@ -322,7 +322,7 @@ void DlgSettingsGeneral::loadSettings()
int index = 1;
TStringMap list = Translator::instance()->supportedLocales();
ui->Languages->clear();
ui->Languages->addItem(QString::fromLatin1("English"), QByteArray("English"));
ui->Languages->addItem(QStringLiteral("English"), QByteArray("English"));
for (auto it = list.begin(); it != list.end(); ++it, index++) {
QByteArray lang = it->first.c_str();
QString langname = QString::fromLatin1(lang.constData());
@@ -739,7 +739,7 @@ void DlgSettingsGeneral::onImportConfigClicked()
auto path = fs::path(QFileDialog::getOpenFileName(this,
tr("Choose a FreeCAD config file to import"),
QString(),
QString::fromUtf8("*.cfg")).toStdString());
QStringLiteral("*.cfg")).toStdString());
if (!path.empty()) {
// Create a name from the filename:
auto packName = path.filename().stem().string();

2
src/Gui/PreferencePages/DlgSettingsLightSources.cpp
View File

@@ -233,7 +233,7 @@ void DlgSettingsLightSources::saveDirection()
if (lightDragger) {
const SbRotation rotation = lightDragger->rotation.getValue();
const SbVec3f dir = getDirectionVector(rotation);
const QString headlightDir = QString::fromLatin1("(%1,%2,%3)").arg(dir[0]).arg(dir[1]).arg(dir[2]);
const QString headlightDir = QStringLiteral("(%1,%2,%3)").arg(dir[0]).arg(dir[1]).arg(dir[2]);
ParameterGrp::handle grp = ui->sliderIntensity1->getWindowParameter();

12
src/Gui/PreferencePages/DlgSettingsNavigation.cpp
View File

@@ -285,21 +285,21 @@ void DlgSettingsNavigation::onMouseButtonClicked()
ui->comboNavigationStyle->itemData(ui->comboNavigationStyle->currentIndex(), Qt::UserRole);
void* instance = Base::Type::createInstanceByName((const char*)data.toByteArray());
std::unique_ptr<UserNavigationStyle> ns(static_cast<UserNavigationStyle*>(instance));
uimb.groupBox->setTitle(uimb.groupBox->title() + QString::fromLatin1(" ")
uimb.groupBox->setTitle(uimb.groupBox->title() + QStringLiteral(" ")
+ ui->comboNavigationStyle->currentText());
QString descr;
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::SELECTION));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
uimb.selectionLabel->setText(QString::fromLatin1("<b>%1</b>").arg(descr));
uimb.selectionLabel->setText(QStringLiteral("<b>%1</b>").arg(descr));
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::PANNING));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
uimb.panningLabel->setText(QString::fromLatin1("<b>%1</b>").arg(descr));
uimb.panningLabel->setText(QStringLiteral("<b>%1</b>").arg(descr));
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::DRAGGING));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
uimb.rotationLabel->setText(QString::fromLatin1("<b>%1</b>").arg(descr));
uimb.rotationLabel->setText(QStringLiteral("<b>%1</b>").arg(descr));
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::ZOOMING));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
uimb.zoomingLabel->setText(QString::fromLatin1("<b>%1</b>").arg(descr));
uimb.zoomingLabel->setText(QStringLiteral("<b>%1</b>").arg(descr));
dlg.exec();
}
@@ -416,7 +416,7 @@ CameraDialog::CameraDialog(QWidget* parent)
auto currentViewButton = new QPushButton(this);
currentViewButton->setText(tr("Current view"));
currentViewButton->setObjectName(QString::fromLatin1("currentView"));
currentViewButton->setObjectName(QStringLiteral("currentView"));
layout->addWidget(currentViewButton, 4, 1, 2, 1);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);

10
src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp
View File

@@ -111,7 +111,7 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool
textLabel->setEnabled(enableCheckBox->isChecked());
// 4: shortcut
shortcutLabel = new QLabel(QString::fromLatin1("(W, %1)").arg(index + 1), this);
shortcutLabel = new QLabel(QStringLiteral("(W, %1)").arg(index + 1), this);
shortcutLabel->setToolTip(tr("Shortcut to activate this workbench."));
shortcutLabel->setEnabled(enableCheckBox->isChecked());
shortcutLabel->setVisible(index < 9);
@@ -188,7 +188,7 @@ void wbListItem::setStartupWb(bool val)
void wbListItem::setShortcutLabel(int index)
{
shortcutLabel->setText(QString::fromLatin1("(W, %1)").arg(index + 1));
shortcutLabel->setText(QStringLiteral("(W, %1)").arg(index + 1));
shortcutLabel->setVisible(index < 9);
}
@@ -593,9 +593,9 @@ void DlgSettingsWorkbenchesImp::setStartWorkbenchComboItems()
}
{ // add special workbench to selection
QPixmap px = Application::Instance->workbenchIcon(QString::fromLatin1("NoneWorkbench"));
QString key = QString::fromLatin1("<last>");
QString value = QString::fromLatin1("$LastModule");
QPixmap px = Application::Instance->workbenchIcon(QStringLiteral("NoneWorkbench"));
QString key = QStringLiteral("<last>");
QString value = QStringLiteral("$LastModule");
if (px.isNull()) {
ui->AutoloadModuleCombo->addItem(key, QVariant(value));
}