From 686380b6c4d8acf219a704a8932668b11efc47c2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 16 May 2017 21:14:11 -0400 Subject: [PATCH] Qt: Resolve -Wreorder warnings --- src/platform/qt/AssetView.cpp | 2 +- src/platform/qt/DebuggerController.cpp | 2 +- src/platform/qt/GameController.cpp | 8 ++++---- src/platform/qt/IOViewer.h | 14 +++++++------- src/platform/qt/InputController.cpp | 10 +++++----- src/platform/qt/InputProfile.cpp | 4 ++-- src/platform/qt/KeyEditor.cpp | 4 ++-- src/platform/qt/LoadSaveState.cpp | 2 +- src/platform/qt/LogController.cpp | 4 ++-- src/platform/qt/MemoryModel.cpp | 2 +- src/platform/qt/ShortcutController.cpp | 2 +- src/platform/qt/Window.cpp | 16 ++++++++-------- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/platform/qt/AssetView.cpp b/src/platform/qt/AssetView.cpp index 198776601..0077cae8a 100644 --- a/src/platform/qt/AssetView.cpp +++ b/src/platform/qt/AssetView.cpp @@ -13,8 +13,8 @@ using namespace QGBA; AssetView::AssetView(GameController* controller, QWidget* parent) : QWidget(parent) - , m_controller(controller) , m_tileCache(controller->tileCache()) + , m_controller(controller) { m_updateTimer.setSingleShot(true); m_updateTimer.setInterval(1); diff --git a/src/platform/qt/DebuggerController.cpp b/src/platform/qt/DebuggerController.cpp index 34f00f558..a1a7a96c5 100644 --- a/src/platform/qt/DebuggerController.cpp +++ b/src/platform/qt/DebuggerController.cpp @@ -11,8 +11,8 @@ using namespace QGBA; DebuggerController::DebuggerController(GameController* controller, mDebugger* debugger, QObject* parent) : QObject(parent) - , m_gameController(controller) , m_debugger(debugger) + , m_gameController(controller) { } diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index dcc466330..3ae7edc7c 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -48,6 +48,7 @@ GameController::GameController(QObject* parent) , m_gameOpen(false) , m_vf(nullptr) , m_useBios(false) + , m_override(nullptr) , m_audioProcessor(AudioProcessor::create()) , m_pauseAfterFrame(false) , m_sync(true) @@ -62,16 +63,15 @@ GameController::GameController(QObject* parent) , m_videoLayers() , m_autofire{} , m_autofireStatus{} - , m_inputController(nullptr) - , m_multiplayer(nullptr) - , m_stream(nullptr) , m_stateSlot(1) , m_backupLoadState(nullptr) , m_backupSaveState(nullptr) , m_saveStateFlags(SAVESTATE_SCREENSHOT | SAVESTATE_SAVEDATA | SAVESTATE_CHEATS | SAVESTATE_RTC) , m_loadStateFlags(SAVESTATE_SCREENSHOT | SAVESTATE_RTC) , m_preload(false) - , m_override(nullptr) + , m_inputController(nullptr) + , m_multiplayer(nullptr) + , m_stream(nullptr) , m_vl(nullptr) , m_vlVf(nullptr) { diff --git a/src/platform/qt/IOViewer.h b/src/platform/qt/IOViewer.h index 9186cd4d2..c2451e08d 100644 --- a/src/platform/qt/IOViewer.h +++ b/src/platform/qt/IOViewer.h @@ -21,16 +21,16 @@ Q_OBJECT public: struct RegisterItem { RegisterItem(const QString& description, uint start, uint size = 1, bool readonly = false) - : description(description) - , start(start) + : start(start) , size(size) - , readonly(readonly) {} + , readonly(readonly) + , description(description) {} RegisterItem(const QString& description, uint start, uint size, QStringList items, bool readonly = false) - : description(description) - , start(start) + : start(start) , size(size) - , items(items) - , readonly(readonly) {} + , readonly(readonly) + , description(description) + , items(items) {} uint start; uint size; bool readonly; diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index 2d8d8025d..35bf0c11f 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -26,16 +26,16 @@ mSDLEvents InputController::s_sdlEvents; InputController::InputController(int playerId, QWidget* topLevel, QObject* parent) : QObject(parent) - , m_playerId(playerId) , m_config(nullptr) - , m_gamepadTimer(nullptr) + , m_playerId(playerId) + , m_allowOpposing(false) + , m_topLevel(topLevel) + , m_focusParent(topLevel) #ifdef BUILD_SDL , m_sdlPlayer{} , m_playerAttached(false) #endif - , m_allowOpposing(false) - , m_topLevel(topLevel) - , m_focusParent(topLevel) + , m_gamepadTimer(nullptr) { mInputMapInit(&m_inputMap, &GBAInputInfo); diff --git a/src/platform/qt/InputProfile.cpp b/src/platform/qt/InputProfile.cpp index 80aece552..aedc47f6e 100644 --- a/src/platform/qt/InputProfile.cpp +++ b/src/platform/qt/InputProfile.cpp @@ -179,8 +179,6 @@ constexpr InputProfile::InputProfile(const char* name, keys.keyR, keys.keyL, } - , m_shortcutButtons(shortcutButtons) - , m_shortcutAxes(shortcutAxes) , m_axes { axes.keyA, axes.keyB, @@ -193,6 +191,8 @@ constexpr InputProfile::InputProfile(const char* name, axes.keyR, axes.keyL, } + , m_shortcutButtons(shortcutButtons) + , m_shortcutAxes(shortcutAxes) , m_tiltAxis(tiltAxis) , m_gyroAxis(gyroAxis) , m_gyroSensitivity(gyroSensitivity) diff --git a/src/platform/qt/KeyEditor.cpp b/src/platform/qt/KeyEditor.cpp index 65b3345a1..64463630a 100644 --- a/src/platform/qt/KeyEditor.cpp +++ b/src/platform/qt/KeyEditor.cpp @@ -16,12 +16,12 @@ using namespace QGBA; KeyEditor::KeyEditor(QWidget* parent) : QLineEdit(parent) - , m_direction(GamepadAxisEvent::NEUTRAL) - , m_hatDirection(GamepadHatEvent::CENTER) , m_key(-1) , m_axis(-1) , m_hat(-1) , m_button(false) + , m_direction(GamepadAxisEvent::NEUTRAL) + , m_hatDirection(GamepadHatEvent::CENTER) { setAlignment(Qt::AlignCenter); setFocusPolicy(Qt::ClickFocus); diff --git a/src/platform/qt/LoadSaveState.cpp b/src/platform/qt/LoadSaveState.cpp index 820b5f2ed..40777000f 100644 --- a/src/platform/qt/LoadSaveState.cpp +++ b/src/platform/qt/LoadSaveState.cpp @@ -23,8 +23,8 @@ using namespace QGBA; LoadSaveState::LoadSaveState(GameController* controller, QWidget* parent) : QWidget(parent) , m_controller(controller) - , m_currentFocus(controller->stateSlot() - 1) , m_mode(LoadSave::LOAD) + , m_currentFocus(controller->stateSlot() - 1) { setAttribute(Qt::WA_TranslucentBackground); m_ui.setupUi(this); diff --git a/src/platform/qt/LogController.cpp b/src/platform/qt/LogController.cpp index 61208f0cc..5de4c74e5 100644 --- a/src/platform/qt/LogController.cpp +++ b/src/platform/qt/LogController.cpp @@ -72,9 +72,9 @@ QString LogController::toString(int level) { } LogController::Stream::Stream(LogController* controller, int level, int category) - : m_log(controller) - , m_level(level) + : m_level(level) , m_category(category) + , m_log(controller) { } diff --git a/src/platform/qt/MemoryModel.cpp b/src/platform/qt/MemoryModel.cpp index 215576b9f..70e0abe72 100644 --- a/src/platform/qt/MemoryModel.cpp +++ b/src/platform/qt/MemoryModel.cpp @@ -27,11 +27,11 @@ using namespace QGBA; MemoryModel::MemoryModel(QWidget* parent) : QAbstractScrollArea(parent) , m_core(nullptr) + , m_codec(nullptr) , m_top(0) , m_align(1) , m_selection(0, 0) , m_selectionAnchor(0) - , m_codec(nullptr) { m_font.setFamily("Source Code Pro"); m_font.setStyleHint(QFont::Monospace); diff --git a/src/platform/qt/ShortcutController.cpp b/src/platform/qt/ShortcutController.cpp index 8dce4ad8a..c207197eb 100644 --- a/src/platform/qt/ShortcutController.cpp +++ b/src/platform/qt/ShortcutController.cpp @@ -555,8 +555,8 @@ ShortcutController::ShortcutItem::ShortcutItem(QAction* action, const QString& n ShortcutController::ShortcutItem::ShortcutItem(ShortcutController::ShortcutItem::Functions functions, int shortcut, const QString& visibleName, const QString& name, ShortcutItem* parent) : m_action(nullptr) , m_shortcut(shortcut) - , m_functions(functions) , m_menu(nullptr) + , m_functions(functions) , m_name(name) , m_visibleName(visibleName) , m_button(-1) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 78956942e..e048bbe3f 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -65,11 +65,19 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent) : QMainWindow(parent) , m_log(0) , m_logView(new LogView(&m_log)) +#ifdef USE_DEBUGGERS + , m_console(nullptr) +#endif , m_stateWindow(nullptr) , m_screenWidget(new WindowBackground()) , m_logo(":/res/mgba-1024.png") , m_config(config) , m_inputController(playerId, this) + , m_mruMenu(nullptr) + , m_shortcutController(new ShortcutController(this)) + , m_fullscreenOnStart(false) + , m_autoresume(false) + , m_wasOpened(false) #ifdef USE_FFMPEG , m_videoView(nullptr) #endif @@ -79,14 +87,6 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent) #ifdef USE_GDB_STUB , m_gdbController(nullptr) #endif -#ifdef USE_DEBUGGERS - , m_console(nullptr) -#endif - , m_mruMenu(nullptr) - , m_shortcutController(new ShortcutController(this)) - , m_fullscreenOnStart(false) - , m_autoresume(false) - , m_wasOpened(false) { setFocusPolicy(Qt::StrongFocus); setAcceptDrops(true);