diff options
| author | 2015-04-16 18:35:09 -0400 | |
|---|---|---|
| committer | 2015-05-01 18:26:58 -0400 | |
| commit | 762c1a9ff5406afc4c6b1a3eb74dae2dc2fb0daf (patch) | |
| tree | 74ac7be2a6f1b3dfd09986b598844440af9e2f8f /src/citra_qt/debugger/disassembler.h | |
| parent | Merge pull request #717 from linkmauve/useless-auto (diff) | |
| download | yuzu-762c1a9ff5406afc4c6b1a3eb74dae2dc2fb0daf.tar.gz yuzu-762c1a9ff5406afc4c6b1a3eb74dae2dc2fb0daf.tar.xz yuzu-762c1a9ff5406afc4c6b1a3eb74dae2dc2fb0daf.zip | |
Qt: Move EmuThread ownership from render window to main window.
Diffstat (limited to 'src/citra_qt/debugger/disassembler.h')
| -rw-r--r-- | src/citra_qt/debugger/disassembler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/citra_qt/debugger/disassembler.h b/src/citra_qt/debugger/disassembler.h index 5e19d7c51..d9e32dbdf 100644 --- a/src/citra_qt/debugger/disassembler.h +++ b/src/citra_qt/debugger/disassembler.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include "common/break_points.h" | 13 | #include "common/break_points.h" |
| 14 | 14 | ||
| 15 | class QAction; | 15 | class QAction; |
| 16 | class EmuThread; | 16 | class GMainWindow; |
| 17 | 17 | ||
| 18 | class DisassemblerModel : public QAbstractListModel | 18 | class DisassemblerModel : public QAbstractListModel |
| 19 | { | 19 | { |
| @@ -51,7 +51,7 @@ class DisassemblerWidget : public QDockWidget | |||
| 51 | Q_OBJECT | 51 | Q_OBJECT |
| 52 | 52 | ||
| 53 | public: | 53 | public: |
| 54 | DisassemblerWidget(QWidget* parent, EmuThread& emu_thread); | 54 | DisassemblerWidget(QWidget* parent, GMainWindow& main_window); |
| 55 | 55 | ||
| 56 | void Init(); | 56 | void Init(); |
| 57 | 57 | ||
| @@ -75,5 +75,5 @@ private: | |||
| 75 | 75 | ||
| 76 | u32 base_addr; | 76 | u32 base_addr; |
| 77 | 77 | ||
| 78 | EmuThread& emu_thread; | 78 | GMainWindow& main_window; |
| 79 | }; | 79 | }; |