Qt5: 'endl' manipulator is deprecated with 5.15. Replace it with newlines.

This commit is contained in:
wmayer
2020-10-15 15:22:28 +02:00
parent d4c0baba0c
commit ef0fd3ca67
5 changed files with 38 additions and 38 deletions

View File

@@ -770,38 +770,38 @@ void AboutDialog::on_copyButton_clicked()
}
}
str << "OS: " << SystemInfo::getOperatingSystem() << deskInfo << endl;
str << "OS: " << SystemInfo::getOperatingSystem() << deskInfo << '\n';
int wordSize = SystemInfo::getWordSizeOfOS();
if (wordSize > 0) {
str << "Word size of OS: " << wordSize << "-bit" << endl;
str << "Word size of OS: " << wordSize << "-bit\n";
}
str << "Word size of " << exe << ": " << QSysInfo::WordSize << "-bit" << endl;
str << "Word size of " << exe << ": " << QSysInfo::WordSize << "-bit\n";
str << "Version: " << major << "." << minor << "." << build;
char *appimage = getenv("APPIMAGE");
if (appimage)
str << " AppImage";
str << endl;
str << '\n';
#if defined(_DEBUG) || defined(DEBUG)
str << "Build type: Debug" << endl;
str << "Build type: Debug\n";
#elif defined(NDEBUG)
str << "Build type: Release" << endl;
str << "Build type: Release\n";
#elif defined(CMAKE_BUILD_TYPE)
str << "Build type: " << CMAKE_BUILD_TYPE << endl;
str << "Build type: " << CMAKE_BUILD_TYPE << '\n';
#else
str << "Build type: Unknown" << endl;
str << "Build type: Unknown\n";
#endif
it = config.find("BuildRevisionBranch");
if (it != config.end())
str << "Branch: " << QString::fromUtf8(it->second.c_str()) << endl;
str << "Branch: " << QString::fromUtf8(it->second.c_str()) << '\n';
it = config.find("BuildRevisionHash");
if (it != config.end())
str << "Hash: " << it->second.c_str() << endl;
str << "Hash: " << it->second.c_str() << '\n';
// report also the version numbers of the most important libraries in FreeCAD
str << "Python version: " << PY_VERSION << endl;
str << "Qt version: " << QT_VERSION_STR << endl;
str << "Coin version: " << COIN_VERSION << endl;
str << "Python version: " << PY_VERSION << '\n';
str << "Qt version: " << QT_VERSION_STR << '\n';
str << "Coin version: " << COIN_VERSION << '\n';
#if defined(HAVE_OCC_VERSION)
str << "OCC version: "
<< OCC_VERSION_MAJOR << "."
@@ -810,12 +810,12 @@ void AboutDialog::on_copyButton_clicked()
#ifdef OCC_VERSION_DEVELOPMENT
<< "." OCC_VERSION_DEVELOPMENT
#endif
<< endl;
<< '\n';
#endif
QLocale loc;
str << "Locale: " << loc.languageToString(loc.language()) << "/"
<< loc.countryToString(loc.country())
<< " (" << loc.name() << ")" << endl;
<< " (" << loc.name() << ")\n";
QClipboard* cb = QApplication::clipboard();
cb->setText(data);