From e61fc701e4110271d3f65c127af85d11cb5a4d28 Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Mon, 9 Jul 2012 11:39:10 +0200 Subject: Speed up QCoreApplication construction a bit Remove all QString conversions during QCoreApplication construction on Linux. Saves multiple mallocs. Change-Id: Ia8ba071a750dd6a08dcf14ef3ecc424f70a3098d Reviewed-by: Thiago Macieira --- src/corelib/global/qlibraryinfo.cpp | 2 +- src/corelib/tools/qlocale.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 9953eef5e1..7ea8fcc4d1 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -131,7 +131,7 @@ QLibrarySettings::QLibrarySettings() QSettings *QLibraryInfoPrivate::findConfiguration() { - QString qtconfig = QLatin1String(":/qt/etc/qt.conf"); + QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); #ifdef QT_BUILD_QMAKE if(!QFile::exists(qtconfig)) qtconfig = qmake_libraryInfoFile(); diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index c809b559dd..c5397cfddf 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -198,7 +198,7 @@ QString QLocalePrivate::bcp47Name() const if (m_data->m_language_id == QLocale::AnyLanguage) return QString(); if (m_data->m_language_id == QLocale::C) - return QLatin1String("C"); + return QStringLiteral("C"); const unsigned char *lang = language_code_list + 3*(uint(m_data->m_language_id)); const unsigned char *script = (m_data->m_script_id != QLocale::AnyScript ? script_code_list + 4*(uint(m_data->m_script_id)) : 0); @@ -295,7 +295,7 @@ bool qt_splitLocaleName(const QString &name, QString &lang, QString &script, QSt lang = script = cntry = QString(); - const QString separators = QLatin1String("_-.@"); + const QString separators = QStringLiteral("_-.@"); enum ParserState { NoState, LangState, ScriptState, CountryState }; ParserState state = LangState; for (int i = 0; i < length && state != NoState; ) { -- cgit v1.2.3