Changeset 878 for trunk/src

Timestamp:

Jun 30, 2011, 8:18:02 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QWidgetPrivate: Declare inline methods as such upfront so that GCC compiler knows it and doesn't produce "redeclared without dllimport attribute after being referenced with dll linkage" warnings when they are defined inline later.

File:

• trunk/src/gui/kernel/qwidget_p.h (modified) (3 diffs)

trunk/src/gui/kernel/qwidget_p.h

@@ -385 +385 @@
     ~QWidgetPrivate();
 
-    QWExtra *extraData() const;
-    QTLWExtra *topData() const;
-    QTLWExtra *maybeTopData() const;
-    QPainter *sharedPainter() const;
-    void setSharedPainter(QPainter *painter);
-    QWidgetBackingStore *maybeBackingStore() const;
+    inline QWExtra *extraData() const;
+    inline QTLWExtra *topData() const;
+    inline QTLWExtra *maybeTopData() const;
+    inline QPainter *sharedPainter() const;
+    inline bool pointInsideRectAndMask(const QPoint &) const;
+    inline void setSharedPainter(QPainter *painter);
+    inline QWidgetBackingStore *maybeBackingStore() const;
+
     void init(QWidget *desktopWidget, Qt::WindowFlags f);
     void create_sys(WId window, bool initializeWindow, bool destroyOldWindow);
@@ -556 +558 @@
     bool setMaximumSize_helper(int &maxw, int &maxh);
     void setConstraints_sys();
-    bool pointInsideRectAndMask(const QPoint &) const;
     QWidget *childAt_helper(const QPoint &, bool) const;
     QWidget *childAtRecursiveHelper(const QPoint &p, bool, bool includeFrame = false) const;
@@ -781 +782 @@
     uint noPaintOnScreen : 1; // see qwidget_pm.cpp ::paintEngine()
 
-    HWND frameWinId() const
+    inline HWND frameWinId() const
     { return maybeTopData() && maybeTopData()->fId != NULLHANDLE ?
              maybeTopData()->fId : data.winid; }