Implement QWidgetPrivate::setWindowIcon_sys()

[profile/ivi/qtbase.git] / src / widgets / kernel / qwidget_p.h

diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index e600908..7884496 100644 (file)
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -59,7 +59,7 @@
 #include "QtCore/qlocale.h"
 #include "QtCore/qset.h"
 #include "QtGui/qregion.h"
-#include "QtGui/qinputpanel.h"
+#include "QtGui/qinputmethod.h"
 #include "QtWidgets/qsizepolicy.h"
 #include "QtWidgets/qstyle.h"
 #include "QtWidgets/qapplication.h"
@@ -88,6 +88,25 @@ class QUnifiedToolbarSurface;
 // implemented in qshortcut.cpp
 bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context);
 
+class QUpdateLaterEvent : public QEvent
+{
+public:
+    explicit QUpdateLaterEvent(const QRegion& paintRegion)
+        : QEvent(UpdateLater), m_region(paintRegion)
+    {
+    }
+
+    ~QUpdateLaterEvent()
+    {
+    }
+
+    inline const QRegion &region() const { return m_region; }
+
+protected:
+    QRegion m_region;
+};
+
+
 
 class Q_AUTOTEST_EXPORT QWidgetBackingStoreTracker
 {
@@ -136,7 +155,6 @@ struct QTLWExtra {
 
     // Regular pointers (keep them together to avoid gaps on 64 bits architectures).
     QIcon *icon; // widget icon
-    QPixmap *iconPixmap;
     QWidgetBackingStoreTracker backingStoreTracker;
     QBackingStore *backingStore;
     QPainter *sharedPainter;
@@ -157,7 +175,7 @@ struct QTLWExtra {
 
     // *************************** Cross-platform bit fields ****************************
     uint opacity : 8;
-    uint posFromMove : 1;
+    uint posIncludesFrame : 1;
     uint sizeAdjusted : 1;
     uint inTopLevelResize : 1;
     uint inRepaint : 1;
@@ -283,9 +301,9 @@ public:
         DrawRecursive = 0x04,
         DrawInvisible = 0x08,
         DontSubtractOpaqueChildren = 0x10,
-        DontSetCompositionMode = 0x20,
-        DontDrawOpaqueChildren = 0x40,
-        DontDrawNativeChildren = 0x80
+        DontDrawOpaqueChildren = 0x20,
+        DontDrawNativeChildren = 0x40,
+        DontSetCompositionMode = 0x80
     };
 
     enum CloseMode {
@@ -337,6 +355,7 @@ public:
     void stackUnder_sys(QWidget *);
 
     void setFocus_sys();
+    void updateFocusChild();
 
     void updateFont(const QFont &);
     inline void setFont_helper(const QFont &font) {
@@ -401,7 +420,7 @@ public:
     bool close_helper(CloseMode mode);
 
     void setWindowIcon_helper();
-    void setWindowIcon_sys(bool forceReset = false);
+    void setWindowIcon_sys();
     void setWindowOpacity_sys(qreal opacity);
     void adjustQuitOnCloseAttribute();
 
@@ -416,7 +435,7 @@ public:
     void syncBackingStore();
     void syncBackingStore(const QRegion &region);
 
-    // tells the input panel about the widgets transform
+    // tells the input method about the widgets transform
     void updateWidgetTransform();
 
     void reparentFocusWidgets(QWidget *oldtlw);
@@ -431,6 +450,7 @@ public:
     void scroll_sys(int dx, int dy, const QRect &r);
     void deactivateWidgetCleanup();
     void setGeometry_sys(int, int, int, int, bool);
+    void fixPosIncludesFrame();
     void sendPendingMoveAndResizeEvents(bool recursive = false, bool disableUpdates = false);
     void activateChildLayoutsRecursively();
     void show_recursive();
@@ -465,10 +485,10 @@ public:
 
     void setWindowTitle_helper(const QString &cap);
     void setWindowFilePath_helper(const QString &filePath);
+    void setWindowModified_helper();
 
     bool setMinimumSize_helper(int &minw, int &minh);
     bool setMaximumSize_helper(int &maxw, int &maxh);
-    virtual bool hasHeightForWidth() const;
     void setConstraints_sys();
     bool pointInsideRectAndMask(const QPoint &) const;
     QWidget *childAt_helper(const QPoint &, bool) const;
@@ -573,7 +593,7 @@ public:
             QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
                     q->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
             if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) {
-                qApp->inputPanel()->show();
+                qApp->inputMethod()->show();
             }
         }
     }
@@ -668,7 +688,6 @@ public:
     uint inDirtyList : 1;
     uint isScrolled : 1;
     uint isMoved : 1;
-    uint isGLWidget : 1;
     uint usesDoubleBufferedGLContext : 1;
 #ifndef QT_NO_IM
     uint inheritsInputMethodHints : 1;
@@ -745,7 +764,6 @@ public:
     void update_sys(const QRect &rect);
     void update_sys(const QRegion &rgn);
     void setGeometry_sys_helper(int, int, int, int, bool);
-    void setWindowModified_sys(bool b);
     void updateMaximizeButton_sys();
     void setWindowFilePath_sys(const QString &filePath);
     void createWindow_sys();