From 638fd43d2f6bcc78596b3288fe226f0cfdd3fbc7 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Fri, 31 Jul 2009 05:08:53 +0200 Subject: Remove unused functionality. Introduced by b2797c66343ba0cc2e276c7f24e512b59788b6f7, made superfluous by c0c89664feec6fa6d70b4ffb44a8cfdac9de532f (merge conflict resolution that made use of QGraphicsItem::focusItem(). Reviewed-by: Aaron Kennedy --- src/gui/graphicsview/qgraphicsscene.cpp | 15 --------------- src/gui/graphicsview/qgraphicsscene.h | 1 - src/gui/graphicsview/qgraphicsscene_p.h | 2 -- 3 files changed, 18 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index d35ecb6..5e37ff8 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -2661,21 +2661,6 @@ QGraphicsItem *QGraphicsScene::focusItem() const } /*! - \internal - Returns the focus item for \a item. In the presence of focus realms, - the focus item is the leaf descendant of \a item that would gain active - focus if \a item were given active focus. If not focus realms are involved, - \a item is returned. -*/ -QGraphicsItem *QGraphicsScene::focusItem(QGraphicsItem *item) const -{ - Q_D(const QGraphicsScene); - while (item && d->focusItemForFocusArea.contains(item)) - item = d->focusItemForFocusArea.value(item); - return item; -} - -/*! Sets the scene's focus item to \a item, with the focus reason \a focusReason, after removing focus from any previous item that may have had focus. diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index 2fe58b9..c0c6e75 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -209,7 +209,6 @@ public: void removeItem(QGraphicsItem *item); QGraphicsItem *focusItem() const; - QGraphicsItem *focusItem(QGraphicsItem *item) const; void setFocusItem(QGraphicsItem *item, Qt::FocusReason focusReason = Qt::OtherFocusReason); bool hasFocus() const; void setFocus(Qt::FocusReason focusReason = Qt::OtherFocusReason); diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index a93f342..bceeb5f 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -259,8 +259,6 @@ public: bool allItemsIgnoreTouchEvents; void enableTouchEventsOnViews(); - QHash focusItemForFocusArea; - void updateInputMethodSensitivityInViews(); }; -- cgit v0.12