From 0314198ebd03791042b41bdecd8c4eed90aacfd8 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 28 Jan 2014 07:42:33 -0800 Subject: [PATCH] Update Qt symbol map usage. Should fix #5256, not well tested. --- Qt/ctrldisasmview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Qt/ctrldisasmview.cpp b/Qt/ctrldisasmview.cpp index 03e73d5cc6..7fbe3c4bea 100644 --- a/Qt/ctrldisasmview.cpp +++ b/Qt/ctrldisasmview.cpp @@ -201,9 +201,9 @@ void CtrlDisAsmView::RunToHere() void CtrlDisAsmView::RenameFunction() { u32 funcBegin = symbolMap.GetFunctionStart(curAddress); - if (funcBegin != -1) + if (funcBegin != (u32)-1) { - QString name = symbolMap.GetLabelName(funcBegin); + QString name = QString::fromStdString(symbolMap.GetLabelString(funcBegin)); bool ok; QString newname = QInputDialog::getText(this, tr("New function name"), tr("New function name:"), QLineEdit::Normal, @@ -339,7 +339,7 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *) branches[numBranches].dst=(int)(rowY1+((s64)offs-(s64)address)*rowHeight/align + rowHeight/2); branches[numBranches].conditional = (dis[1]!=0); //unconditional 'b' branch numBranches++; - const char *t = debugger->getDescription(offs); + const char *t = debugger->getDescription(offs).c_str(); if (memcmp(t,"z_",2)==0) t+=2; if (memcmp(t,"zz_",3)==0) @@ -362,7 +362,7 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *) painter.setFont(normalFont); if (desc[0]==0) { - const char *t = debugger->getDescription(address); + const char *t = debugger->getDescription(address).c_str(); if (memcmp(t,"z_",2)==0) t+=2; if (memcmp(t,"zz_",3)==0)