summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-05-06 12:54:24 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-07 17:55:47 +0200
commit8ec1594e63fbfbd387947a377e20a7b16fdce388 (patch)
tree5641f9ebbcf59a927b1a9cd1afb81a5cb35b2252 /src
parent365cd77c2679d1f672dfd2f8403af9fe410a162f (diff)
Rename setResizeMode to setSectionResizeMode.
The overload of this method was renamed in b64426248d2212eb59535b2ca383d30fdb5e1c7a but this one was not. Change-Id: I60a6ddf0fcf9deea31ccf51e7b0db16c66023356 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/itemviews/qheaderview.cpp29
-rw-r--r--src/widgets/itemviews/qheaderview.h4
-rw-r--r--src/widgets/widgets/qcalendarwidget.cpp4
3 files changed, 24 insertions, 13 deletions
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 9b6b2368c9..4ab984b53c 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -122,7 +122,7 @@ QDataStream &operator>>(QDataStream &in, QHeaderViewPrivate::SectionItem &sectio
A header can be fixed in place, or made movable with setSectionsMovable(). It can
be made clickable with setSectionsClickable(), and has resizing behavior in
- accordance with setResizeMode() and setSectionResizeMode()
+ accordance with setSectionResizeMode()
\note Double-clicking on a header to resize a section only applies for
visible rows.
@@ -162,7 +162,7 @@ QDataStream &operator>>(QDataStream &in, QHeaderViewPrivate::SectionItem &sectio
The resize mode specifies the behavior of the header sections. It can be
set on the entire header view or on individual sections using
- setResizeMode().
+ setSectionResizeMode().
\value Interactive The user can resize the section. The section can also be
resized programmatically using resizeSection(). The section size
@@ -501,7 +501,7 @@ void QHeaderView::setOffsetToLastSection()
/*!
Returns the length along the orientation of the header.
- \sa sizeHint(), setResizeMode(), offset()
+ \sa sizeHint(), setSectionResizeMode(), offset()
*/
int QHeaderView::length() const
@@ -625,7 +625,7 @@ int QHeaderView::logicalIndexAt(int position) const
Returns the width (or height for vertical headers) of the given
\a logicalIndex.
- \sa length(), setResizeMode(), defaultSectionSize()
+ \sa length(), setSectionResizeMode(), defaultSectionSize()
*/
int QHeaderView::sectionSize(int logicalIndex) const
@@ -1186,7 +1186,7 @@ bool QHeaderView::highlightSections() const
\sa resizeMode(), length(), sectionResized()
*/
-void QHeaderView::setResizeMode(ResizeMode mode)
+void QHeaderView::setSectionResizeMode(ResizeMode mode)
{
Q_D(QHeaderView);
initializeSections();
@@ -1243,10 +1243,19 @@ void QHeaderView::setSectionResizeMode(int logicalIndex, ResizeMode mode)
*/
/*!
+ \obsolete
+ \fn void QHeaderView::setResizeMode(ResizeMode mode)
+
+ Use setSectionResizeMode instead.
+
+ \sa setSectionResizeMode()
+*/
+
+/*!
Returns the resize mode that applies to the section specified by the given
\a logicalIndex.
- \sa setResizeMode()
+ \sa setSectionResizeMode()
*/
QHeaderView::ResizeMode QHeaderView::sectionResizeMode(int logicalIndex) const
@@ -1396,7 +1405,7 @@ Qt::SortOrder QHeaderView::sortIndicatorOrder() const
property will override the resize mode set on the last section in the
header.
- \sa setResizeMode()
+ \sa setSectionResizeMode()
*/
bool QHeaderView::stretchLastSection() const
{
@@ -1428,7 +1437,7 @@ void QHeaderView::setStretchLastSection(bool stretch)
The default value is false.
- \sa setResizeMode()
+ \sa setSectionResizeMode()
*/
bool QHeaderView::cascadingSectionResizes() const
{
@@ -1449,7 +1458,7 @@ void QHeaderView::setCascadingSectionResizes(bool enable)
This property only affects sections that have \l Interactive or \l Fixed
as their resize mode.
- \sa setResizeMode() minimumSectionSize
+ \sa setSectionResizeMode() minimumSectionSize
*/
int QHeaderView::defaultSectionSize() const
{
@@ -1475,7 +1484,7 @@ void QHeaderView::setDefaultSectionSize(int size)
This property is honored by all \l{ResizeMode}{resize modes}.
- \sa setResizeMode() defaultSectionSize
+ \sa setSectionResizeMode() defaultSectionSize
*/
int QHeaderView::minimumSectionSize() const
{
diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h
index 0cea318953..f3f5b95a04 100644
--- a/src/widgets/itemviews/qheaderview.h
+++ b/src/widgets/itemviews/qheaderview.h
@@ -131,10 +131,12 @@ public:
void setHighlightSections(bool highlight);
bool highlightSections() const;
- void setResizeMode(ResizeMode mode);
ResizeMode sectionResizeMode(int logicalIndex) const;
+ void setSectionResizeMode(ResizeMode mode);
void setSectionResizeMode(int logicalIndex, ResizeMode mode);
#if QT_DEPRECATED_SINCE(5, 0)
+ inline QT_DEPRECATED void setResizeMode(ResizeMode mode)
+ { setSectionResizeMode(mode); }
inline QT_DEPRECATED void setResizeMode(int logicalindex, ResizeMode mode)
{ setSectionResizeMode(logicalindex, mode); }
inline QT_DEPRECATED ResizeMode resizeMode(int logicalindex) const
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 427af68b64..6618304006 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -2067,9 +2067,9 @@ QCalendarWidget::QCalendarWidget(QWidget *parent)
d->m_model->setView(d->m_view);
d->m_view->setSelectionBehavior(QAbstractItemView::SelectItems);
d->m_view->setSelectionMode(QAbstractItemView::SingleSelection);
- d->m_view->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+ d->m_view->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
d->m_view->horizontalHeader()->setSectionsClickable(false);
- d->m_view->verticalHeader()->setResizeMode(QHeaderView::Stretch);
+ d->m_view->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
d->m_view->verticalHeader()->setSectionsClickable(false);
d->m_selection = d->m_view->selectionModel();
d->createNavigationBar(this);