summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorbjørn Martsum <tmartsum@gmail.com>2013-11-07 18:58:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-08 22:17:03 +0100
commit5f5c8798329041db7c02d2cd0610bfe4f3b22c01 (patch)
tree75db0bdd74610a34644c0c1bbdaf70d12be70f4f
parentbecdfa6fabb80d35e430a13835f01a6ff3f6cc73 (diff)
QHeaderView - remove confusing bool
It is probably better not to have a default boolean in QHeaderView::setResizeContentsPrecision Task-number: QTBUG-34665 Change-Id: I0bb2c35abc1d5713bb3ee65df3af86c04f175a38 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-rw-r--r--src/widgets/itemviews/qheaderview.cpp7
-rw-r--r--src/widgets/itemviews/qheaderview.h2
-rw-r--r--tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp3
-rw-r--r--tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp3
-rw-r--r--tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp4
5 files changed, 9 insertions, 10 deletions
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 1131ef030e..c2bcc1585f 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -1337,18 +1337,13 @@ QHeaderView::ResizeMode QHeaderView::sectionResizeMode(int logicalIndex) const
and QTreeView::sizeHintForColumn(). Reimplementing these functions can make this
function not having an effect.
- If \a resizeSectionsNow is set to true (default) it will do adjustment of sections by calling
- resizeSections(). (regardless if the precision was changed).
-
\sa resizeContentsPrecision(), setSectionResizeMode(), resizeSections(), QTableView::sizeHintForColumn(), QTableView::sizeHintForRow(), QTreeView::sizeHintForColumn()
*/
-void QHeaderView::setResizeContentsPrecision(int precision, bool resizeSectionsNow)
+void QHeaderView::setResizeContentsPrecision(int precision)
{
Q_D(QHeaderView);
d->resizeContentsPrecision = precision;
- if (resizeSectionsNow)
- resizeSections();
}
/*!
diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h
index b3ed666aa6..bfe36e9b19 100644
--- a/src/widgets/itemviews/qheaderview.h
+++ b/src/widgets/itemviews/qheaderview.h
@@ -135,7 +135,7 @@ public:
void setSectionResizeMode(ResizeMode mode);
void setSectionResizeMode(int logicalIndex, ResizeMode mode);
- void setResizeContentsPrecision(int precision, bool resizeNow = true);
+ void setResizeContentsPrecision(int precision);
int resizeContentsPrecision() const;
#if QT_DEPRECATED_SINCE(5, 0)
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp
index 463366433c..f4ecae83fe 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp
@@ -100,7 +100,8 @@ protected:
void TableDialog::slotValueChanged(int newval)
{
- tableView->horizontalHeader()->setResizeContentsPrecision(newval, true);
+ tableView->horizontalHeader()->setResizeContentsPrecision(newval);
+ tableView->resizeColumnsToContents();
}
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp
index 027801d528..b64a4325f9 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp
@@ -110,7 +110,8 @@ protected:
void TableDialog::slotValueChanged(int newval)
{
- tableView->verticalHeader()->setResizeContentsPrecision(newval, true);
+ tableView->verticalHeader()->setResizeContentsPrecision(newval);
+ tableView->resizeRowsToContents();
}
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp
index c48d933fcd..d9984ca8ea 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp
@@ -118,7 +118,9 @@ protected:
void TreeDialog::slotValueChanged(int newval)
{
- treeWidget->header()->setResizeContentsPrecision(newval, true);
+ treeWidget->header()->setResizeContentsPrecision(newval);
+ for (int u = 0; u < treeWidget->header()->count(); ++u)
+ treeWidget->resizeColumnToContents(u);
}
int main(int argc, char *argv[])