summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylandintegration_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/qwaylandintegration_p.h')
-rw-r--r--src/client/qwaylandintegration_p.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
index 4f5e651d2..3b91313b5 100644
--- a/src/client/qwaylandintegration_p.h
+++ b/src/client/qwaylandintegration_p.h
@@ -54,6 +54,8 @@
#include <qpa/qplatformintegration.h>
#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtCore/QScopedPointer>
+
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
@@ -112,10 +114,10 @@ public:
virtual QWaylandShellIntegration *shellIntegration() const;
protected:
- QWaylandClientBufferIntegration *mClientBufferIntegration;
- QWaylandServerBufferIntegration *mServerBufferIntegration;
- QWaylandShellIntegration *mShellIntegration;
- QWaylandInputDeviceIntegration *mInputDeviceIntegration;
+ QScopedPointer<QWaylandClientBufferIntegration> mClientBufferIntegration;
+ QScopedPointer<QWaylandServerBufferIntegration> mServerBufferIntegration;
+ QScopedPointer<QWaylandShellIntegration> mShellIntegration;
+ QScopedPointer<QWaylandInputDeviceIntegration> mInputDeviceIntegration;
private:
void initializeClientBufferIntegration();
@@ -124,16 +126,16 @@ private:
void initializeInputDeviceIntegration();
QWaylandShellIntegration *createShellIntegration(const QString& interfaceName);
- QPlatformFontDatabase *mFontDb;
+ QScopedPointer<QPlatformFontDatabase> mFontDb;
#ifndef QT_NO_DRAGANDDROP
- QPlatformClipboard *mClipboard;
- QPlatformDrag *mDrag;
+ QScopedPointer<QPlatformClipboard> mClipboard;
+ QScopedPointer<QPlatformDrag> mDrag;
#endif
- QWaylandDisplay *mDisplay;
- QPlatformNativeInterface *mNativeInterface;
+ QScopedPointer<QWaylandDisplay> mDisplay;
+ QScopedPointer<QPlatformNativeInterface> mNativeInterface;
QScopedPointer<QPlatformInputContext> mInputContext;
#ifndef QT_NO_ACCESSIBILITY
- QPlatformAccessibility *mAccessibility;
+ QScopedPointer<QPlatformAccessibility> mAccessibility;
#endif
bool mClientBufferIntegrationInitialized;
bool mServerBufferIntegrationInitialized;