summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-02-07 16:35:53 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-07 20:03:43 +0100
commit8e1107fb2291733181497a8fa99a201b469e2b68 (patch)
tree20f864542f87e67eff15841c0447531cfb46d26a /src
parentdeea48ef6a545ba0c198efcc8db3c5ba7b0b432b (diff)
Fix compiler warnings in accessible code.
- Add missing return value. - Remove unused static functions. Change-Id: I0271cacc2a01b33209c4d9d2d958ad89924f8951 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.cpp24
-rw-r--r--src/widgets/accessible/qaccessiblewidget.cpp1
2 files changed, 1 insertions, 24 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index 94101efa67..2d6330cb38 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -106,30 +106,6 @@ QList<QWidget*> childWidgets(const QWidget *widget, bool includeTopLevel)
\internal
*/
-static QTextBlock qTextBlockAt(const QTextDocument *doc, int pos)
-{
- Q_ASSERT(pos >= 0);
-
- QTextBlock block = doc->begin();
- int i = 0;
- while (block.isValid() && i < pos) {
- block = block.next();
- ++i;
- }
- return block;
-}
-
-static int qTextBlockPosition(QTextBlock block)
-{
- int child = 0;
- while (block.isValid()) {
- block = block.previous();
- ++child;
- }
-
- return child;
-}
-
/*!
\fn QAccessibleTextEdit::QAccessibleTextEdit(QWidget* widget)
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index be579fecf8..7a0aab56dd 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -390,6 +390,7 @@ QAccessibleInterface *QAccessibleWidget::focusChild() const
if (isAncestor(widget(), fw) || fw == widget())
return QAccessible::queryAccessibleInterface(fw);
+ return 0;
}
/*! \reimp */