summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-12-13 10:17:22 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-13 14:54:09 +0100
commitd308797d0093c686493e616fa2f435f9119a8fbf (patch)
treed2a58269a1aee4d10a182045cf2643bd803aa948 /src
parent8757aaaf2f9cba58f23609693eef89c80816433d (diff)
Finish removing virtual child integers
Finish the work started by commit beb72b2fbf17a20b4a9d51d75d79f9c3c69bb357. This silences warnings found by -Woverloaded-virtual. Change-Id: Ic6f5e77e324463ade8349f23f272b41b509d87e4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.cpp2
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.h2
-rw-r--r--src/plugins/accessible/widgets/itemviews.cpp2
-rw-r--r--src/plugins/accessible/widgets/itemviews.h4
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.cpp8
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.h8
6 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index 1ceeb31b16..91f13676d3 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -1775,7 +1775,7 @@ QAccessibleAbstractScrollArea::QAccessibleAbstractScrollArea(QWidget *widget)
Q_ASSERT(qobject_cast<QAbstractScrollArea *>(widget));
}
-QVariant QAccessibleAbstractScrollArea::invokeMethod(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleAbstractScrollArea::invokeMethod(QAccessible::Method, const QVariantList &)
{
return QVariant();
}
diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h
index 2dde422b12..2e80e24e0f 100644
--- a/src/plugins/accessible/widgets/complexwidgets.h
+++ b/src/plugins/accessible/widgets/complexwidgets.h
@@ -75,7 +75,7 @@ public:
};
QAccessibleInterface *child(int index) const;
- QVariant invokeMethod(QAccessible::Method method, int, const QVariantList &params);
+ QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
bool isValid() const;
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp
index b33260099f..87956b139f 100644
--- a/src/plugins/accessible/widgets/itemviews.cpp
+++ b/src/plugins/accessible/widgets/itemviews.cpp
@@ -984,7 +984,7 @@ int QAccessibleTableHeaderCell::navigate(QAccessible::RelationFlag relation, int
return -1;
}
-QAccessible::Relation QAccessibleTableHeaderCell::relationTo(int, const QAccessibleInterface *, int) const
+QAccessible::Relation QAccessibleTableHeaderCell::relationTo(const QAccessibleInterface *) const
{
return QAccessible::Unrelated;
}
diff --git a/src/plugins/accessible/widgets/itemviews.h b/src/plugins/accessible/widgets/itemviews.h
index 08e0bbb487..9f95285d16 100644
--- a/src/plugins/accessible/widgets/itemviews.h
+++ b/src/plugins/accessible/widgets/itemviews.h
@@ -241,7 +241,7 @@ public:
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
int navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface **iface) const;
- QAccessible::Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const;
+ QAccessible::Relation relationTo(const QAccessibleInterface *other) const;
private:
QAbstractItemView *view;
@@ -289,7 +289,7 @@ public:
}
return -1;
}
- QAccessible::Relation relationTo(int, const QAccessibleInterface *, int) const
+ QAccessible::Relation relationTo(const QAccessibleInterface *) const
{
return QAccessible::Unrelated;
}
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index c1cdd7c45d..7387e2ea53 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -716,7 +716,7 @@ QAccessibleStackedWidget::QAccessibleStackedWidget(QWidget *widget)
Q_ASSERT(qobject_cast<QStackedWidget *>(widget));
}
-QVariant QAccessibleStackedWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleStackedWidget::invokeMethod(QAccessible::Method, const QVariantList &params)
{
return QVariant();
}
@@ -1041,7 +1041,7 @@ QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget)
Q_ASSERT(qobject_cast<QDialogButtonBox*>(widget));
}
-QVariant QAccessibleDialogButtonBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleDialogButtonBox::invokeMethod(QAccessible::Method, const QVariantList &)
{
return QVariant();
}
@@ -1068,7 +1068,7 @@ QAccessibleCalendarWidget::QAccessibleCalendarWidget(QWidget *widget)
Q_ASSERT(qobject_cast<QCalendarWidget *>(widget));
}
-QVariant QAccessibleCalendarWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleCalendarWidget::invokeMethod(QAccessible::Method, const QVariantList &)
{
return QVariant();
}
@@ -1436,7 +1436,7 @@ bool QAccessibleTitleBar::isValid() const
QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget)
: QAccessibleWidget(widget, QAccessible::Window) { }
-QVariant QAccessibleMainWindow::invokeMethod(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
+QVariant QAccessibleMainWindow::invokeMethod(QAccessible::Method /*method*/, const QVariantList & /*params*/)
{
return QVariant();
}
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h
index 232293b32a..e8c2e6ddf5 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.h
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h
@@ -121,7 +121,7 @@ class QAccessibleStackedWidget : public QAccessibleWidget
public:
explicit QAccessibleStackedWidget(QWidget *widget);
- QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
+ QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
int childAt(int x, int y) const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
@@ -200,7 +200,7 @@ class QAccessibleDialogButtonBox : public QAccessibleWidget
public:
explicit QAccessibleDialogButtonBox(QWidget *widget);
- QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
+ QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
};
#ifndef QT_NO_TEXTBROWSER
@@ -226,7 +226,7 @@ public:
QAccessibleInterface *child(int index) const;
- QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
+ QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
protected:
QCalendarWidget *calendarWidget() const;
@@ -290,7 +290,7 @@ public:
int childAt(int x, int y) const;
QMainWindow *mainWindow() const;
- QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
+ QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
};
#endif //QT_NO_MAINWINDOW