eglfs: hooks can never be null
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Thu, 17 May 2012 20:51:51 +0000 (13:51 -0700)
committerQt by Nokia <qt-info@nokia.com>
Fri, 18 May 2012 13:28:32 +0000 (15:28 +0200)
e60ca0de6015a8ee16c7be54d0d430252ef525c1 reworked the hooks design.
hooks is initialized with a stub pointer if we don't have a platform
hook.

Change-Id: Ia60facfebd9e4d9c08d237c6d49793efb598130f
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/plugins/platforms/eglfs/qeglfsscreen.cpp

index 0a97a93..3d5d428 100644 (file)
@@ -123,8 +123,7 @@ QEglFSScreen::QEglFSScreen()
     qWarning("QEglScreen %p\n", this);
 #endif
 
-    if (hooks)
-        hooks->platformInit();
+    hooks->platformInit();
 
     EGLint major, minor;
 
@@ -165,13 +164,11 @@ QEglFSScreen::~QEglFSScreen()
     if (m_surface)
         eglDestroySurface(m_dpy, m_surface);
 
-    if (hooks)
-        hooks->destroyNativeWindow(m_window);
+    hooks->destroyNativeWindow(m_window);
 
     eglTerminate(m_dpy);
 
-    if (hooks)
-        hooks->platformDestroy();
+    hooks->platformDestroy();
 }
 
 void QEglFSScreen::createAndSetPlatformContext() const {
@@ -205,8 +202,7 @@ void QEglFSScreen::createAndSetPlatformContext()
 
     EGLConfig config = q_configFromGLFormat(m_dpy, platformFormat);
 
-    if (hooks)
-        m_window = hooks->createNativeWindow(hooks->screenSize());
+    m_window = hooks->createNativeWindow(hooks->screenSize());
 
 #ifdef QEGL_EXTRA_DEBUG
     qWarning("Configuration %d matches requirements\n", (int)config);