From cda2b8cbdbd9838335a9cef880d5f7fa8e81e99e Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 10 May 2025 17:05:11 +0200 Subject: [PATCH] Use Application::getExecutableName() instead of Config()["ExeName"] --- src/App/Application.cpp | 4 ++-- src/Gui/MainWindow.cpp | 4 ++-- src/Main/MainCmd.cpp | 4 ++-- src/Main/MainGui.cpp | 12 ++++++------ src/Main/MainPy.cpp | 2 +- src/Mod/Material/App/Materials.cpp | 2 +- src/Mod/Mesh/App/AppMeshPy.cpp | 4 ++-- src/Mod/Start/Gui/FirstStartWidget.cpp | 3 +-- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/App/Application.cpp b/src/App/Application.cpp index c212953f85..e534de2387 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1320,7 +1320,7 @@ void Application::addImportType(const char* filter, const char* moduleName) // Due to branding stuff replace "FreeCAD" with the branded application name if (strncmp(filter, "FreeCAD", 7) == 0) { - std::string AppName = Config()["ExeName"]; + std::string AppName = getExecutableName(); AppName += item.filter.substr(7); item.filter = std::move(AppName); // put to the front of the array @@ -1436,7 +1436,7 @@ void Application::addExportType(const char* filter, const char* moduleName) // Due to branding stuff replace "FreeCAD" with the branded application name if (strncmp(filter, "FreeCAD", 7) == 0) { - std::string AppName = Config()["ExeName"]; + std::string AppName = getExecutableName(); AppName += item.filter.substr(7); item.filter = std::move(AppName); // put to the front of the array diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 0bb8e02ddf..f2b11c80bc 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -1976,8 +1976,8 @@ void MainWindow::switchToDockedMode() void MainWindow::loadWindowSettings() { - QString vendor = QString::fromUtf8(App::Application::Config()["ExeVendor"].c_str()); - QString application = QString::fromUtf8(App::Application::Config()["ExeName"].c_str()); + QString vendor = QString::fromStdString(App::Application::Config()["ExeVendor"]); + QString application = QString::fromStdString(App::Application::getExecutableName()); int major = (QT_VERSION >> 0x10) & 0xff; int minor = (QT_VERSION >> 0x08) & 0xff; QString qtver = QStringLiteral("Qt%1.%2").arg(major).arg(minor); diff --git a/src/Main/MainCmd.cpp b/src/Main/MainCmd.cpp index faab6db67a..f12fb4d12b 100644 --- a/src/Main/MainCmd.cpp +++ b/src/Main/MainCmd.cpp @@ -104,7 +104,7 @@ int main(int argc, char** argv) exit(0); } catch (const Base::Exception& e) { - std::string appName = App::Application::Config()["ExeName"]; + std::string appName = App::Application::getExecutableName(); std::cout << "While initializing " << appName << " the following exception occurred: '" << e.what() << "'\n\n"; std::cout << "Python is searching for its runtime files in the following directories:\n" @@ -123,7 +123,7 @@ int main(int argc, char** argv) exit(100); } catch (...) { - std::string appName = App::Application::Config()["ExeName"]; + std::string appName = App::Application::getExecutableName(); std::cout << "Unknown runtime error occurred while initializing " << appName << ".\n\n"; std::cout << "Please contact the application's support team for more information."; std::cout << std::endl; diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp index 16a2617273..43dd556818 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp @@ -104,7 +104,7 @@ static bool inGuiMode() static void displayInfo(const QString& msg, bool preformatted = true) { if (inGuiMode()) { - QString appName = QString::fromStdString(App::Application::Config()["ExeName"]); + QString appName = QString::fromStdString(App::Application::getExecutableName()); QMessageBox msgBox; msgBox.setIcon(QMessageBox::Information); msgBox.setWindowTitle(appName); @@ -120,7 +120,7 @@ static void displayInfo(const QString& msg, bool preformatted = true) static void displayCritical(const QString& msg, bool preformatted = true) { if (inGuiMode()) { - QString appName = QString::fromStdString(App::Application::Config()["ExeName"]); + QString appName = QString::fromStdString(App::Application::getExecutableName()); QString title = QObject::tr("Initialization of %1 failed").arg(appName); QString text = preformatted ? QStringLiteral("
%1
").arg(msg) : msg; QMessageBox::critical(nullptr, title, text); @@ -278,7 +278,7 @@ int main(int argc, char** argv) catch (const Base::Exception& e) { // Popup an own dialog box instead of that one of Windows QApplication app(argc, argv); - QString appName = QString::fromStdString(App::Application::Config()["ExeName"]); + QString appName = QString::fromStdString(App::Application::getExecutableName()); QString msg; msg = QObject::tr( "While initializing %1 the following exception occurred: '%2'\n\n" @@ -312,7 +312,7 @@ int main(int argc, char** argv) catch (...) { // Popup an own dialog box instead of that one of Windows QApplication app(argc, argv); - QString appName = QString::fromStdString(App::Application::Config()["ExeName"]); + QString appName = QString::fromStdString(App::Application::getExecutableName()); QString msg = QObject::tr( "Unknown runtime error occurred while initializing %1.\n\n" "Please contact the application's support team for more information.\n\n" @@ -359,12 +359,12 @@ int main(int argc, char** argv) std::cerr.rdbuf(oldcerr); // Destruction phase =========================================================== - Base::Console().log("%s terminating...\n", App::Application::Config()["ExeName"].c_str()); + Base::Console().log("%s terminating...\n", App::Application::getExecutableName().c_str()); // cleans up App::Application::destruct(); - Base::Console().log("%s completely terminated\n", App::Application::Config()["ExeName"].c_str()); + Base::Console().log("%s completely terminated\n", App::Application::getExecutableName().c_str()); return 0; } diff --git a/src/Main/MainPy.cpp b/src/Main/MainPy.cpp index c31802f405..1be1d0d364 100644 --- a/src/Main/MainPy.cpp +++ b/src/Main/MainPy.cpp @@ -167,7 +167,7 @@ PyMOD_INIT_FUNC(FreeCAD) App::Application::init(argc, argv.data()); } catch (const Base::Exception& e) { - std::string appName = App::Application::Config()["ExeName"]; + std::string appName = App::Application::getExecutableName(); std::cout << "While initializing " << appName << " the following exception occurred: '" << e.what() << "'\n\n"; std::cout << "Please contact the application's support team for more information." diff --git a/src/Mod/Material/App/Materials.cpp b/src/Mod/Material/App/Materials.cpp index 6b82b09f22..c0baa71841 100644 --- a/src/Mod/Material/App/Materials.cpp +++ b/src/Mod/Material/App/Materials.cpp @@ -1568,7 +1568,7 @@ void Material::save(QTextStream& stream, bool overwrite, bool saveAsCopy, bool s } stream << "---\n"; - stream << "# File created by " << QString::fromStdString(App::Application::Config()["ExeName"]) + stream << "# File created by " << QString::fromStdString(App::Application::getExecutableName()) << " " << QString::fromStdString(App::Application::Config()["ExeVersion"]) << " Revision: " << QString::fromStdString(App::Application::Config()["BuildRevision"]) << "\n"; diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp index 85a0af0924..10ff1a4bd4 100644 --- a/src/Mod/Mesh/App/AppMeshPy.cpp +++ b/src/Mod/Mesh/App/AppMeshPy.cpp @@ -267,9 +267,9 @@ private: std::unique_ptr exporter; if (exportFormat == MeshIO::AMF) { std::map meta; - meta["cad"] = App::Application::Config()["ExeName"] + " " + meta["cad"] = App::Application::getExecutableName() + " " + App::Application::Config()["ExeVersion"]; - meta[App::Application::Config()["ExeName"] + "-buildRevisionHash"] + meta[App::Application::getExecutableName() + "-buildRevisionHash"] = App::Application::Config()["BuildRevisionHash"]; exporter = std::make_unique(outputFileName, meta, exportAmfCompressed); diff --git a/src/Mod/Start/Gui/FirstStartWidget.cpp b/src/Mod/Start/Gui/FirstStartWidget.cpp index 1ea0cf545c..114cba312c 100644 --- a/src/Mod/Start/Gui/FirstStartWidget.cpp +++ b/src/Mod/Start/Gui/FirstStartWidget.cpp @@ -57,7 +57,6 @@ void FirstStartWidget::setupUi() { auto outerLayout = gsl::owner(new QVBoxLayout(this)); outerLayout->setAlignment(Qt::AlignCenter); - QString application = QString::fromUtf8(App::Application::Config()["ExeName"].c_str()); _welcomeLabel = gsl::owner(new QLabel); outerLayout->addWidget(_welcomeLabel); _descriptionLabel = gsl::owner(new QLabel); @@ -90,7 +89,7 @@ bool FirstStartWidget::eventFilter(QObject* object, QEvent* event) void FirstStartWidget::retranslateUi() { _doneButton->setText(tr("Done")); - QString application = QString::fromUtf8(App::Application::Config()["ExeName"].c_str()); + QString application = QString::fromStdString(App::Application::getExecutableName()); _welcomeLabel->setText( QLatin1String("

") + tr("Welcome to %1").arg(application) + QLatin1String("

") );