Changeset 569 for trunk/src/gui/painting/qregion.h

Timestamp:

Feb 13, 2010, 6:36:55 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Adopted to 4.6.1 changes.

File:

• trunk/src/gui/painting/qregion.h (modified) (3 diffs)

trunk/src/gui/painting/qregion.h

@@ -60 +60 @@
 class QVariant;
 
-#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_WS_PM)
 struct QRegionPrivate;
 #endif
@@ -184 +184 @@
 #if defined(Q_WS_WIN)
     void ensureHandle() const;
-    QRegion winCombine(const QRegion &r, int num) const;
 #elif defined(Q_WS_PM)
-    QRegion pmCombine(const QRegion &r, int op) const;
     void updateHandle(int targetHeight) const;
+    static void disposeHandle(HRGN hrgn);
 #elif defined(Q_WS_X11)
     void updateX11Region() const;
@@ -216 +215 @@
         mutable RgnHandle unused; // Here for binary compatability reasons. ### Qt 5 remove.
 #endif
-#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_WS_PM)
         QRegionPrivate *qt_rgn;
 #endif