Make QWidget::isEnabledTo() and isVisibleTo() to take const pointers.

This commit addresses a long-standing Qt 5 to-do comment. Whilst a
trivial change, it is binary incompatible.

Task-number: QTBUG-259

Change-Id: I2fc7bfda488318dbabbbea9f5ff9d2b1d6ce0784
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 8a3fea9..2d3961c 100644 (file)
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2884,7 +2884,7 @@ void QWidget::showNormal()
     \sa setEnabled() enabled
 */
 
-bool QWidget::isEnabledTo(QWidget* ancestor) const
+bool QWidget::isEnabledTo(const QWidget *ancestor) const
 {
     const QWidget * w = this;
     while (!w->testAttribute(Qt::WA_ForceDisabled)
@@ -7574,7 +7574,7 @@ bool QWidget::close()
     \sa show() hide() isVisible()
 */
 
-bool QWidget::isVisibleTo(QWidget* ancestor) const
+bool QWidget::isVisibleTo(const QWidget *ancestor) const
 {
     if (!ancestor)
         return isVisible();

diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 78b693c..246beac 100644 (file)
--- 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:
@@ -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;