From 8e1107fb2291733181497a8fa99a201b469e2b68 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 7 Feb 2012 16:35:53 +0100 Subject: [PATCH] Fix compiler warnings in accessible code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add missing return value. - Remove unused static functions. Change-Id: I0271cacc2a01b33209c4d9d2d958ad89924f8951 Reviewed-by: Jan-Arve Sæther --- .../accessible/widgets/qaccessiblewidgets.cpp | 24 ------------------- src/widgets/accessible/qaccessiblewidget.cpp | 1 + 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index 94101efa670..2d6330cb38b 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -106,30 +106,6 @@ QList 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 be579fecf87..7a0aab56ddb 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 */