summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/html5/qhtml5compositor.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/html5/qhtml5compositor.h')
-rw-r--r--src/plugins/platforms/html5/qhtml5compositor.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/platforms/html5/qhtml5compositor.h b/src/plugins/platforms/html5/qhtml5compositor.h
index e379a8ec6c..8ce3f1948a 100644
--- a/src/plugins/platforms/html5/qhtml5compositor.h
+++ b/src/plugins/platforms/html5/qhtml5compositor.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
@@ -46,7 +46,6 @@ class QHtml5Screen;
class QOpenGLContext;
class QOpenGLTextureBlitter;
-//
class QHtml5CompositedWindow
{
public:
@@ -93,8 +92,6 @@ public:
QPalette palette;
QString titleBarOptionsString;
QHtml5Compositor::SubControls subControls;
- // QFontMetrics fontMetrics;
- // Qt::LayoutDirection direction; ??
};
struct QHtml5FrameOptions {
@@ -105,7 +102,7 @@ public:
void setEnabled(bool enabled);
- void addWindow(QHtml5Window *window, QHtml5Window *parentWindow = 0);
+ void addWindow(QHtml5Window *window, QHtml5Window *parentWindow = nullptr);
void removeWindow(QHtml5Window *window);
void setScreen(QHtml5Screen *screen);
@@ -159,8 +156,6 @@ private:
QSize m_targetSize;
qreal m_targetDevicePixelRatio;
-////////////////////////
-
static QPalette makeWindowPalette();
void drawFrameWindow(QHtml5FrameOptions options, QPainter *painter);