diff options
author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-07-31 03:08:53 (GMT) |
---|---|---|
committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-07-31 03:17:11 (GMT) |
commit | 638fd43d2f6bcc78596b3288fe226f0cfdd3fbc7 (patch) | |
tree | eef723ddc7b1a3b533ffc81bde99d276ab220b9b | |
parent | 3359564d5628af68eb19598d1c0d19e5d1abb272 (diff) | |
download | Qt-638fd43d2f6bcc78596b3288fe226f0cfdd3fbc7.zip Qt-638fd43d2f6bcc78596b3288fe226f0cfdd3fbc7.tar.gz Qt-638fd43d2f6bcc78596b3288fe226f0cfdd3fbc7.tar.bz2 |
Remove unused functionality.
Introduced by b2797c66343ba0cc2e276c7f24e512b59788b6f7, made
superfluous by c0c89664feec6fa6d70b4ffb44a8cfdac9de532f (merge conflict
resolution that made use of QGraphicsItem::focusItem().
Reviewed-by: Aaron Kennedy
-rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 15 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsscene.h | 1 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsscene_p.h | 2 |
3 files changed, 0 insertions, 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<QGraphicsItem *, QGraphicsItem *> focusItemForFocusArea; - void updateInputMethodSensitivityInViews(); }; |