From c050d916ce8ca865cb5e70d760fe86b0386ba420 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 8 Mar 2018 15:13:42 +0100
Subject: [PATCH] Debugger: Use TypedTreeItem's typed parent ability for
 WatchItems

Less "user code".

Change-Id: Idf4e0a950761bd0184f2844c45415d5bdb8cd51a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/watchdata.cpp    | 15 +++++----------
 src/plugins/debugger/watchdata.h      |  4 +---
 src/plugins/debugger/watchhandler.cpp |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp
index b3e1058a452..d6f9ca8c647 100644
--- a/src/plugins/debugger/watchdata.cpp
+++ b/src/plugins/debugger/watchdata.cpp
@@ -463,11 +463,6 @@ void WatchItem::parse(const GdbMi &data, bool maySort)
         exp = name;
 }
 
-WatchItem *WatchItem::parentItem() const
-{
-    return static_cast<WatchItem *>(parent());
-}
-
 // Format a tooltip row with aligned colon.
 static void formatToolTipRow(QTextStream &str, const QString &category, const QString &value)
 {
@@ -519,7 +514,7 @@ QString WatchItem::toToolTip() const
 bool WatchItem::isLocal() const
 {
     if (arrayIndex >= 0)
-        if (const WatchItem *p = parentItem())
+        if (const WatchItem *p = parent())
             return p->isLocal();
     return iname.startsWith("local.");
 }
@@ -527,7 +522,7 @@ bool WatchItem::isLocal() const
 bool WatchItem::isWatcher() const
 {
     if (arrayIndex >= 0)
-        if (const WatchItem *p = parentItem())
+        if (const WatchItem *p = parent())
             return p->isWatcher();
     return iname.startsWith("watch.");
 }
@@ -535,7 +530,7 @@ bool WatchItem::isWatcher() const
 bool WatchItem::isInspect() const
 {
     if (arrayIndex >= 0)
-        if (const WatchItem *p = parentItem())
+        if (const WatchItem *p = parent())
             return p->isInspect();
     return iname.startsWith("inspect.");
 }
@@ -543,7 +538,7 @@ bool WatchItem::isInspect() const
 QString WatchItem::internalName() const
 {
     if (arrayIndex >= 0) {
-        if (const WatchItem *p = parentItem())
+        if (const WatchItem *p = parent())
             return p->iname + '.' + QString::number(arrayIndex);
     }
     return iname;
@@ -564,7 +559,7 @@ QString WatchItem::expression() const
         if (!type.isEmpty())
             return QString("*(%1*)0x%2").arg(type).arg(addr, 0, 16);
     }
-    const WatchItem *p = parentItem();
+    const WatchItem *p = parent();
     if (p && !p->exp.isEmpty())
         return QString("(%1).%2").arg(p->exp, name);
     return name;
diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h
index b93777654b1..e6131c39cdc 100644
--- a/src/plugins/debugger/watchdata.h
+++ b/src/plugins/debugger/watchdata.h
@@ -39,7 +39,7 @@ namespace Internal {
 
 class GdbMi;
 
-class WatchItem : public Utils::TypedTreeItem<WatchItem>
+class WatchItem : public Utils::TypedTreeItem<WatchItem, WatchItem>
 {
 public:
     WatchItem();
@@ -58,8 +58,6 @@ public:
     QVariant editValue() const;
     int editType() const;
 
-    WatchItem *parentItem() const;
-
     static const qint64 InvalidId = -1;
 
     void setHasChildren(bool c)   { wantsChildren = c; }
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index bfd299093ad..34212434ea3 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -829,7 +829,7 @@ static QString displayName(const WatchItem *item)
 {
     QString result;
 
-    const WatchItem *p = item->parentItem();
+    const WatchItem *p = item->parent();
     if (!p)
         return result;
     if (item->arrayIndex >= 0) {