whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
bb10
Frederik Gladhorn 2011-09-29 12:53:02 +02:00 committed by Qt by Nokia
parent db3418c10b
commit 8ebd7d84fc
3 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -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);

8
src/widgets/widgets/qcalendarwidget.h
View File

@ -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;

8
tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
View File

@ -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);