foreach (QXcbScreen *screen, connection->screens())
screenAdded(screen);
- m_fontDatabase = new QGenericUnixFontDatabase();
- m_nativeInterface = new QXcbNativeInterface;
-
- m_inputContext = QPlatformInputContextFactory::create();
-
- m_accessibility = new QPlatformAccessibility();
+ m_fontDatabase.reset(new QGenericUnixFontDatabase());
+ m_nativeInterface.reset(new QXcbNativeInterface);
+ m_inputContext.reset(QPlatformInputContextFactory::create());
+ m_accessibility.reset(new QPlatformAccessibility());
}
QXcbIntegration::~QXcbIntegration()
{
qDeleteAll(m_connections);
- delete m_accessibility;
}
QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const
QPlatformFontDatabase *QXcbIntegration::fontDatabase() const
{
- return m_fontDatabase;
+ return m_fontDatabase.data();
}
QPlatformNativeInterface * QXcbIntegration::nativeInterface() const
{
- return m_nativeInterface;
+ return m_nativeInterface.data();
}
QPlatformClipboard *QXcbIntegration::clipboard() const
QPlatformInputContext *QXcbIntegration::inputContext() const
{
- return m_inputContext;
+ return m_inputContext.data();
}
QPlatformAccessibility *QXcbIntegration::accessibility() const
{
- return m_accessibility;
+ return m_accessibility.data();
}
QT_END_NAMESPACE
private:
QList<QXcbConnection *> m_connections;
- QPlatformFontDatabase *m_fontDatabase;
- QPlatformNativeInterface *m_nativeInterface;
+ QScopedPointer<QPlatformFontDatabase> m_fontDatabase;
+ QScopedPointer<QPlatformNativeInterface> m_nativeInterface;
- QPlatformInputContext *m_inputContext;
+ QScopedPointer<QPlatformInputContext> m_inputContext;
QAbstractEventDispatcher *m_eventDispatcher;
- QPlatformAccessibility *m_accessibility;
+ QScopedPointer<QPlatformAccessibility> m_accessibility;
};
QT_END_NAMESPACE