From 8b1961929a0b9736c8c526287338143116c8e264 Mon Sep 17 00:00:00 2001 From: Martin Zielinski Date: Mon, 11 Jul 2011 10:05:21 +0200 Subject: [PATCH] Reduced usage of private headers Integration of v8 lead to a lot of v8 headers being included from private QtDeclarative headers. As v8 headers are not installed, this broke the compositor build. This change reduces the usage of private headers to the minimum. --- src/qt-compositor/compositor_api/waylandcompositor.cpp | 1 + src/qt-compositor/compositor_api/waylandsurface.cpp | 2 ++ src/qt-compositor/compositor_api/waylandsurfaceitem.cpp | 11 ++++++----- .../hardware_integration/dri2_xcb/dri2xcbbuffer.h | 2 +- .../hardware_integration/mesa_egl/mesaeglintegration.cpp | 4 ++-- .../xcomposite_egl/xcompositeeglintegration.cpp | 4 ++-- .../xcomposite_glx/xcompositeglxintegration.cpp | 4 ++-- src/qt-compositor/wayland_wrapper/wlsurface.h | 1 - 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/qt-compositor/compositor_api/waylandcompositor.cpp b/src/qt-compositor/compositor_api/waylandcompositor.cpp index 8a6f761..746ac57 100644 --- a/src/qt-compositor/compositor_api/waylandcompositor.cpp +++ b/src/qt-compositor/compositor_api/waylandcompositor.cpp @@ -43,6 +43,7 @@ #include "wayland_wrapper/wlcompositor.h" #include "wayland_wrapper/wlsurface.h" #include "wayland_wrapper/wlselection.h" +#include #ifdef QT_COMPOSITOR_DECLARATIVE #include "waylandsurfaceitem.h" diff --git a/src/qt-compositor/compositor_api/waylandsurface.cpp b/src/qt-compositor/compositor_api/waylandsurface.cpp index df89c4a..bb8104f 100644 --- a/src/qt-compositor/compositor_api/waylandsurface.cpp +++ b/src/qt-compositor/compositor_api/waylandsurface.cpp @@ -1,5 +1,7 @@ #include "waylandsurface.h" +#include + #include "wayland_wrapper/wlsurface.h" class WaylandSurfacePrivate : public QObjectPrivate diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp index a84a604..c68c27d 100644 --- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp +++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp @@ -41,13 +41,14 @@ #include "waylandsurfaceitem.h" #include "waylandsurface.h" -#include -#include +#include +//#include -#include +#include -#include -#include +#include +#include +#include void WaylandSurfaceItem::surfaceDamaged(const QRect &) { diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h index 81fa067..d2649ce 100644 --- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h +++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h @@ -7,8 +7,8 @@ #include #include +#include #include -#include #include #define EGL_EGLEXT_PROTOTYPES diff --git a/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp b/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp index 2f8f1f5..c47754c 100644 --- a/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp +++ b/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp @@ -40,8 +40,8 @@ #include "mesaeglintegration.h" +#include #include -#include #define EGL_EGLEXT_PROTOTYPES #include @@ -81,7 +81,7 @@ void MesaEglIntegration::initializeHardware(Wayland::Display *waylandDisplay) //We need a window id now :) m_compositor->topLevelWidget()->winId(); - QPlatformNativeInterface *nativeInterface = QApplicationPrivate::platformIntegration()->nativeInterface(); + QPlatformNativeInterface *nativeInterface = QApplication::platformNativeInterface(); if (nativeInterface) { d->egl_display = nativeInterface->nativeResourceForWidget("EglDisplay",m_compositor->topLevelWidget()); if (d->egl_display) { diff --git a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp b/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp index c854530..511072d 100644 --- a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp +++ b/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp @@ -4,9 +4,9 @@ #include "wayland_wrapper/wlcompositor.h" #include "wayland-xcomposite-server-protocol.h" +#include #include #include -#include #include "xcompositebuffer.h" #include "xcompositehandler.h" @@ -40,7 +40,7 @@ XCompositeEglIntegration::XCompositeEglIntegration(WaylandCompositor *compositor : GraphicsHardwareIntegration(compositor) , mDisplay(0) { - QPlatformNativeInterface *nativeInterface = QApplicationPrivate::platformIntegration()->nativeInterface(); + QPlatformNativeInterface *nativeInterface = QApplication::platformNativeInterface(); if (nativeInterface) { mDisplay = static_cast(nativeInterface->nativeResourceForWidget("Display",m_compositor->topLevelWidget())); if (!mDisplay) diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp index 9065343..9ce38a9 100644 --- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp +++ b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp @@ -4,9 +4,9 @@ #include "wayland_wrapper/wlcompositor.h" #include "wayland-xcomposite-server-protocol.h" +#include #include #include -#include #include "xcompositebuffer.h" #include "xcompositehandler.h" @@ -43,7 +43,7 @@ XCompositeGLXIntegration::XCompositeGLXIntegration(WaylandCompositor *compositor : GraphicsHardwareIntegration(compositor) , mDisplay(0) { - QPlatformNativeInterface *nativeInterface = QApplicationPrivate::platformIntegration()->nativeInterface(); + QPlatformNativeInterface *nativeInterface = QApplication::platformNativeInterface(); if (nativeInterface) { mDisplay = static_cast(nativeInterface->nativeResourceForWidget("Display",m_compositor->topLevelWidget())); if (!mDisplay) diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.h b/src/qt-compositor/wayland_wrapper/wlsurface.h index ed6e0aa..9633f43 100644 --- a/src/qt-compositor/wayland_wrapper/wlsurface.h +++ b/src/qt-compositor/wayland_wrapper/wlsurface.h @@ -50,7 +50,6 @@ #include #include -#include #ifdef QT_COMPOSITOR_WAYLAND_GL #include -- 2.7.4