diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2018-05-01 12:26:05 -0400 |
|---|---|---|
| committer | James McDonnell <jmcdonnell@blackberry.com> | 2018-07-05 13:35:50 +0000 |
| commit | b14527f529e7889319440125b717e6677746eaac (patch) | |
| tree | cd70ce552fe9dee3a1c8c79de2ce5a0e8220d6a1 /src/plugins/platforms/qnx/qqnxwindow.cpp | |
| parent | d133b02a3b78229d37f03ae05dda47a48f8cda6d (diff) | |
Make QQnxIntegration a singleton
Turn all the static members and functions into regular members and
functions.
Change-Id: Ib37d9bdd1a84e512013af7d334e04cd2b1da640e
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index fd46f624a9..5d9eaaa3ea 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -271,7 +271,7 @@ QQnxWindow::~QQnxWindow() Q_ASSERT(m_childWindows.size() == 0); // Remove from plugin's window mapper - QQnxIntegration::removeWindow(m_window); + QQnxIntegration::instance()->removeWindow(m_window); // Remove from parent's Hierarchy. removeFromParent(); @@ -480,7 +480,7 @@ void QQnxWindow::setScreen(QQnxScreen *platformScreen) qWindowDebug("Moving window to different screen"); m_screen->removeWindow(this); - if ((QQnxIntegration::options() & QQnxIntegration::RootWindow)) { + if ((QQnxIntegration::instance()->options() & QQnxIntegration::RootWindow)) { screen_leave_window_group(m_window); } } @@ -735,7 +735,7 @@ void QQnxWindow::initWindow() m_exposed = false; // Add window to plugin's window mapper - QQnxIntegration::addWindow(m_window, window()); + QQnxIntegration::instance()->addWindow(m_window, window()); // Qt never calls these setters after creating the window, so we need to do that ourselves here setWindowState(window()->windowState()); @@ -832,7 +832,7 @@ void QQnxWindow::windowPosted() bool QQnxWindow::shouldMakeFullScreen() const { return ((static_cast<QQnxScreen *>(screen())->rootWindow() == this) - && (QQnxIntegration::options() & QQnxIntegration::FullScreenApplication)); + && (QQnxIntegration::instance()->options() & QQnxIntegration::FullScreenApplication)); } QT_END_NAMESPACE |