summaryrefslogtreecommitdiffstats
path: root/src/widgets/itemviews
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp2
-rw-r--r--src/widgets/itemviews/qlistview.cpp4
-rw-r--r--src/widgets/itemviews/qlistwidget.cpp4
-rw-r--r--src/widgets/itemviews/qtableview.cpp4
-rw-r--r--src/widgets/itemviews/qtablewidget.cpp4
-rw-r--r--src/widgets/itemviews/qtreeview.cpp16
-rw-r--r--src/widgets/itemviews/qtreewidget.cpp4
7 files changed, 19 insertions, 19 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index ab98bf6438..cb466dfb4b 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -65,7 +65,7 @@
#include <qaccessible.h>
#include <qaccessible2.h>
#endif
-#ifndef QT_NO_GESTURE
+#ifndef QT_NO_GESTURES
# include <qscroller.h>
#endif
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index e43eda8621..13627b42ac 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -108,10 +108,10 @@ QT_BEGIN_NAMESPACE
be rendered as large or small icons depending on their iconSize().
\table 100%
- \row \li \inlineimage windowsxp-listview.png Screenshot of a Windows XP style list view
+ \row \li \inlineimage windowsvista-listview.png Screenshot of a Windows Vista style list view
\li \inlineimage macintosh-listview.png Screenshot of a Macintosh style table view
\li \inlineimage fusion-listview.png Screenshot of a Fusion style table view
- \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} list view.
+ \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} list view.
\li A \l{Macintosh Style Widget Gallery}{Macintosh style} list view.
\li A \l{Fusion Style Widget Gallery}{Fusion style} list view.
\endtable
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index 766c8e5cc7..183c3538c9 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -1189,10 +1189,10 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
new current item and the item that was previously current.
\table 100%
- \row \li \inlineimage windowsxp-listview.png Screenshot of a Windows XP style list widget
+ \row \li \inlineimage windowsvista-listview.png Screenshot of a Windows Vista style list widget
\li \inlineimage macintosh-listview.png Screenshot of a Macintosh style table widget
\li \inlineimage fusion-listview.png Screenshot of a Fusion style table widget
- \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} list widget.
+ \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} list widget.
\li A \l{Macintosh Style Widget Gallery}{Macintosh style} list widget.
\li A \l{Fusion Style Widget Gallery}{Fusion style} list widget.
\endtable
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index e010c6977e..e84325c730 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -1011,10 +1011,10 @@ void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItem &
its appearance in other styles.
\table 100%
- \row \li \inlineimage windowsxp-tableview.png Screenshot of a Windows XP style table view
+ \row \li \inlineimage windowsvista-tableview.png Screenshot of a Windows Vista style table view
\li \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table view
\li \inlineimage fusion-tableview.png Screenshot of a Fusion style table view
- \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} table view.
+ \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} table view.
\li A \l{Macintosh Style Widget Gallery}{Macintosh style} table view.
\li A \l{Fusion Style Widget Gallery}{Fusion style} table view.
\endtable
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 900af0872a..9793639d74 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -1539,10 +1539,10 @@ QTableWidgetItem &QTableWidgetItem::operator=(const QTableWidgetItem &other)
clear() function.
\table 100%
- \row \li \inlineimage windowsxp-tableview.png Screenshot of a Windows XP style table widget
+ \row \li \inlineimage windowsvista-tableview.png Screenshot of a Windows Vista style table widget
\li \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table widget
\li \inlineimage fusion-tableview.png Screenshot of a Fusion style table widget
- \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} table widget.
+ \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} table widget.
\li A \l{Macintosh Style Widget Gallery}{Macintosh style} table widget.
\li A \l{Fusion Style Widget Gallery}{Fusion style} table widget.
\endtable
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index fe34d3de6a..194fb71880 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -146,10 +146,10 @@ QT_BEGIN_NAMESPACE
\endomit
\table 100%
- \row \li \inlineimage windowsxp-treeview.png Screenshot of a Windows XP style tree view
+ \row \li \inlineimage windowsvista-treeview.png Screenshot of a Windows Vista style tree view
\li \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree view
\li \inlineimage fusion-treeview.png Screenshot of a Fusion style tree view
- \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} tree view.
+ \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} tree view.
\li A \l{Macintosh Style Widget Gallery}{Macintosh style} tree view.
\li A \l{Fusion Style Widget Gallery}{Fusion style} tree view.
\endtable
@@ -876,7 +876,7 @@ bool QTreeView::isSortingEnabled() const
\brief whether animations are enabled
If this property is true the treeview will animate expandsion
- and collasping of branches. If this property is false, the treeview
+ and collapsing of branches. If this property is false, the treeview
will expand or collapse branches immediately without showing
the animation.
@@ -3743,7 +3743,7 @@ void QTreeView::currentChanged(const QModelIndex &current, const QModelIndex &pr
}
#ifndef QT_NO_ACCESSIBILITY
if (QAccessible::isActive() && current.isValid()) {
- int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column() + 1;
+ int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column();
QAccessibleEvent event(this, QAccessible::Focus);
event.setChild(entry);
QAccessible::updateAccessibility(&event);
@@ -3763,16 +3763,16 @@ void QTreeView::selectionChanged(const QItemSelection &selected,
// ### does not work properly for selection ranges.
QModelIndex sel = selected.indexes().value(0);
if (sel.isValid()) {
- int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column() + 1;
- Q_ASSERT(entry > 0);
+ int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column();
+ Q_ASSERT(entry >= 0);
QAccessibleEvent event(this, QAccessible::Selection);
event.setChild(entry);
QAccessible::updateAccessibility(&event);
}
QModelIndex desel = deselected.indexes().value(0);
if (desel.isValid()) {
- int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column() + 1;
- Q_ASSERT(entry > 0);
+ int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column();
+ Q_ASSERT(entry >= 0);
QAccessibleEvent event(this, QAccessible::SelectionRemove);
event.setChild(entry);
QAccessible::updateAccessibility(&event);
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index a2eb28e213..c4b71fd05f 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -2379,10 +2379,10 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
whether sorting is enabled.
\table 100%
- \row \li \inlineimage windowsxp-treeview.png Screenshot of a Windows XP style tree widget
+ \row \li \inlineimage windowsvista-treeview.png Screenshot of a Windows Vista style tree widget
\li \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree widget
\li \inlineimage fusion-treeview.png Screenshot of a Fusion style tree widget
- \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} tree widget.
+ \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} tree widget.
\li A \l{Macintosh Style Widget Gallery}{Macintosh style} tree widget.
\li A \l{Fusion Style Widget Gallery}{Fusion style} tree widget.
\endtable
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 10:11:12 +0000