AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish removing virtual child integers

Browse Source 
Finish the work started by commit
beb72b2fbf. This silences warnings found
by -Woverloaded-virtual.

Change-Id: Ic6f5e77e324463ade8349f23f272b41b509d87e4
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
This commit is contained in:
Bradley T. Hughes 2011-12-13 10:17:22 +01:00 committed by Qt by Nokia
parent 8757aaaf2f
commit d308797d00
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/accessible/widgets/complexwidgets.cpp
View File

@ -1775,7 +1775,7 @@ QAccessibleAbstractScrollArea::QAccessibleAbstractScrollArea(QWidget *widget)
Q_ASSERT(qobject_cast<QAbstractScrollArea *>(widget)); Q_ASSERT(qobject_cast<QAbstractScrollArea *>(widget));
} }
QVariant QAccessibleAbstractScrollArea::invokeMethod(QAccessible::Method, int, const QVariantList &) QVariant QAccessibleAbstractScrollArea::invokeMethod(QAccessible::Method, const QVariantList &)
{ {
return QVariant(); return QVariant();
} }

2
src/plugins/accessible/widgets/complexwidgets.h
View File

@ -75,7 +75,7 @@ public:
}; };
QAccessibleInterface *child(int index) const; 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 childCount() const;
int indexOfChild(const QAccessibleInterface *child) const; int indexOfChild(const QAccessibleInterface *child) const;
bool isValid() const; bool isValid() const;

2
src/plugins/accessible/widgets/itemviews.cpp
View File

@ -984,7 +984,7 @@ int QAccessibleTableHeaderCell::navigate(QAccessible::RelationFlag relation, int
return -1; return -1;
} }
QAccessible::Relation QAccessibleTableHeaderCell::relationTo(int, const QAccessibleInterface *, int) const QAccessible::Relation QAccessibleTableHeaderCell::relationTo(const QAccessibleInterface *) const
{ {
return QAccessible::Unrelated; return QAccessible::Unrelated;
} }

4
src/plugins/accessible/widgets/itemviews.h
View File

@ -241,7 +241,7 @@ public:
QAccessibleInterface *parent() const; QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const; QAccessibleInterface *child(int index) const;
int navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface **iface) 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: private:
QAbstractItemView *view; QAbstractItemView *view;
@ -289,7 +289,7 @@ public:
} }
return -1; return -1;
} }
QAccessible::Relation relationTo(int, const QAccessibleInterface *, int) const QAccessible::Relation relationTo(const QAccessibleInterface *) const
{ {
return QAccessible::Unrelated; return QAccessible::Unrelated;
} }

8
src/plugins/accessible/widgets/qaccessiblewidgets.cpp
View File

@ -716,7 +716,7 @@ QAccessibleStackedWidget::QAccessibleStackedWidget(QWidget *widget)
Q_ASSERT(qobject_cast<QStackedWidget *>(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(); return QVariant();
} }
@ -1041,7 +1041,7 @@ QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget)
Q_ASSERT(qobject_cast<QDialogButtonBox*>(widget)); Q_ASSERT(qobject_cast<QDialogButtonBox*>(widget));
} }
QVariant QAccessibleDialogButtonBox::invokeMethod(QAccessible::Method, int, const QVariantList &) QVariant QAccessibleDialogButtonBox::invokeMethod(QAccessible::Method, const QVariantList &)
{ {
return QVariant(); return QVariant();
} }
@ -1068,7 +1068,7 @@ QAccessibleCalendarWidget::QAccessibleCalendarWidget(QWidget *widget)
Q_ASSERT(qobject_cast<QCalendarWidget *>(widget)); Q_ASSERT(qobject_cast<QCalendarWidget *>(widget));
} }
QVariant QAccessibleCalendarWidget::invokeMethod(QAccessible::Method, int, const QVariantList &) QVariant QAccessibleCalendarWidget::invokeMethod(QAccessible::Method, const QVariantList &)
{ {
return QVariant(); return QVariant();
} }
@ -1436,7 +1436,7 @@ bool QAccessibleTitleBar::isValid() const
QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget) QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget)
: QAccessibleWidget(widget, QAccessible::Window) { } : 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(); return QVariant();
} }

8
src/plugins/accessible/widgets/qaccessiblewidgets.h
View File

@ -121,7 +121,7 @@ class QAccessibleStackedWidget : public QAccessibleWidget
public: public:
explicit QAccessibleStackedWidget(QWidget *widget); 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 childAt(int x, int y) const;
int childCount() const; int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const; int indexOfChild(const QAccessibleInterface *child) const;
@ -200,7 +200,7 @@ class QAccessibleDialogButtonBox : public QAccessibleWidget
public: public:
explicit QAccessibleDialogButtonBox(QWidget *widget); 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 #ifndef QT_NO_TEXTBROWSER
@ -226,7 +226,7 @@ public:
QAccessibleInterface *child(int index) const; QAccessibleInterface *child(int index) const;
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params); QVariant invokeMethod(QAccessible::Method method, const QVariantList &params);
protected: protected:
QCalendarWidget *calendarWidget() const; QCalendarWidget *calendarWidget() const;
@ -290,7 +290,7 @@ public:
int childAt(int x, int y) const; int childAt(int x, int y) const;
QMainWindow *mainWindow() 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 #endif //QT_NO_MAINWINDOW