diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
| commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
| tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/widgets/kernel/qwidget.h | |
| parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
| parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'src/widgets/kernel/qwidget.h')
| -rw-r--r-- | src/widgets/kernel/qwidget.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 64042ccc36..b7a5e26690 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -243,7 +243,7 @@ public: void setWindowModality(Qt::WindowModality windowModality); bool isEnabled() const; - bool isEnabledTo(QWidget*) const; + bool isEnabledTo(const QWidget *) const; bool isEnabledToTLW() const; public Q_SLOTS: @@ -306,8 +306,8 @@ public: QPoint mapFromGlobal(const QPoint &) const; QPoint mapToParent(const QPoint &) const; QPoint mapFromParent(const QPoint &) const; - QPoint mapTo(QWidget *, const QPoint &) const; - QPoint mapFrom(QWidget *, const QPoint &) const; + QPoint mapTo(const QWidget *, const QPoint &) const; + QPoint mapFrom(const QWidget *, const QPoint &) const; QWidget *window() const; QWidget *nativeParentWidget() const; @@ -505,8 +505,7 @@ public: bool restoreGeometry(const QByteArray &geometry); void adjustSize(); bool isVisible() const; - bool isVisibleTo(QWidget*) const; - // ### Qt 5: bool isVisibleTo(_const_ QWidget *) const + bool isVisibleTo(const QWidget *) const; inline bool isHidden() const; bool isMinimized() const; |