AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace 'const QChar &' with 'QChar ' for QChar and QString

Browse Source 
Merge-request: 69
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I61f5a54b783252029fcad95677958fa6a2130d01
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
This commit is contained in:
Ritt Konstantin 2011-10-18 16:44:54 +02:00 committed by Qt by Nokia
parent 82d6518696
commit 42402a1672
6 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qchar.cpp
View File

@ -1308,7 +1308,7 @@ QChar QChar::fromAscii(char c)
\sa {Serializing Qt Data Types}
*/
QDataStream &operator<<(QDataStream &out, const QChar &chr)
QDataStream &operator<<(QDataStream &out, QChar chr)
{
out << quint16(chr.unicode());
return out;

2
src/corelib/tools/qchar.h
View File

@ -361,7 +361,7 @@ inline bool operator<(QChar c1, QChar c2) { return c1.unicode() < c2.unicode();
inline bool operator>(QChar c1, QChar c2) { return c1.unicode() > c2.unicode(); }
#ifndef QT_NO_DATASTREAM
Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QChar &);
Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QChar);
Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QChar &);
#endif

42
src/corelib/tools/qstring.cpp
View File

@ -113,13 +113,13 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
static inline int qt_last_index_of(const QChar *haystack, int haystackLen, const QChar &needle,
static inline int qt_last_index_of(const QChar *haystack, int haystackLen, QChar needle,
int from, Qt::CaseSensitivity cs);
static inline int qt_string_count(const QChar *haystack, int haystackLen,
const QChar *needle, int needleLen,
Qt::CaseSensitivity cs);
static inline int qt_string_count(const QChar *haystack, int haystackLen,
const QChar &needle, Qt::CaseSensitivity cs);
QChar needle, Qt::CaseSensitivity cs);
static inline int qt_find_latin1_string(const QChar *hay, int size, const QLatin1String &needle,
int from, Qt::CaseSensitivity cs);
static inline bool qt_starts_with(const QChar *haystack, int haystackLen,
@ -3435,7 +3435,7 @@ bool QString::startsWith(const QLatin1String& s, Qt::CaseSensitivity cs) const
Returns true if the string starts with \a c; otherwise returns
false.
*/
bool QString::startsWith(const QChar &c, Qt::CaseSensitivity cs) const
bool QString::startsWith(QChar c, Qt::CaseSensitivity cs) const
{
return d->size
&& (cs == Qt::CaseSensitive
@ -3509,7 +3509,7 @@ bool QString::endsWith(const QLatin1String& s, Qt::CaseSensitivity cs) const
\overload endsWith()
*/
bool QString::endsWith(const QChar &c, Qt::CaseSensitivity cs) const
bool QString::endsWith(QChar c, Qt::CaseSensitivity cs) const
{
return d->size
&& (cs == Qt::CaseSensitive
@ -6036,7 +6036,7 @@ QStringList QString::split(const QString &sep, SplitBehavior behavior, Qt::CaseS
/*!
\overload
*/
QStringList QString::split(const QChar &sep, SplitBehavior behavior, Qt::CaseSensitivity cs) const
QStringList QString::split(QChar sep, SplitBehavior behavior, Qt::CaseSensitivity cs) const
{
QStringList list;
int start = 0;
@ -6315,7 +6315,7 @@ static ArgEscapeData findArgEscapes(const QString &s)
}
static QString replaceArgEscapes(const QString &s, const ArgEscapeData &d, int field_width,
const QString &arg, const QString &larg, const QChar &fillChar = QLatin1Char(' '))
const QString &arg, const QString &larg, QChar fillChar = QLatin1Char(' '))
{
const QChar *uc_begin = s.unicode();
const QChar *uc_end = uc_begin + s.length();
@ -6437,7 +6437,7 @@ static QString replaceArgEscapes(const QString &s, const ArgEscapeData &d, int f
is output and the result is undefined. Place marker numbers must be
in the range 1 to 99.
*/
QString QString::arg(const QString &a, int fieldWidth, const QChar &fillChar) const
QString QString::arg(const QString &a, int fieldWidth, QChar fillChar) const
{
ArgEscapeData d = findArgEscapes(*this);
@ -6526,7 +6526,7 @@ QString QString::arg(const QString &a, int fieldWidth, const QChar &fillChar) co
a7, \a a8, and \a a9 are replaced in one pass.
*/
/*! \fn QString QString::arg(int a, int fieldWidth, int base, const QChar &fillChar) const
/*! \fn QString QString::arg(int a, int fieldWidth, int base, QChar fillChar) const
\overload arg()
The \a a argument is expressed in base \a base, which is 10 by
@ -6552,7 +6552,7 @@ QString QString::arg(const QString &a, int fieldWidth, const QChar &fillChar) co
minus sign.
*/
/*! \fn QString QString::arg(uint a, int fieldWidth, int base, const QChar &fillChar) const
/*! \fn QString QString::arg(uint a, int fieldWidth, int base, QChar fillChar) const
\overload arg()
The \a base argument specifies the base to use when converting the
@ -6563,7 +6563,7 @@ QString QString::arg(const QString &a, int fieldWidth, const QChar &fillChar) co
minus sign.
*/
/*! \fn QString QString::arg(long a, int fieldWidth, int base, const QChar &fillChar) const
/*! \fn QString QString::arg(long a, int fieldWidth, int base, QChar fillChar) const
\overload arg()
\a fieldWidth specifies the minimum amount of space that \a a is
@ -6589,7 +6589,7 @@ QString QString::arg(const QString &a, int fieldWidth, const QChar &fillChar) co
minus sign.
*/
/*! \fn QString QString::arg(ulong a, int fieldWidth, int base, const QChar &fillChar) const
/*! \fn QString QString::arg(ulong a, int fieldWidth, int base, QChar fillChar) const
\overload arg()
\a fieldWidth specifies the minimum amount of space that \a a is
@ -6622,7 +6622,7 @@ QString QString::arg(const QString &a, int fieldWidth, const QChar &fillChar) co
used. For negative numbers, zero padding might appear before the
minus sign.
*/
QString QString::arg(qlonglong a, int fieldWidth, int base, const QChar &fillChar) const
QString QString::arg(qlonglong a, int fieldWidth, int base, QChar fillChar) const
{
ArgEscapeData d = findArgEscapes(*this);
@ -6666,7 +6666,7 @@ QString QString::arg(qlonglong a, int fieldWidth, int base, const QChar &fillCha
used. For negative numbers, zero padding might appear before the
minus sign.
*/
QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillChar) const
QString QString::arg(qulonglong a, int fieldWidth, int base, QChar fillChar) const
{
ArgEscapeData d = findArgEscapes(*this);
@ -6697,7 +6697,7 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh
/*!
\overload arg()
\fn QString QString::arg(short a, int fieldWidth, int base, const QChar &fillChar) const
\fn QString QString::arg(short a, int fieldWidth, int base, QChar fillChar) const
\a fieldWidth specifies the minimum amount of space that \a a is
padded to and filled with the character \a fillChar. A positive
@ -6714,7 +6714,7 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh
*/
/*!
\fn QString QString::arg(ushort a, int fieldWidth, int base, const QChar &fillChar) const
\fn QString QString::arg(ushort a, int fieldWidth, int base, QChar fillChar) const
\overload arg()
\a fieldWidth specifies the minimum amount of space that \a a is
@ -6734,7 +6734,7 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh
/*!
\overload arg()
*/
QString QString::arg(QChar a, int fieldWidth, const QChar &fillChar) const
QString QString::arg(QChar a, int fieldWidth, QChar fillChar) const
{
QString c;
c += a;
@ -6746,7 +6746,7 @@ QString QString::arg(QChar a, int fieldWidth, const QChar &fillChar) const
The \a a argument is interpreted as a Latin-1 character.
*/
QString QString::arg(char a, int fieldWidth, const QChar &fillChar) const
QString QString::arg(char a, int fieldWidth, QChar fillChar) const
{
QString c;
c += QLatin1Char(a);
@ -6754,7 +6754,7 @@ QString QString::arg(char a, int fieldWidth, const QChar &fillChar) const
}
/*!
\fn QString QString::arg(double a, int fieldWidth, char format, int precision, const QChar &fillChar) const
\fn QString QString::arg(double a, int fieldWidth, char format, int precision, QChar fillChar) const
\overload arg()
Argument \a a is formatted according to the specified \a format and
@ -6778,7 +6778,7 @@ QString QString::arg(char a, int fieldWidth, const QChar &fillChar) const
\sa QLocale::toString()
*/
QString QString::arg(double a, int fieldWidth, char fmt, int prec, const QChar &fillChar) const
QString QString::arg(double a, int fieldWidth, char fmt, int prec, QChar fillChar) const
{
ArgEscapeData d = findArgEscapes(*this);
@ -8482,7 +8482,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const
\sa indexOf(), count()
*/
static inline int qt_last_index_of(const QChar *haystack, int haystackLen, const QChar &needle,
static inline int qt_last_index_of(const QChar *haystack, int haystackLen, QChar needle,
int from, Qt::CaseSensitivity cs)
{
ushort c = needle.unicode();
@ -8526,7 +8526,7 @@ static inline int qt_string_count(const QChar *haystack, int haystackLen,
return num;
}
static inline int qt_string_count(const QChar *unicode, int size, const QChar &ch,
static inline int qt_string_count(const QChar *unicode, int size, QChar ch,
Qt::CaseSensitivity cs)
{
ushort c = ch.unicode();

50
src/corelib/tools/qstring.h
View File

@ -211,29 +211,29 @@ public:
QCharRef operator[](uint i);
QString arg(qlonglong a, int fieldwidth=0, int base=10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(qulonglong a, int fieldwidth=0, int base=10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(long a, int fieldwidth=0, int base=10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(ulong a, int fieldwidth=0, int base=10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(int a, int fieldWidth = 0, int base = 10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(uint a, int fieldWidth = 0, int base = 10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(short a, int fieldWidth = 0, int base = 10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(ushort a, int fieldWidth = 0, int base = 10,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(double a, int fieldWidth = 0, char fmt = 'g', int prec = -1,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(char a, int fieldWidth = 0,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(QChar a, int fieldWidth = 0,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(const QString &a, int fieldWidth = 0,
const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QChar fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
QString arg(const QString &a1, const QString &a2) const Q_REQUIRED_RESULT;
QString arg(const QString &a1, const QString &a2, const QString &a3) const Q_REQUIRED_RESULT;
QString arg(const QString &a1, const QString &a2, const QString &a3,
@ -315,11 +315,11 @@ public:
bool startsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool startsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool startsWith(const QLatin1String &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool startsWith(const QChar &c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool startsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool endsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool endsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool endsWith(const QLatin1String &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool endsWith(const QChar &c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
bool endsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
QString leftJustified(int width, QChar fill = QLatin1Char(' '), bool trunc = false) const Q_REQUIRED_RESULT;
QString rightJustified(int width, QChar fill = QLatin1Char(' '), bool trunc = false) const Q_REQUIRED_RESULT;
@ -382,7 +382,7 @@ public:
QStringList split(const QString &sep, SplitBehavior behavior = KeepEmptyParts,
Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_REQUIRED_RESULT;
QStringList split(const QChar &sep, SplitBehavior behavior = KeepEmptyParts,
QStringList split(QChar sep, SplitBehavior behavior = KeepEmptyParts,
Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_REQUIRED_RESULT;
#ifndef QT_NO_REGEXP
QStringList split(const QRegExp &sep, SplitBehavior behavior = KeepEmptyParts) const Q_REQUIRED_RESULT;
@ -731,17 +731,17 @@ inline QString &QString::setNum(ulong n, int base)
{ return setNum(qulonglong(n), base); }
inline QString &QString::setNum(float n, char f, int prec)
{ return setNum(double(n),f,prec); }
inline QString QString::arg(int a, int fieldWidth, int base, const QChar &fillChar) const
inline QString QString::arg(int a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qlonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(uint a, int fieldWidth, int base, const QChar &fillChar) const
inline QString QString::arg(uint a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qulonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(long a, int fieldWidth, int base, const QChar &fillChar) const
inline QString QString::arg(long a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qlonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(ulong a, int fieldWidth, int base, const QChar &fillChar) const
inline QString QString::arg(ulong a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qulonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(short a, int fieldWidth, int base, const QChar &fillChar) const
inline QString QString::arg(short a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qlonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(ushort a, int fieldWidth, int base, const QChar &fillChar) const
inline QString QString::arg(ushort a, int fieldWidth, int base, QChar fillChar) const
{ return arg(qulonglong(a), fieldWidth, base, fillChar); }
inline QString QString::arg(const QString &a1, const QString &a2) const
{ const QString *args[2] = { &a1, &a2 }; return multiArg(2, args); }
@ -799,10 +799,10 @@ public:
// all this is not documented: We just say "like QChar" and let it be.
inline operator QChar() const
{ return i < s.d->size ? s.d->data()[i] : 0; }
inline QCharRef &operator=(const QChar &c)
{ if (i >= s.d->size) s.expand(i); else s.detach();
s.d->data()[i] = c.unicode(); return *this; }
{ return i < s.d->size ? s.d->data()[i] : 0; }
inline QCharRef &operator=(QChar c)
{ if (i >= s.d->size) s.expand(i); else s.detach();
s.d->data()[i] = c.unicode(); return *this; }
// An operator= for each QChar cast constructors
#ifndef QT_NO_CAST_FROM_ASCII

4
src/corelib/tools/qunicodetables_p.h
View File

@ -218,11 +218,11 @@ namespace QUnicodeTables {
Q_CORE_EXPORT QUnicodeTables::LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4);
inline int lineBreakClass(const QChar &ch)
inline int lineBreakClass(QChar ch)
{ return lineBreakClass(ch.unicode()); }
Q_CORE_EXPORT int QT_FASTCALL script(uint ucs4);
inline int script(const QChar &ch)
inline int script(QChar ch)
{ return script(ch.unicode()); }
} // namespace QUnicodeTables

4
util/unicode/main.cpp
View File

@ -398,11 +398,11 @@ static const char *property_string =
static const char *methods =
" Q_CORE_EXPORT QUnicodeTables::LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4);\n"
" inline int lineBreakClass(const QChar &ch)\n"
" inline int lineBreakClass(QChar ch)\n"
" { return lineBreakClass(ch.unicode()); }\n"
"\n"
" Q_CORE_EXPORT int QT_FASTCALL script(uint ucs4);\n"
" inline int script(const QChar &ch)\n"
" inline int script(QChar ch)\n"
" { return script(ch.unicode()); }\n\n";
static const int SizeOfPropertiesStruct = 20;