From 8ebd7d84fcdaeba152bd9812b45d5c49b1e03a23 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 29 Sep 2011 12:53:02 +0200 Subject: Remove obsolete function isHeaderVisible. This function was deprecated in Qt4 and has been replaced by isNavigationBarVisible. Same for the setter. Change-Id: Ifdcbaa2db0d4d8d475d959a6409347fa19d443a9 Reviewed-on: http://codereview.qt-project.org/5788 Reviewed-by: Qt Sanity Bot Reviewed-by: Gabriel de Dietrich --- src/widgets/widgets/qcalendarwidget.cpp | 29 ++++++---------------- src/widgets/widgets/qcalendarwidget.h | 8 +----- tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp | 8 +++--- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 583e163cee..4a0020efb5 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -2957,28 +2957,6 @@ void QCalendarWidget::updateCells() By default, this property is true. */ -/*! - \obsolete - - Use setNavigationBarVisible() instead. -*/ -bool QCalendarWidget::isHeaderVisible() const -{ - Q_D(const QCalendarWidget); - return d->navBarVisible; -} - -/*! - \obsolete - - Use setNavigationBarVisible() instead. - -*/ -void QCalendarWidget::setHeaderVisible(bool visible) -{ - setNavigationBarVisible(visible); -} - /*! \property QCalendarWidget::navigationBarVisible \brief whether the navigation bar is shown or not @@ -2992,6 +2970,13 @@ void QCalendarWidget::setHeaderVisible(bool visible) When the property is set to false, these controls are hidden. */ +bool QCalendarWidget::isNavigationBarVisible() const +{ + Q_D(const QCalendarWidget); + return d->navBarVisible; +} + + void QCalendarWidget::setNavigationBarVisible(bool visible) { Q_D(QCalendarWidget); diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index a80bae2f49..e73192c12d 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -72,7 +72,6 @@ class Q_WIDGETS_EXPORT QCalendarWidget : public QWidget Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) Q_PROPERTY(HorizontalHeaderFormat horizontalHeaderFormat READ horizontalHeaderFormat WRITE setHorizontalHeaderFormat) Q_PROPERTY(VerticalHeaderFormat verticalHeaderFormat READ verticalHeaderFormat WRITE setVerticalHeaderFormat) - Q_PROPERTY(bool headerVisible READ isHeaderVisible WRITE setHeaderVisible STORED false DESIGNABLE false) // obsolete Q_PROPERTY(bool navigationBarVisible READ isNavigationBarVisible WRITE setNavigationBarVisible) Q_PROPERTY(bool dateEditEnabled READ isDateEditEnabled WRITE setDateEditEnabled) Q_PROPERTY(int dateEditAcceptDelay READ dateEditAcceptDelay WRITE setDateEditAcceptDelay) @@ -115,12 +114,7 @@ public: Qt::DayOfWeek firstDayOfWeek() const; void setFirstDayOfWeek(Qt::DayOfWeek dayOfWeek); - // ### Qt 5: eliminate these two - bool isHeaderVisible() const; - void setHeaderVisible(bool show); - - inline bool isNavigationBarVisible() const { return isHeaderVisible(); } - + bool isNavigationBarVisible() const; bool isGridVisible() const; SelectionMode selectionMode() const; diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp index 05864dbbf4..50dc6a1d1c 100644 --- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp @@ -116,10 +116,10 @@ void tst_QCalendarWidget::getSetCheck() object.setGridVisible(false); QVERIFY(!object.isGridVisible()); //header visible - object.setHeaderVisible(true); - QVERIFY(object.isHeaderVisible()); - object.setHeaderVisible(false); - QVERIFY(!object.isHeaderVisible()); + object.setNavigationBarVisible(true); + QVERIFY(object.isNavigationBarVisible()); + object.setNavigationBarVisible(false); + QVERIFY(!object.isNavigationBarVisible()); //selection mode QCOMPARE(QCalendarWidget::SingleSelection, object.selectionMode()); object.setSelectionMode(QCalendarWidget::NoSelection); -- cgit v1.2.3