From f9de22e4bd0030f26c85a35f92be13ff6a86bb1e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 9 Jan 2013 10:01:39 +0100
Subject: [PATCH] CDB: Fix dumping of QRect.
x2, y2 are inner points.
Change-Id: Ibbded22dd35da19894ad3678552519691b62e14f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index 335b5631b11..3016dfe2efa 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -2139,12 +2139,6 @@ inline void dumpRect(std::wostream &str, T x, T y, T width, T height)
str << y;
}
-template <class T>
-inline void dumpRectPoints(std::wostream &str, T x1, T y1, T x2, T y2)
-{
- dumpRect(str, x1, y1, (x2 - x1), (y2 - y1));
-}
-
// Dump Qt's simple geometrical types
static inline bool dumpQSize_F(const SymbolGroupValue &v, std::wostream &str)
{
@@ -2172,7 +2166,11 @@ static inline bool dumpQLine_F(const SymbolGroupValue &v, std::wostream &str)
static inline bool dumpQRect(const SymbolGroupValue &v, std::wostream &str)
{
- dumpRectPoints(str, v["x1"].intValue(), v["y1"].intValue(), v["x2"].intValue(), v["y2"].intValue());
+ const int x1 = v["x1"].intValue();
+ const int y1 = v["y1"].intValue();
+ const int x2 = v["x2"].intValue();
+ const int y2 = v["y2"].intValue();
+ dumpRect(str, x1, y1, (x2 - x1 + 1), (y2 - y1 + 1));
return true;
}
--
GitLab