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

Make QWindowGeometrySpecification suitable to use as global

Browse Source 
It's used as a global static but according to library policy it's required
to have a trivial dtor and a trivial or constexpr ctor, otherwise it
runs code at library load/unload.

Change-Id: I1fcea3ce388b2a198e3851e6d0aeb91ae0a8e4b1
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Sérgio Martins 2016-01-22 20:40:00 +00:00 committed by Sérgio Martins
parent 8eaf335259
commit af499fd7eb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/kernel/qguiapplication.cpp
View File

@ -235,11 +235,13 @@ static inline void clearFontUnlocked()
QGuiApplicationPrivate::app_font = 0; QGuiApplicationPrivate::app_font = 0;
} }
// Using aggregate initialization instead of ctor so we can have a POD global static
#define Q_WINDOW_GEOMETRY_SPECIFICATION_INITIALIZER { Qt::TopLeftCorner, -1, -1, -1, -1 }
// Geometry specification for top level windows following the convention of the // Geometry specification for top level windows following the convention of the
// -geometry command line arguments in X11 (see XParseGeometry). // -geometry command line arguments in X11 (see XParseGeometry).
struct QWindowGeometrySpecification struct QWindowGeometrySpecification
{ {
QWindowGeometrySpecification() : corner(Qt::TopLeftCorner), xOffset(-1), yOffset(-1), width(-1), height(-1) {}
static QWindowGeometrySpecification fromArgument(const QByteArray &a); static QWindowGeometrySpecification fromArgument(const QByteArray &a);
void applyTo(QWindow *window) const; void applyTo(QWindow *window) const;
@ -276,7 +278,7 @@ static inline int nextGeometryToken(const QByteArray &a, int &pos, char *op)
QWindowGeometrySpecification QWindowGeometrySpecification::fromArgument(const QByteArray &a) QWindowGeometrySpecification QWindowGeometrySpecification::fromArgument(const QByteArray &a)
{ {
QWindowGeometrySpecification result; QWindowGeometrySpecification result = Q_WINDOW_GEOMETRY_SPECIFICATION_INITIALIZER;
int pos = 0; int pos = 0;
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
char op; char op;
@ -333,7 +335,7 @@ void QWindowGeometrySpecification::applyTo(QWindow *window) const
} }
} }
static QWindowGeometrySpecification windowGeometrySpecification; static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOMETRY_SPECIFICATION_INITIALIZER;
/*! /*!
\class QGuiApplication \class QGuiApplication