From f8afc401984b0506e4b5d88f9a56b20a8dbff317 Mon Sep 17 00:00:00 2001 From: Max Paperno Date: Sat, 15 Sep 2018 18:41:53 -0400 Subject: [PATCH] [Companion][Boards] Remove final usage of two function alias macros. --- companion/src/firmwares/boards.h | 2 -- companion/src/firmwares/rawswitch.cpp | 2 +- companion/src/simulation/simulatorwidget.cpp | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/companion/src/firmwares/boards.h b/companion/src/firmwares/boards.h index 69017aa86..885da2fc3 100644 --- a/companion/src/firmwares/boards.h +++ b/companion/src/firmwares/boards.h @@ -179,8 +179,6 @@ class Boards // temporary aliases for transition period, use Boards class instead. #define getBoardCapability(b__, c__) Boards::getCapability(b__, c__) -#define getEEpromSize(b__) Boards::getEEpromSize(b__) -#define getSwitchInfo(b__, i__) Boards::getSwitchInfo(b__, i__) #define IS_9X(board) (board==Board::BOARD_STOCK || board==Board::BOARD_M128) #define IS_STOCK(board) (board==Board::BOARD_STOCK) diff --git a/companion/src/firmwares/rawswitch.cpp b/companion/src/firmwares/rawswitch.cpp index 66b4fc6e3..55fb91c1c 100644 --- a/companion/src/firmwares/rawswitch.cpp +++ b/companion/src/firmwares/rawswitch.cpp @@ -77,7 +77,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen if (generalSettings) swName = QString(generalSettings->switchName[qr.quot]); if (swName.isEmpty()) - swName = getSwitchInfo(board, qr.quot).name; + swName = Boards::getSwitchInfo(board, qr.quot).name; return swName + directionIndicators.at(qr.rem > -1 && qr.rem < directionIndicators.size() ? qr.rem : 1); } else { diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index a31aef390..4ad053c73 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -241,7 +241,7 @@ bool SimulatorWidget::setStartupData(const QByteArray & dataSource, bool fromFil } // Assume a byte array of radio data was passed, load it. else if (!dataSource.isEmpty()) { - ret = firmware->getEEpromInterface()->load(simuData, (uint8_t *)dataSource.constData(), getEEpromSize(m_board)); + ret = firmware->getEEpromInterface()->load(simuData, (uint8_t *)dataSource.constData(), Boards::getEEpromSize(m_board)); startupData = dataSource; // save the data for start() } // we're :-( @@ -374,7 +374,7 @@ bool SimulatorWidget::saveTempData() fh.close(); } - if (!firmware->getEEpromInterface()->load(radioData, (uint8_t *)startupData.constData(), getEEpromSize(m_board))) { + if (!firmware->getEEpromInterface()->load(radioData, (uint8_t *)startupData.constData(), Boards::getEEpromSize(m_board))) { error = tr("Error saving data: could not get data from simulator interface."); } else { @@ -489,7 +489,7 @@ void SimulatorWidget::onSimulatorStopped() m_heartbeatTimer.invalidate(); if (simulator && !simulator->isRunning() && saveTempRadioData) { - startupData.fill(0, getEEpromSize(m_board)); + startupData.fill(0, Boards::getEEpromSize(m_board)); simulator->readRadioData(startupData); } }