diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-03-16 14:37:26 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-05-02 13:56:49 +0000 |
| commit | b46a5297a55c1547e3d9015e199e967276ad79c5 (patch) | |
| tree | 91607bce0700df3e82b2a2ba64144efab941671a /src/assistant/help/qhelp_global.cpp | |
| parent | 63bee398b5db72fdb40d039d8e01223992655403 (diff) | |
Refactor help lib
Fix const correctness.
Use default member initializers.
Fix some coding style issues.
Change-Id: Ib89a2840648dcacc518cda4eb0ffce97ee8444cc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'src/assistant/help/qhelp_global.cpp')
| -rw-r--r-- | src/assistant/help/qhelp_global.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/assistant/help/qhelp_global.cpp b/src/assistant/help/qhelp_global.cpp index 37a41cd3b..6316aa494 100644 --- a/src/assistant/help/qhelp_global.cpp +++ b/src/assistant/help/qhelp_global.cpp @@ -59,8 +59,8 @@ QString QHelpGlobal::documentTitle(const QString &content) { QString title = QCoreApplication::translate("QHelp", "Untitled"); if (!content.isEmpty()) { - int start = content.indexOf(QLatin1String("<title>"), 0, Qt::CaseInsensitive) + 7; - int end = content.indexOf(QLatin1String("</title>"), 0, Qt::CaseInsensitive); + const int start = content.indexOf(QLatin1String("<title>"), 0, Qt::CaseInsensitive) + 7; + const int end = content.indexOf(QLatin1String("</title>"), 0, Qt::CaseInsensitive); if ((end - start) > 0) { title = content.mid(start, end - start); if (Qt::mightBeRichText(title) || title.contains(QLatin1Char('&'))) { @@ -83,10 +83,10 @@ QString QHelpGlobal::codecFromData(const QByteArray &data) QString QHelpGlobal::codecFromHtmlData(const QByteArray &data) { - QString head = QString::fromUtf8(data.constData(), qMin(1000, data.size())); + const QString &head = QString::fromUtf8(data.constData(), qMin(1000, data.size())); int start = head.indexOf(QLatin1String("<meta"), 0, Qt::CaseInsensitive); if (start > 0) { - QRegExp r(QLatin1String("charset=([^\"\\s]+)")); + const QRegExp r(QLatin1String("charset=([^\"\\s]+)")); while (start != -1) { const int end = head.indexOf(QLatin1Char('>'), start) + 1; if (end <= start) @@ -103,8 +103,8 @@ QString QHelpGlobal::codecFromHtmlData(const QByteArray &data) QString QHelpGlobal::codecFromXmlData(const QByteArray &data) { - QString head = QString::fromUtf8(data.constData(), qMin(1000, data.size())); - QRegExp encodingExp(QLatin1String("^\\s*<\\?xml version=" - "\"\\d\\.\\d\" encoding=\"([^\"]+)\"\\?>.*")); + const QString head = QString::fromUtf8(data.constData(), qMin(1000, data.size())); + const QRegExp encodingExp(QLatin1String("^\\s*<\\?xml version=" + "\"\\d\\.\\d\" encoding=\"([^\"]+)\"\\?>.*")); return encodingExp.exactMatch(head) ? encodingExp.cap(1) : QString(); } |