diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 21:51:54 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 21:51:54 +0200 |
commit | 52352c6c572f15c10c4c3de641db81723aada468 (patch) | |
tree | c87f2be7179e2d7a203719aa4eed9480dc7d9748 /src/gui/painting/qpaintdevice.h | |
parent | 34f712e79e97b757b4426e1ffa09e065c9e379a1 (diff) |
remove obsolete stuff
everything inside QT3_SUPPORT is gone in
gui/painting
Diffstat (limited to 'src/gui/painting/qpaintdevice.h')
-rw-r--r-- | src/gui/painting/qpaintdevice.h | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h index 67db3f653f..ad060482f0 100644 --- a/src/gui/painting/qpaintdevice.h +++ b/src/gui/painting/qpaintdevice.h @@ -111,55 +111,12 @@ protected: private: Q_DISABLE_COPY(QPaintDevice) -#if defined(Q_WS_X11) && defined(QT3_SUPPORT) -public: - QT3_SUPPORT Display *x11Display() const; - QT3_SUPPORT int x11Screen() const; - QT3_SUPPORT int x11Depth() const; - QT3_SUPPORT int x11Cells() const; - QT3_SUPPORT Qt::HANDLE x11Colormap() const; - QT3_SUPPORT bool x11DefaultColormap() const; - QT3_SUPPORT void *x11Visual() const; - QT3_SUPPORT bool x11DefaultVisual() const; - - static QT3_SUPPORT Display *x11AppDisplay(); - static QT3_SUPPORT int x11AppScreen(); - static QT3_SUPPORT int x11AppDepth(int screen = -1); - static QT3_SUPPORT int x11AppCells(int screen = -1); - static QT3_SUPPORT Qt::HANDLE x11AppRootWindow(int screen = -1); - static QT3_SUPPORT Qt::HANDLE x11AppColormap(int screen = -1); - static QT3_SUPPORT void *x11AppVisual(int screen = -1); - static QT3_SUPPORT bool x11AppDefaultColormap(int screen =-1); - static QT3_SUPPORT bool x11AppDefaultVisual(int screen =-1); - static QT3_SUPPORT int x11AppDpiX(int screen = -1); - static QT3_SUPPORT int x11AppDpiY(int screen = -1); - static QT3_SUPPORT void x11SetAppDpiX(int, int); - static QT3_SUPPORT void x11SetAppDpiY(int, int); -#endif - friend class QPainter; friend class QFontEngineMac; friend class QX11PaintEngine; friend Q_GUI_EXPORT int qt_paint_device_metric(const QPaintDevice *device, PaintDeviceMetric metric); }; -#ifdef QT3_SUPPORT -QT3_SUPPORT Q_GUI_EXPORT -void bitBlt(QPaintDevice *dst, int dx, int dy, - const QPaintDevice *src, int sx=0, int sy=0, int sw=-1, int sh=-1, - bool ignoreMask=false); - -QT3_SUPPORT Q_GUI_EXPORT -void bitBlt(QPaintDevice *dst, int dx, int dy, - const QImage *src, int sx=0, int sy=0, int sw=-1, int sh=-1, - int conversion_flags=0); - -QT3_SUPPORT Q_GUI_EXPORT -void bitBlt(QPaintDevice *dst, const QPoint &dp, - const QPaintDevice *src, const QRect &sr=QRect(0,0,-1,-1), - bool ignoreMask=false); -#endif - /***************************************************************************** Inline functions *****************************************************************************/ |