Gui: modernize C++11
* use nullptr
This commit is contained in:
@@ -222,7 +222,7 @@ int main( int argc, char ** argv )
|
||||
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
|
||||
QString msg = QString::fromLatin1(e.what());
|
||||
QString s = QLatin1String("<pre>") + msg + QLatin1String("</pre>");
|
||||
QMessageBox::critical(0, appName, s);
|
||||
QMessageBox::critical(nullptr, appName, s);
|
||||
exit(1);
|
||||
}
|
||||
catch (const Base::ProgramInformation& e) {
|
||||
@@ -248,7 +248,7 @@ int main( int argc, char ** argv )
|
||||
"Python is searching for its files in the following directories:\n%3\n\n"
|
||||
"Python version information:\n%4\n")
|
||||
.arg(appName, QString::fromUtf8(e.what()),
|
||||
QString::fromUtf8(Py_EncodeLocale(Py_GetPath(),NULL)), QString::fromLatin1(Py_GetVersion()));
|
||||
QString::fromUtf8(Py_EncodeLocale(Py_GetPath(),nullptr)), QString::fromLatin1(Py_GetVersion()));
|
||||
const char* pythonhome = getenv("PYTHONHOME");
|
||||
if (pythonhome) {
|
||||
msg += QObject::tr("\nThe environment variable PYTHONHOME is set to '%1'.")
|
||||
@@ -259,7 +259,7 @@ int main( int argc, char ** argv )
|
||||
msg += QObject::tr("\nPlease contact the application's support team for more information.\n\n");
|
||||
}
|
||||
|
||||
QMessageBox::critical(0, QObject::tr("Initialization of %1 failed").arg(appName), msg);
|
||||
QMessageBox::critical(nullptr, QObject::tr("Initialization of %1 failed").arg(appName), msg);
|
||||
exit(100);
|
||||
}
|
||||
catch (...) {
|
||||
@@ -268,7 +268,7 @@ int main( int argc, char ** argv )
|
||||
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
|
||||
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").arg(appName);
|
||||
QMessageBox::critical(0, QObject::tr("Initialization of %1 failed").arg(appName), msg);
|
||||
QMessageBox::critical(nullptr, QObject::tr("Initialization of %1 failed").arg(appName), msg);
|
||||
exit(101);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user