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

Use Q_CONSTRUCTOR_FUNCTION instead of doing the same manually

Browse Source 
Use the macro we have that does exactly what we want without the boiler
plate code.

Change-Id: I25c67a71f83f91f50128c8a54033ee53ad28e88a
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Allan Sandfeld Jensen 2015-12-16 14:50:35 +01:00 committed by Simon Hausmann
parent e78ca787ae
commit 879409fd0f
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/image/qimage_conversions.cpp
View File

@ -2967,15 +2967,6 @@ static void qInitImageConversions()
#endif #endif
} }
class QImageConversionsInitializer { Q_CONSTRUCTOR_FUNCTION(qInitImageConversions);
public:
QImageConversionsInitializer()
{
qInitImageConversions();
}
};
// Ensure initialization if this object file is linked.
static QImageConversionsInitializer qImageConversionsInitializer;
QT_END_NAMESPACE QT_END_NAMESPACE

19
src/gui/painting/qdrawhelper.cpp
View File

@ -6323,8 +6323,13 @@ void qt_memfill32(quint32 *dest, quint32 color, int count)
template<QtPixelOrder> const uint *QT_FASTCALL convertA2RGB30PMFromARGB32PM_sse4(uint *buffer, const uint *src, int count, const QPixelLayout *, const QRgb *); template<QtPixelOrder> const uint *QT_FASTCALL convertA2RGB30PMFromARGB32PM_sse4(uint *buffer, const uint *src, int count, const QPixelLayout *, const QRgb *);
#endif #endif
extern void qInitBlendFunctions();
static void qInitDrawhelperFunctions() static void qInitDrawhelperFunctions()
{ {
// Set up basic blend function tables.
qInitBlendFunctions();
#ifdef __SSE2__ #ifdef __SSE2__
qDrawHelper[QImage::Format_RGB32].bitmapBlit = qt_bitmapblit32_sse2; qDrawHelper[QImage::Format_RGB32].bitmapBlit = qt_bitmapblit32_sse2;
qDrawHelper[QImage::Format_ARGB32].bitmapBlit = qt_bitmapblit32_sse2; qDrawHelper[QImage::Format_ARGB32].bitmapBlit = qt_bitmapblit32_sse2;
@ -6518,19 +6523,7 @@ static void qInitDrawhelperFunctions()
#endif // QT_COMPILER_SUPPORTS_MIPS_DSP || QT_COMPILER_SUPPORTS_MIPS_DSPR2 #endif // QT_COMPILER_SUPPORTS_MIPS_DSP || QT_COMPILER_SUPPORTS_MIPS_DSPR2
} }
extern void qInitBlendFunctions();
class DrawHelperInitializer {
public:
DrawHelperInitializer()
{
// Set up basic blend function tables.
qInitBlendFunctions();
// Set up architecture optimized methods for the current machine.
qInitDrawhelperFunctions();
}
};
// Ensure initialization if this object file is linked. // Ensure initialization if this object file is linked.
static DrawHelperInitializer drawHelperInitializer; Q_CONSTRUCTOR_FUNCTION(qInitDrawhelperFunctions);
QT_END_NAMESPACE QT_END_NAMESPACE