refs #935, globalsetup.cpp(369): warning C4503

This commit is contained in:
Klaus Basan
2017-04-14 02:19:42 +02:00
committed by Mathew Sutcliffe
parent f69c1e7c3f
commit 6c76e0fea6

View File

@@ -188,71 +188,75 @@ namespace BlackCore
QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const
{ {
return "timestamp: " QString s =
% this->getFormattedUtcTimestampYmdhms() "timestamp: "
% separator % this->getFormattedUtcTimestampYmdhms()
% "Global setup loaded: " % separator
% boolToYesNo(this->wasLoaded()) % "Global setup loaded: "
% separator % boolToYesNo(this->wasLoaded())
% separator
% "For development: " % "For development: "
% boolToYesNo(isDevelopment()) % boolToYesNo(isDevelopment())
% separator % separator
% "Distribution URLs: " % "Distribution URLs: "
% getDistributionUrls().toQString(i18n) % getDistributionUrls().toQString(i18n)
% separator % separator
% "Bootstrap URLs: " % "Bootstrap URLs: "
% getBootstrapFileUrls().toQString(i18n) % getBootstrapFileUrls().toQString(i18n)
% separator % separator
% "News URLs: " % "News URLs: "
% getSwiftLatestNewsUrls().toQString(i18n) % getSwiftLatestNewsUrls().toQString(i18n)
% separator % separator
% "Help URLs: " % "Help URLs: "
% getOnlineHelpUrls().toQString(i18n) % getOnlineHelpUrls().toQString(i18n)
% separator % separator
% "swift map URLs: " % "swift map URLs: "
% getSwiftMapUrls().toQString(i18n) % getSwiftMapUrls().toQString(i18n)
% separator % separator;
s +=
"DB root directory: "
% getDbRootDirectoryUrl().toQString(i18n)
% separator
% "ICAO DB reader: "
% getDbIcaoReaderUrl().toQString(i18n)
% separator
% "Model DB reader: "
% getDbModelReaderUrl().toQString(i18n)
% separator
% "Airport DB reader: "
% getDbAirportReaderUrl().toQString(i18n)
% separator
% "DB home page: "
% getDbHomePageUrl().toQString(i18n)
% separator
% "DB login service: "
% getDbLoginServiceUrl().toQString(i18n)
% separator
% "swift DB datafile locations: "
% getSwiftDbDataFileLocationUrls().toQString(i18n)
% separator;
% "DB root directory: " s +=
% getDbRootDirectoryUrl().toQString(i18n) "VATSIM bookings: "
% separator % getVatsimBookingsUrl().toQString(i18n)
% "ICAO DB reader: " % separator
% getDbIcaoReaderUrl().toQString(i18n) % "VATSIM METARs: "
% separator % getVatsimMetarsUrls().toQString(i18n)
% "Model DB reader: " % separator
% getDbModelReaderUrl().toQString(i18n) % "VATSIM data file: "
% separator % getVatsimDataFileUrls().toQString(i18n)
% "Airport DB reader: " % separator
% getDbAirportReaderUrl().toQString(i18n)
% separator
% "DB home page: "
% getDbHomePageUrl().toQString(i18n)
% separator
% "DB login service: "
% getDbLoginServiceUrl().toQString(i18n)
% separator
% "swift DB datafile locations: "
% getSwiftDbDataFileLocationUrls().toQString(i18n)
% separator
% "VATSIM bookings: " % "FSD test servers: "
% getVatsimBookingsUrl().toQString(i18n) % getFsdTestServers().toQString(i18n)
% separator % separator
% "VATSIM METARs: "
% getVatsimMetarsUrls().toQString(i18n)
% separator
% "VATSIM data file: "
% getVatsimDataFileUrls().toQString(i18n)
% separator
% "FSD test servers: " % "Crash report server: "
% getFsdTestServers().toQString(i18n) % getCrashReportServerUrl().toQString(i18n);
% separator
% "Crash report server: " return s;
% getCrashReportServerUrl().toQString(i18n);
} }
CVariant CGlobalSetup::propertyByIndex(const BlackMisc::CPropertyIndex &index) const CVariant CGlobalSetup::propertyByIndex(const BlackMisc::CPropertyIndex &index) const