Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant qt_colorConvert<T, T>() overloads

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-08-01 06:44:34 +03:00
parent 30ed1c5e03
commit 0e37793506
1 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gui/painting/qdrawhelper_p.h
View file

@ -373,11 +373,7 @@ public:
inline quint32p(quint32 v) : data(PREMUL(v)) {}
inline operator quint32() const { return data; }
inline operator quint16() const
{
return qt_colorConvert<quint16, quint32>(data, 0);
}
inline operator quint16() const { return data; }
static inline quint32p fromRawData(quint32 v)
{
@ -994,20 +990,6 @@ bool qrgb888::operator==(qrgb888 v) const
data[2] == v.data[2]);
}
template <>
inline qrgb888 qt_colorConvert(const quint32 color, const qrgb888 dummy)
{
Q_UNUSED(dummy);
return qrgb888(color);
}
template <>
inline quint32 qt_colorConvert(const qrgb888 color, const quint32 dummy)
{
Q_UNUSED(dummy);
return quint32(color);
}
// hw: endianess??
class quint24
{
@ -1035,13 +1017,6 @@ private:
uchar data[3];
};
template <>
inline quint24 qt_colorConvert(const quint32 color, const quint24 dummy)
{
Q_UNUSED(dummy);
return quint24(color);
}
// hw: endianess??
class quint18
{
@ -1069,13 +1044,6 @@ private:
uchar data[3];
};
template <>
inline quint18 qt_colorConvert(const quint32 color, const quint18 dummy)
{
Q_UNUSED(dummy);
return quint18(color);
}
class qrgb444;
class qargb4444
@ -1164,7 +1132,7 @@ qargb4444::operator quint32() const
qargb4444::operator quint8() const
{
// hw: optimize!
return qt_colorConvert<quint8, quint32>(operator quint32(), 0);
return operator quint32();
}
qargb4444 qargb4444::operator+(qargb4444 v) const
@ -1204,7 +1172,7 @@ qrgb444::operator quint32() const
qrgb444::operator quint8() const
{
// hw: optimize!
return qt_colorConvert<quint8, quint32>(operator quint32(), 0);
return operator quint32();
}
qrgb444 qrgb444::operator+(qrgb444 v) const