The Q_WS_X11 define exists no longer. Use Q_OS_UNIX.

Change-Id: I1c4b5d4187e1593aa52bc9162d9692959b55e077
Reviewed-on: http://codereview.qt-project.org/4786
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

3 files changed, 14 insertions, 11 deletions

diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index d879e65c14..0b1c2d5673 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -3169,7 +3169,7 @@ void QListView::currentChanged(const QModelIndex &current, const QModelIndex &pr
     if (QAccessible::isActive()) {
         if (current.isValid()) {
             int entry = visualIndex(current) + 1;
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             QAccessible::updateAccessibility(this, entry, QAccessible::Focus);
 #else
             QAccessible::updateAccessibility(viewport(), entry, QAccessible::Focus);
@@ -3192,7 +3192,7 @@ void QListView::selectionChanged(const QItemSelection &selected,
         QModelIndex sel = selected.indexes().value(0);
         if (sel.isValid()) {
             int entry = visualIndex(sel) + 1;
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
 #else
             QAccessible::updateAccessibility(viewport(), entry, QAccessible::Selection);
@@ -3201,7 +3201,7 @@ void QListView::selectionChanged(const QItemSelection &selected,
         QModelIndex desel = deselected.indexes().value(0);
         if (desel.isValid()) {
             int entry = visualIndex(desel) + 1;
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);
 #else
             QAccessible::updateAccessibility(viewport(), entry, QAccessible::SelectionRemove);
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 6f532eb7c7..48731dbbe4 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -3164,7 +3164,7 @@ void QTableView::currentChanged(const QModelIndex &current, const QModelIndex &p
 #ifndef QT_NO_ACCESSIBILITY
     if (QAccessible::isActive()) {
         if (current.isValid()) {
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             Q_D(QTableView);
             int entry = d->accessibleTable2Index(current);
             QAccessible::updateAccessibility(this, entry, QAccessible::Focus);
@@ -3187,12 +3187,13 @@ void QTableView::selectionChanged(const QItemSelection &selected,
                                   const QItemSelection &deselected)
 {
     Q_D(QTableView);
+    Q_UNUSED(d)
 #ifndef QT_NO_ACCESSIBILITY
     if (QAccessible::isActive()) {
         // ### does not work properly for selection ranges.
         QModelIndex sel = selected.indexes().value(0);
         if (sel.isValid()) {
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             int entry = d->accessibleTable2Index(sel);
             QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
 #else
@@ -3204,7 +3205,7 @@ void QTableView::selectionChanged(const QItemSelection &selected,
         }
         QModelIndex desel = deselected.indexes().value(0);
         if (desel.isValid()) {
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             int entry = d->accessibleTable2Index(sel);
             QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);
 #else
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 9228ac82a2..5ff4f94c5a 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -2885,13 +2885,14 @@ void QTreeViewPrivate::expand(int item, bool emitSignal)
 void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem &viewItem)
 {
     Q_Q(QTreeView);
+    Q_UNUSED(q)
     viewItems.insert(pos, count, viewItem);
     QTreeViewItem *items = viewItems.data();
     for (int i = pos + count; i < viewItems.count(); i++)
         if (items[i].parentItem >= pos)
             items[i].parentItem += count;
 #ifndef QT_NO_ACCESSIBILITY
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
     if (QAccessible::isActive()) {
         QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
     }
@@ -2902,13 +2903,14 @@ void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem &
 void QTreeViewPrivate::removeViewItems(int pos, int count)
 {
     Q_Q(QTreeView);
+    Q_UNUSED(q)
     viewItems.remove(pos, count);
     QTreeViewItem *items = viewItems.data();
     for (int i = pos; i < viewItems.count(); i++)
         if (items[i].parentItem >= pos)
             items[i].parentItem -= count;
 #ifndef QT_NO_ACCESSIBILITY
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
     if (QAccessible::isActive()) {
         QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
     }
@@ -3722,7 +3724,7 @@ void QTreeView::currentChanged(const QModelIndex &current, const QModelIndex &pr
     }
 #ifndef QT_NO_ACCESSIBILITY
     if (QAccessible::isActive() && current.isValid()) {
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
         int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column() + 1;
         QAccessible::updateAccessibility(this, entry, QAccessible::Focus);
 #else
@@ -3747,7 +3749,7 @@ void QTreeView::selectionChanged(const QItemSelection &selected,
         // ### does not work properly for selection ranges.
         QModelIndex sel = selected.indexes().value(0);
         if (sel.isValid()) {
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column() + 1;
             Q_ASSERT(entry > 0);
             QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
@@ -3760,7 +3762,7 @@ void QTreeView::selectionChanged(const QItemSelection &selected,
         }
         QModelIndex desel = deselected.indexes().value(0);
         if (desel.isValid()) {
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
             int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column() + 1;
             Q_ASSERT(entry > 0);
             QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);