1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge one static function into another

Browse Source 
One static function was only being used by the other, so just merge
them and reduce the work for the compiler.

Change-Id: Ia7a1c46ace6254633450632fae7ab35816ff13bf
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Thiago Macieira 2012-03-29 22:19:13 -03:00 committed by Qt by Nokia
parent 0d5fb8f522
commit 9a09b0c08c
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/io/qurl.cpp
View File

@ -392,24 +392,16 @@ static const ushort * const encodedQueryActions = encodedFragmentActions + 4; //
static inline QString static inline QString
recode(const QString &input, const ushort *actions, QUrl::ComponentFormattingOptions encoding, recodeFromUser(const QString &input, const ushort *actions, int from, int to)
int from, int iend)
{ {
QString output; QString output;
const QChar *begin = input.constData() + from; const QChar *begin = input.constData() + from;
const QChar *end = input.constData() + iend; const QChar *end = input.constData() + to;
if (qt_urlRecode(output, begin, end, encoding, actions)) if (qt_urlRecode(output, begin, end,
QUrl::DecodeUnicode | QUrl::DecodeAllDelimiters | QUrl::DecodeSpaces, actions))
return output; return output;
return input.mid(from, iend - from); return input.mid(from, to - from);
}
static inline QString
recodeFromUser(const QString &input, const ushort *actions, int from, int end)
{
return recode(input, actions,
QUrl::DecodeUnicode | QUrl::DecodeAllDelimiters | QUrl::DecodeSpaces,
from, end);
} }
void QUrlPrivate::appendAuthority(QString &appendTo, QUrl::FormattingOptions options) const void QUrlPrivate::appendAuthority(QString &appendTo, QUrl::FormattingOptions options) const