diff options
| author | bunnei <bunneidev@gmail.com> | 2015-07-29 16:46:34 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-07-29 16:46:34 -0400 |
| commit | 9221e6e67a3d700ac4da5060afc70bc0809c2058 (patch) | |
| tree | f4f05e3253e1979b14113eea953fcce248efe7ce | |
| parent | 31c1bb901b0411986f91871f29bc5a16420f5c7a (diff) | |
| parent | 5df3afd522032b6e971b76954cc6fdafa7f31499 (diff) | |
Merge pull request #1011 from lioncash/initializer
citra-qt: Adjust initializer list order
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index b12bd858bd..a96fbea5f8 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -94,7 +94,7 @@ private: }; 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); setWindowTitle(QString::fromStdString(window_title)); diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 1e5ef52996..d3629bbf67 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -159,7 +159,7 @@ void DisassemblerModel::SetNextInstruction(unsigned int address) { } 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); |