midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1011 from lioncash/initializer

Browse Source 
citra-qt: Adjust initializer list order
This commit is contained in:
bunnei 2015-07-29 16:46:34 -04:00
commit 9221e6e67a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/bootmanager.cpp
View File

@ -94,7 +94,7 @@ private:
}; };
GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) :
QWidget(parent), emu_thread(emu_thread), keyboard_id(0) { QWidget(parent), keyboard_id(0), emu_thread(emu_thread) {
std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
setWindowTitle(QString::fromStdString(window_title)); setWindowTitle(QString::fromStdString(window_title));

2
src/citra_qt/debugger/disassembler.cpp
View File

@ -159,7 +159,7 @@ void DisassemblerModel::SetNextInstruction(unsigned int address) {
} }
DisassemblerWidget::DisassemblerWidget(QWidget* parent, EmuThread* emu_thread) : DisassemblerWidget::DisassemblerWidget(QWidget* parent, EmuThread* emu_thread) :
QDockWidget(parent), emu_thread(emu_thread), base_addr(0) { QDockWidget(parent), base_addr(0), emu_thread(emu_thread) {
disasm_ui.setupUi(this); disasm_ui.setupUi(this);