summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>2011-12-01 21:59:44 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-02 08:19:58 +0100
commit0d7cc00c07831d277a7aea9b3d22c61b4e1ef41e (patch)
treec71f414a379d405c3045e3f8d4e31d77590f3372
parent04c65c2454c4328722526d0a8744bb32a498594b (diff)
Clean formatting.
Remove extra spaces, remove virtual keywords. This code was simply inconsistent with the rest. Change-Id: Iec8e9542dd4c458ddd535cb1766c90c18051686a Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.cpp5
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.h24
2 files changed, 15 insertions, 14 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index ed221c6172..a0622f2a4c 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -126,7 +126,7 @@ int QAccessibleMenu::navigate(RelationFlag relation, int entry, QAccessibleInter
}
}
-int QAccessibleMenu::indexOfChild( const QAccessibleInterface *child ) const
+int QAccessibleMenu::indexOfChild( const QAccessibleInterface *child) const
{
int index = -1;
Role r = child->role();
@@ -185,7 +185,8 @@ int QAccessibleMenuBar::indexOfChild(const QAccessibleInterface *child) const
#endif // QT_NO_MENUBAR
-QAccessibleMenuItem::QAccessibleMenuItem(QWidget *owner, QAction *action) : m_action(action), m_owner(owner)
+QAccessibleMenuItem::QAccessibleMenuItem(QWidget *owner, QAction *action)
+: m_action(action), m_owner(owner)
{
}
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.h b/src/plugins/accessible/widgets/qaccessiblemenu.h
index 7c7956e988..a7fda52580 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.h
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.h
@@ -98,21 +98,21 @@ public:
virtual ~QAccessibleMenuItem();
void *interface_cast(QAccessible::InterfaceType t);
- virtual int childAt(int x, int y) const;
- virtual int childCount() const;
- virtual int indexOfChild(const QAccessibleInterface * child) const;
- virtual bool isValid() const;
+ int childAt(int x, int y) const;
+ int childCount() const;
+ int indexOfChild(const QAccessibleInterface * child) const;
+ bool isValid() const;
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
- virtual int navigate(RelationFlag relation, int entry, QAccessibleInterface ** target) const;
- virtual QObject * object() const;
- virtual QRect rect() const;
- virtual Relation relationTo(const QAccessibleInterface *other) const;
- virtual Role role() const;
- virtual void setText(Text t, const QString & text );
- virtual State state() const;
- virtual QString text(Text t) const;
+ int navigate(QAccessible::RelationFlag relation, int entry, QAccessibleInterface ** target) const;
+ QObject * object() const;
+ QRect rect() const;
+ QAccessible::Relation relationTo(const QAccessibleInterface *other) const;
+ QAccessible::Role role() const;
+ void setText(QAccessible::Text t, const QString & text);
+ QAccessible::State state() const;
+ QString text(QAccessible::Text t) const;
// QAccessibleActionInterface
QStringList actionNames() const;