summaryrefslogtreecommitdiff
path: root/src/gui/kernel/qscreen_p.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-04-09 15:31:16 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-04-09 14:23:04 +0000
commit434c866e1b76c12b3bf3dcdd76a00f4d29aa64d3 (patch)
tree227a078475564b5f290d0dbf440fce597a5d9dc0 /src/gui/kernel/qscreen_p.h
parent0bee05f4c1036e2852de88f068e4f92926c4efa7 (diff)
downloadqtbase-434c866e1b76c12b3bf3dcdd76a00f4d29aa64d3.tar.gz
QtGui: Use member initialization for QWindowPrivate, QScreenPrivate
Remove the constructors, destructors in favor of member initialization. Change-Id: I323826328fb783ea2cd931c0e6aad45a98a2ebeb Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/gui/kernel/qscreen_p.h')
-rw-r--r--src/gui/kernel/qscreen_p.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h
index 8e81c7bf87..e5988ff829 100644
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@@ -64,12 +64,6 @@ class QScreenPrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QScreen)
public:
- QScreenPrivate()
- : platformScreen(nullptr)
- , orientationUpdateMask(nullptr)
- {
- }
-
void setPlatformScreen(QPlatformScreen *screen);
void updateHighDpi()
{
@@ -79,16 +73,16 @@ public:
void updatePrimaryOrientation();
- QPlatformScreen *platformScreen;
+ QPlatformScreen *platformScreen = nullptr;
Qt::ScreenOrientations orientationUpdateMask;
- Qt::ScreenOrientation orientation;
- Qt::ScreenOrientation filteredOrientation;
- Qt::ScreenOrientation primaryOrientation;
+ Qt::ScreenOrientation orientation = Qt::PrimaryOrientation;
+ Qt::ScreenOrientation filteredOrientation = Qt::PrimaryOrientation;
+ Qt::ScreenOrientation primaryOrientation = Qt::LandscapeOrientation;
QRect geometry;
QRect availableGeometry;
- QDpi logicalDpi;
- qreal refreshRate;
+ QDpi logicalDpi = {96, 96};
+ qreal refreshRate = 60;
};
QT_END_NAMESPACE