feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: fix merge

Browse Source
This commit is contained in:
hjk
2010-08-18 10:20:12 +02:00
parent 52e1894df4
commit 7d3ace50ef
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
share/qtcreator/gdbmacros/dumper.py
View File

@@ -186,7 +186,7 @@ def catchCliOutput(command):
# "No symbol table is loaded. Use the \"file\" command." # "No symbol table is loaded. Use the \"file\" command."
msg = str(error) msg = str(error)
except: except:
msg = "Unknown error"; msg = "Unknown error"
gdb.execute("set logging off") gdb.execute("set logging off")
gdb.execute("set logging redirect off") gdb.execute("set logging redirect off")
if len(msg): if len(msg):
@@ -319,7 +319,7 @@ class Children:
if self.d.passExceptions and not exType is None: if self.d.passExceptions and not exType is None:
showException("CHILDREN", exType, exValue, exTraceBack) showException("CHILDREN", exType, exValue, exTraceBack)
if self.d.currentMaxNumChilds < self.d.currentNumChilds: if self.d.currentMaxNumChilds < self.d.currentNumChilds:
self.d.putEllipsis(); self.d.putEllipsis()
self.d.currentChildType = self.savedChildType self.d.currentChildType = self.savedChildType
self.d.currentChildNumChild = self.savedChildNumChild self.d.currentChildNumChild = self.savedChildNumChild
self.d.currentNumChilds = self.savedNumChilds self.d.currentNumChilds = self.savedNumChilds
@@ -446,8 +446,8 @@ def listOfLocals(varList):
hasBlock = 'block' in __builtin__.dir(frame) hasBlock = 'block' in __builtin__.dir(frame)
items = [] items = []
#warn("HAS BLOCK: %s" % hasBlock); #warn("HAS BLOCK: %s" % hasBlock)
#warn("IS GOOD GDB: %s" % isGoodGdb()); #warn("IS GOOD GDB: %s" % isGoodGdb())
if hasBlock and isGoodGdb(): if hasBlock and isGoodGdb():
#warn("IS GOOD: %s " % varList) #warn("IS GOOD: %s " % varList)
try: try:
@@ -631,7 +631,7 @@ movableTypes = set([
"QFileInfo", "QFixed", "QFixedPoint", "QFixedSize", "QFileInfo", "QFixed", "QFixedPoint", "QFixedSize",
"QHashDummyValue", "QHashDummyValue",
"QIcon", "QImage", "QIcon", "QImage",
"QLine", "QLineF", "QLatin1Char", "QLocal", "QLine", "QLineF", "QLatin1Char", "QLocale",
"QMatrix", "QModelIndex", "QMatrix", "QModelIndex",
"QPoint", "QPointF", "QPen", "QPersistentModelIndex", "QPoint", "QPointF", "QPen", "QPersistentModelIndex",
"QResourceRoot", "QRect", "QRectF", "QRegExp", "QResourceRoot", "QRect", "QRectF", "QRegExp",
@@ -885,7 +885,7 @@ def bbsetup():
if key.startswith("qdump__"): if key.startswith("qdump__"):
name = key[7:] name = key[7:]
qqDumpers[name] = value qqDumpers[name] = value
qqFormats[name] = qqFormats.get(name, ""); qqFormats[name] = qqFormats.get(name, "")
elif key.startswith("qform__"): elif key.startswith("qform__"):
name = key[7:] name = key[7:]
formats = "" formats = ""
@@ -1033,7 +1033,7 @@ class Dumper:
# #
# Locals # Locals
# #
locals = listOfLocals(varList); locals = listOfLocals(varList)
if "nolocals" in options: if "nolocals" in options:
locals = [] locals = []
@@ -1064,7 +1064,7 @@ class Dumper:
self.put('iname="%s",' % item.iname) self.put('iname="%s",' % item.iname)
self.put('name="%s",' % item.name) self.put('name="%s",' % item.name)
self.put('addr="<not accessible>",') self.put('addr="<not accessible>",')
self.put('numchild="0"'); self.put('numchild="0"')
self.putValue("<not accessible>") self.putValue("<not accessible>")
self.putType(item.value.type) self.putType(item.value.type)
continue continue
@@ -1137,7 +1137,7 @@ class Dumper:
def handleWatch(self, exp, iname): def handleWatch(self, exp, iname):
exp = str(exp) exp = str(exp)
escapedExp = exp.replace('"', '\\"'); escapedExp = exp.replace('"', '\\"')
#warn("HANDLING WATCH %s, INAME: '%s'" % (exp, iname)) #warn("HANDLING WATCH %s, INAME: '%s'" % (exp, iname))
if exp.startswith("[") and exp.endswith("]"): if exp.startswith("[") and exp.endswith("]"):
#warn("EVAL: EXP: %s" % exp) #warn("EVAL: EXP: %s" % exp)
@@ -1326,7 +1326,7 @@ class Dumper:
return return
# FIXME: Gui shows references stripped? # FIXME: Gui shows references stripped?
#warn(" "); #warn(" ")
#warn("REAL INAME: %s " % item.iname) #warn("REAL INAME: %s " % item.iname)
#warn("REAL NAME: %s " % name) #warn("REAL NAME: %s " % name)
#warn("REAL TYPE: %s " % item.value.type) #warn("REAL TYPE: %s " % item.value.type)