Merge one static function into another

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

View File

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