summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/directfb/qdirectfbintegration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/directfb/qdirectfbintegration.cpp')
-rw-r--r--src/plugins/platforms/directfb/qdirectfbintegration.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index cc667f4666..ab96733027 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -61,12 +61,12 @@ QT_BEGIN_NAMESPACE
QDirectFbScreen::QDirectFbScreen(int display)
: QPlatformScreen()
+ , m_layer(QDirectFbConvenience::dfbDisplayLayer(display))
{
- m_layer = QDirectFbConvenience::dfbDisplayLayer(display);
- m_layer->SetCooperativeLevel(m_layer,DLSCL_SHARED);
+ m_layer->SetCooperativeLevel(m_layer.data(), DLSCL_SHARED);
DFBDisplayLayerConfig config;
- m_layer->GetConfiguration(m_layer, &config);
+ m_layer->GetConfiguration(m_layer.data(), &config);
m_format = QDirectFbConvenience::imageFormatFromSurfaceFormat(config.pixelformat, config.surface_caps);
m_geometry = QRect(0,0,config.width,config.height);
@@ -79,7 +79,8 @@ QDirectFbScreen::QDirectFbScreen(int display)
}
QDirectFbIntegration::QDirectFbIntegration()
- : m_fontDb(new QGenericUnixFontDatabase())
+ : m_dfb(QDirectFbConvenience::dfbInterface())
+ , m_fontDb(new QGenericUnixFontDatabase())
, m_eventDispatcher(createUnixEventDispatcher())
{
QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher);
@@ -101,10 +102,8 @@ QDirectFbIntegration::QDirectFbIntegration()
delete[] argv[i];
delete[] argv;
-
-
- QDirectFbScreen *primaryScreen = new QDirectFbScreen(0);
- screenAdded(primaryScreen);
+ m_primaryScreen.reset(new QDirectFbScreen(0));
+ screenAdded(m_primaryScreen.data());
m_input.reset(new QDirectFbInput());
m_input->start();