Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More Qt buildfixes

Browse Source
This commit is contained in:
Henrik Rydgard 2015-11-01 00:41:35 +01:00
parent 958aa37dfa
commit f2431dcf7a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Qt/Debugger/ctrldisasmview.cpp
View File

@ -200,17 +200,17 @@ void CtrlDisAsmView::RunToHere()
void CtrlDisAsmView::RenameFunction() void CtrlDisAsmView::RenameFunction()
{ {
u32 funcBegin = symbolMap.GetFunctionStart(curAddress); u32 funcBegin = g_symbolMap->GetFunctionStart(curAddress);
if (funcBegin != (u32)-1) if (funcBegin != (u32)-1)
{ {
QString name = QString::fromStdString(symbolMap.GetLabelString(funcBegin)); QString name = QString::fromStdString(g_symbolMap->GetLabelString(funcBegin));
bool ok; bool ok;
QString newname = QInputDialog::getText(this, tr("New function name"), QString newname = QInputDialog::getText(this, tr("New function name"),
tr("New function name:"), QLineEdit::Normal, tr("New function name:"), QLineEdit::Normal,
name, &ok); name, &ok);
if (ok && !newname.isEmpty()) if (ok && !newname.isEmpty())
{ {
symbolMap.SetLabelName(newname.toStdString().c_str(),funcBegin); g_symbolMap->SetLabelName(newname.toStdString().c_str(),funcBegin);
redraw(); redraw();
parentWindow->NotifyMapLoaded(); parentWindow->NotifyMapLoaded();
} }

12
Qt/Debugger/ctrlmemview.cpp
View File

@ -147,13 +147,13 @@ void CtrlMemView::paintEvent(QPaintEvent *)
{ {
/* textPen.setColor(0x0000FF); /* textPen.setColor(0x0000FF);
painter.setPen(textPen); painter.setPen(textPen);
int fn = symbolMap.GetSymbolNum(address); int fn = g_symbolMap->GetSymbolNum(address);
if (fn==-1) if (fn==-1)
{ {
sprintf(temp, "%s (ns)", Memory::GetAddressName(address)); sprintf(temp, "%s (ns)", Memory::GetAddressName(address));
} }
else else
sprintf(temp, "%s (0x%x b)", symbolMap.GetSymbolName(fn),symbolMap.GetSymbolSize(fn)); sprintf(temp, "%s (0x%x b)", g_symbolMap->GetSymbolName(fn),g_symbolMap->GetSymbolSize(fn));
painter.drawText(205,rowY1 - 2 + rowHeight, temp); painter.drawText(205,rowY1 - 2 + rowHeight, temp);
textPen.setColor(0xFF000000); textPen.setColor(0xFF000000);
@ -162,16 +162,16 @@ void CtrlMemView::paintEvent(QPaintEvent *)
if (align==4) if (align==4)
{ {
u32 value = Memory::ReadUnchecked_U32(address); u32 value = Memory::ReadUnchecked_U32(address);
int symbolnum = symbolMap.GetSymbolNum(value); int symbolnum = g_symbolMap->GetSymbolNum(value);
if(symbolnum>=0) if(symbolnum>=0)
sprintf(temp, "%08x [%s]", value, symbolMap.GetSymbolName(symbolnum)); sprintf(temp, "%08x [%s]", value, g_symbolMap->GetSymbolName(symbolnum));
} }
else if (align==2) else if (align==2)
{ {
u16 value = Memory::ReadUnchecked_U16(address); u16 value = Memory::ReadUnchecked_U16(address);
int symbolnum = symbolMap.GetSymbolNum(value); int symbolnum = g_symbolMap->GetSymbolNum(value);
if(symbolnum>=0) if(symbolnum>=0)
sprintf(temp, "%04x [%s]", value, symbolMap.GetSymbolName(symbolnum)); sprintf(temp, "%04x [%s]", value, g_symbolMap->GetSymbolName(symbolnum));
} }
painter.drawText(85,rowY1 - 2 + rowHeight, temp);*/ painter.drawText(85,rowY1 - 2 + rowHeight, temp);*/

2
Qt/Debugger/debugger_disasm.cpp
View File

@ -286,7 +286,7 @@ void Debugger_Disasm::FillFunctions()
item->setData(Qt::UserRole, 0x02000000); item->setData(Qt::UserRole, 0x02000000);
ui->FuncList->addItem(item); ui->FuncList->addItem(item);
std::vector<SymbolEntry> symbols = symbolMap.GetAllSymbols(ST_FUNCTION); std::vector<SymbolEntry> symbols = g_symbolMap->GetAllSymbols(ST_FUNCTION);
for(int i = 0; i < (int)symbols.size(); i++) for(int i = 0; i < (int)symbols.size(); i++)
{ {
QListWidgetItem* item = new QListWidgetItem(); QListWidgetItem* item = new QListWidgetItem();

2
Qt/Debugger/debugger_memory.cpp
View File

@ -59,7 +59,7 @@ void Debugger_Memory::NotifyMapLoaded()
item->setData(Qt::UserRole, 0x80000000); item->setData(Qt::UserRole, 0x80000000);
ui->symbols->addItem(item); ui->symbols->addItem(item);
std::vector<SymbolEntry> symbols = symbolMap.GetAllSymbols(ST_DATA); std::vector<SymbolEntry> symbols = g_symbolMap->GetAllSymbols(ST_DATA);
for(int i = 0; i < (int)symbols.size(); i++) for(int i = 0; i < (int)symbols.size(); i++)
{ {
QListWidgetItem* item = new QListWidgetItem(); QListWidgetItem* item = new QListWidgetItem();