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

Add Q_DECL_CONSTEXPR to a QChar, QLatin1Char and QLatin1String constructors

Browse Source 
These types now technically are trivially-constructible and
standard-layout in C++0x.

Change-Id: I455bd905fd6e237a1dff517b86dcbe59d571266f
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
This commit is contained in:
Thiago Macieira 2011-07-07 18:48:47 +02:00 committed by Qt by Nokia
parent 5e0c7ebdf1
commit c2ca2d7fb3
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,9 @@ class QString;
struct QLatin1Char
{
public:
inline explicit QLatin1Char(char c) : ch(c) {}
inline char toLatin1() const { return ch; }
inline ushort unicode() const { return ushort(uchar(ch)); }
Q_DECL_CONSTEXPR inline explicit QLatin1Char(char c) : ch(c) {}
Q_DECL_CONSTEXPR inline char toLatin1() const { return ch; }
Q_DECL_CONSTEXPR inline ushort unicode() const { return ushort(uchar(ch)); }
private:
char ch;
@ -66,17 +66,6 @@ private:
class Q_CORE_EXPORT QChar {
public:
QChar();
#ifndef QT_NO_CAST_FROM_ASCII
QT_ASCII_CAST_WARN_CONSTRUCTOR QChar(char c);
QT_ASCII_CAST_WARN_CONSTRUCTOR QChar(uchar c);
#endif
QChar(QLatin1Char ch);
QChar(uchar c, uchar r);
inline QChar(ushort rc) : ucs(rc){}
QChar(short rc);
QChar(uint rc);
QChar(int rc);
enum SpecialCharacter {
Null = 0x0000,
Nbsp = 0x00a0,
@ -87,8 +76,21 @@ public:
ParagraphSeparator = 0x2029,
LineSeparator = 0x2028
};
QChar(SpecialCharacter sc);
Q_DECL_CONSTEXPR QChar() : ucs(0) {}
Q_DECL_CONSTEXPR QChar(ushort rc) : ucs(rc){} // implicit
Q_DECL_CONSTEXPR QChar(uchar c, uchar r) : ucs(ushort((r << 8) | c)){}
Q_DECL_CONSTEXPR QChar(short rc) : ucs(ushort(rc)){} // implicit
Q_DECL_CONSTEXPR QChar(uint rc) : ucs(ushort(rc & 0xffff)){}
Q_DECL_CONSTEXPR QChar(int rc) : ucs(ushort(rc & 0xffff)){}
Q_DECL_CONSTEXPR QChar(SpecialCharacter s) : ucs(ushort(s)) {} // implicit
Q_DECL_CONSTEXPR QChar(QLatin1Char ch) : ucs(ch.unicode()) {} // implicit
#ifndef QT_NO_CAST_FROM_ASCII
// these two constructors are NOT inline const_expr!
QT_ASCII_CAST_WARN_CONSTRUCTOR explicit QChar(char c);
QT_ASCII_CAST_WARN_CONSTRUCTOR explicit QChar(uchar c);
#endif
// Unicode information
enum Category
@ -343,18 +345,9 @@ private:
Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE);
inline QChar::QChar() : ucs(0) {}
inline char QChar::toLatin1() const { return ucs > 0xff ? '\0' : char(ucs); }
inline QChar QChar::fromLatin1(char c) { return QChar(ushort(uchar(c))); }
inline QChar::QChar(uchar c, uchar r) : ucs(ushort((r << 8) | c)){}
inline QChar::QChar(short rc) : ucs(ushort(rc)){}
inline QChar::QChar(uint rc) : ucs(ushort(rc & 0xffff)){}
inline QChar::QChar(int rc) : ucs(ushort(rc & 0xffff)){}
inline QChar::QChar(SpecialCharacter s) : ucs(ushort(s)) {}
inline QChar::QChar(QLatin1Char ch) : ucs(ch.unicode()) {}
inline void QChar::setCell(uchar acell)
{ ucs = ushort((ucs & 0xff00) + acell); }
inline void QChar::setRow(uchar arow)

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

@ -639,10 +639,10 @@ public:
};
class Q_CORE_EXPORT QLatin1String
class QLatin1String
{
public:
inline explicit QLatin1String(const char *s) : m_size(s ? int(strlen(s)) : 0), m_data(s) {}
Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s) : m_size(s ? int(strlen(s)) : 0), m_data(s) {}
inline const char *latin1() const { return m_data; }
inline int size() const { return m_size; }