diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2012-07-09 11:39:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 03:24:59 +0200 |
| commit | e61fc701e4110271d3f65c127af85d11cb5a4d28 (patch) | |
| tree | 5f5633d62e36160a5b9fe797e57a9a5548ac80d1 /src/corelib | |
| parent | 2d5d6c8fbc4e0575bd4388a8ccc6d198619a3a03 (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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; ) { |