mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Windows: MSVC2017: changes in sdrgui and sdrbase (5)

pull/263/head
f4exb 2018-11-12 18:36:27 +01:00
rodzic fd50eeb810
commit d910675587
18 zmienionych plików z 146 dodań i 71 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
sdrbase/dsp/projector.h
Wyświetl plik

@ -15,9 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include "export.h"
#include "dsptypes.h"
class Projector
class SDRBASE_API Projector
{
public:
enum ProjectionType

3
sdrgui/dsp/scopevis.cpp
Wyświetl plik

@ -216,8 +216,9 @@ void ScopeVis::setMemoryIndex(uint32_t memoryIndex)
getInputMessageQueue()->push(cmd);
}
void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused)))
void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly)
{
(void) positiveOnly;
if (m_freeRun) {
m_triggerPoint = cbegin;
}

13
sdrgui/dsp/scopevisxy.cpp
Wyświetl plik

@ -15,9 +15,11 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <chrono>
#include <thread>
#include "scopevisxy.h"
#include "gui/tvscreen.h"
#include <unistd.h>
ScopeVisXY::ScopeVisXY(TVScreen *tvScreen) :
m_tvScreen(tvScreen),
@ -47,9 +49,9 @@ void ScopeVisXY::setPixelsPerFrame(int pixelsPerFrame)
m_tvScreen->setAlphaReset();
}
void ScopeVisXY::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end,
bool positiveOnly __attribute__((unused)))
void ScopeVisXY::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly)
{
(void) positiveOnly;
SampleVector::const_iterator begin(cbegin);
while (begin < end)
@ -83,7 +85,7 @@ void ScopeVisXY::feed(const SampleVector::const_iterator& cbegin, const SampleVe
m_tvScreen->renderImage(0);
m_tvScreen->update();
usleep(5000);
std::this_thread::sleep_for(std::chrono::microseconds(5000));
m_tvScreen->resetImage(m_alphaReset);
drawGraticule();
m_pixelCount = 0;
@ -99,8 +101,9 @@ void ScopeVisXY::stop()
{
}
bool ScopeVisXY::handleMessage(const Message& message __attribute__((unused)))
bool ScopeVisXY::handleMessage(const Message& message)
{
(void) message;
return false;
}

3
sdrgui/dsp/spectrumscopecombovis.cpp
Wyświetl plik

@ -14,8 +14,9 @@ SpectrumScopeComboVis::~SpectrumScopeComboVis()
{
}
void SpectrumScopeComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused)))
void SpectrumScopeComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly)
{
(void) positiveOnly;
m_scopeVis->feed(begin, end, false);
SampleVector::const_iterator triggerPoint = m_scopeVis->getTriggerPoint();
m_spectrumVis->feedTriggered(triggerPoint, end, positiveOnly);

12
sdrgui/gui/audiodialog.cpp
Wyświetl plik

@ -159,14 +159,16 @@ void AudioDialogX::on_inputVolume_valueChanged(int value)
ui->inputVolumeText->setText(QString("%1").arg(volume, 0, 'f', 2));
}
void AudioDialogX::on_inputReset_clicked(bool checked __attribute__((unused)))
void AudioDialogX::on_inputReset_clicked(bool checked)
{
(void) checked;
m_inputDeviceInfo.resetToDefaults();
updateInputDisplay();
}
void AudioDialogX::on_inputCleanup_clicked(bool checked __attribute__((unused)))
void AudioDialogX::on_inputCleanup_clicked(bool checked)
{
(void) checked;
m_audioDeviceManager->inputInfosCleanup();
}
@ -196,14 +198,16 @@ void AudioDialogX::on_outputUDPPort_editingFinished()
ui->outputUDPPort->setText(tr("%1").arg(m_outputDeviceInfo.udpPort));
}
void AudioDialogX::on_outputReset_clicked(bool checked __attribute__((unused)))
void AudioDialogX::on_outputReset_clicked(bool checked)
{
(void) checked;
m_outputDeviceInfo.resetToDefaults();
updateOutputDisplay();
}
void AudioDialogX::on_outputCleanup_clicked(bool checked __attribute__((unused)))
void AudioDialogX::on_outputCleanup_clicked(bool checked)
{
(void) checked;
m_audioDeviceManager->outputInfosCleanup();
}

10
sdrgui/gui/clickablelabel.cpp
Wyświetl plik

@ -17,9 +17,16 @@
#include "gui/clickablelabel.h"
ClickableLabel::ClickableLabel()
: QLabel(nullptr)
{
setText("");
}
ClickableLabel::ClickableLabel(QWidget* parent)
: QLabel(parent)
{
setText("");
}
ClickableLabel::ClickableLabel(const QString& text, QWidget* parent)
@ -32,8 +39,9 @@ ClickableLabel::~ClickableLabel()
{
}
void ClickableLabel::mousePressEvent(QMouseEvent* event __attribute__((unused)))
void ClickableLabel::mousePressEvent(QMouseEvent* event)
{
(void) event;
emit clicked();
}

5
sdrgui/gui/clickablelabel.h
Wyświetl plik

@ -27,8 +27,9 @@ class SDRGUI_API ClickableLabel : public QLabel
{
Q_OBJECT
public:
explicit ClickableLabel( QWidget* parent=0 );
explicit ClickableLabel( const QString& text="", QWidget* parent=0 );
explicit ClickableLabel();
explicit ClickableLabel(QWidget* parent);
explicit ClickableLabel(const QString& text, QWidget* parent=nullptr);
~ClickableLabel();
signals:
void clicked();

4
sdrgui/gui/crightclickenabler.h
Wyświetl plik

@ -30,7 +30,9 @@ signals:
void rightClick();
protected:
inline bool eventFilter(QObject *watched __attribute__((unused)), QEvent *event) override {
inline bool eventFilter(QObject *watched, QEvent *event) override
{
(void) watched;
if (event->type() == QEvent::MouseButtonPress)
{
auto mouseEvent = (QMouseEvent*)event;

3
sdrgui/gui/cwkeyergui.cpp
Wyświetl plik

@ -93,8 +93,9 @@ bool CWKeyerGUI::deserialize(const QByteArray& data)
// === SLOTS ==================================================================
void CWKeyerGUI::on_cwTextClear_clicked(bool checked __attribute__((unused)))
void CWKeyerGUI::on_cwTextClear_clicked(bool checked)
{
(void) checked;
ui->cwTextEdit->clear();
m_cwKeyer->setText("");
}

6
sdrgui/gui/editcommanddialog.cpp
Wyświetl plik

@ -122,8 +122,9 @@ void EditCommandDialog::setRelease(bool release)
ui->keyRelease->setChecked(release);
}
void EditCommandDialog::on_showFileDialog_clicked(bool checked __attribute__((unused)))
void EditCommandDialog::on_showFileDialog_clicked(bool checked)
{
(void) checked;
QString commandFileName = ui->command->text();
QFileInfo commandFileInfo(commandFileName);
QString commandFolderName = commandFileInfo.baseName();
@ -224,8 +225,9 @@ void EditCommandDialog::setKeyAssociate()
}
}
void EditCommandDialog::commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release __attribute__((unused)))
void EditCommandDialog::commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release)
{
(void) release;
// qDebug("EditCommandDialog::commandKeyPressed: key: %x", m_key);
// qDebug("EditCommandDialog::commandKeyPressed: has modifiers: %x", QFlags<Qt::KeyboardModifier>::Int(keyModifiers));
m_key = key;

75
sdrgui/gui/glscopegui.cpp
Wyświetl plik

@ -616,15 +616,17 @@ void GLScopeGUI::on_trace_valueChanged(int value)
m_scopeVis->focusOnTrace(value);
}
void GLScopeGUI::on_traceAdd_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_traceAdd_clicked(bool checked)
{
(void) checked;
ScopeVis::TraceData traceData;
fillTraceData(traceData);
addTrace(traceData);
}
void GLScopeGUI::on_traceDel_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_traceDel_clicked(bool checked)
{
(void) checked;
if (ui->trace->value() > 0) // not the X trace
{
ui->trace->setMaximum(ui->trace->maximum() - 1);
@ -644,8 +646,9 @@ void GLScopeGUI::on_traceDel_clicked(bool checked __attribute__((unused)))
}
}
void GLScopeGUI::on_traceUp_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_traceUp_clicked(bool checked)
{
(void) checked;
if (ui->trace->maximum() > 0) // more than one trace
{
int newTraceIndex = (ui->trace->value() + 1) % (ui->trace->maximum()+1);
@ -658,8 +661,9 @@ void GLScopeGUI::on_traceUp_clicked(bool checked __attribute__((unused)))
}
}
void GLScopeGUI::on_traceDown_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_traceDown_clicked(bool checked)
{
(void) checked;
if (ui->trace->value() > 0) // not the X (lowest) trace
{
int newTraceIndex = (ui->trace->value() - 1) % (ui->trace->maximum()+1);
@ -691,15 +695,17 @@ void GLScopeGUI::on_trig_valueChanged(int value)
m_scopeVis->focusOnTrigger(value);
}
void GLScopeGUI::on_trigAdd_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_trigAdd_clicked(bool checked)
{
(void) checked;
ScopeVis::TriggerData triggerData;
fillTriggerData(triggerData);
addTrigger(triggerData);
}
void GLScopeGUI::on_trigDel_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_trigDel_clicked(bool checked)
{
(void) checked;
if (ui->trig->value() > 0)
{
m_scopeVis->removeTrigger(ui->trig->value());
@ -707,8 +713,9 @@ void GLScopeGUI::on_trigDel_clicked(bool checked __attribute__((unused)))
}
}
void GLScopeGUI::on_trigUp_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_trigUp_clicked(bool checked)
{
(void) checked;
if (ui->trig->maximum() > 0) // more than one trigger
{
int newTriggerIndex = (ui->trig->value() + 1) % (ui->trig->maximum()+1);
@ -721,8 +728,9 @@ void GLScopeGUI::on_trigUp_clicked(bool checked __attribute__((unused)))
}
}
void GLScopeGUI::on_trigDown_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_trigDown_clicked(bool checked)
{
(void) checked;
if (ui->trig->value() > 0) // not the 0 (lowest) trigger
{
int newTriggerIndex = (ui->trig->value() - 1) % (ui->trig->maximum()+1);
@ -735,45 +743,52 @@ void GLScopeGUI::on_trigDown_clicked(bool checked __attribute__((unused)))
}
}
void GLScopeGUI::on_traceMode_currentIndexChanged(int index __attribute__((unused)))
void GLScopeGUI::on_traceMode_currentIndexChanged(int index)
{
(void) index;
setAmpScaleDisplay();
setAmpOfsDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_amp_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_amp_valueChanged(int value)
{
(void) value;
setAmpScaleDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_ofsCoarse_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_ofsCoarse_valueChanged(int value)
{
(void) value;
setAmpOfsDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_ofsFine_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_ofsFine_valueChanged(int value)
{
(void) value;
setAmpOfsDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_traceDelayCoarse_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_traceDelayCoarse_valueChanged(int value)
{
(void) value;
setTraceDelayDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_traceDelayFine_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_traceDelayFine_valueChanged(int value)
{
(void) value;
setTraceDelayDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_traceView_toggled(bool checked __attribute__((unused)))
void GLScopeGUI::on_traceView_toggled(bool checked)
{
(void) checked;
changeCurrentTrace();
}
@ -791,8 +806,9 @@ void GLScopeGUI::on_traceColor_clicked()
}
}
void GLScopeGUI::on_memorySave_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_memorySave_clicked(bool checked)
{
(void) checked;
QString fileName = QFileDialog::getSaveFileName(this,
tr("Open trace memory file"), ".", tr("Trace memory files (*.trcm)"), 0, QFileDialog::DontUseNativeDialog);
@ -821,8 +837,9 @@ void GLScopeGUI::on_memorySave_clicked(bool checked __attribute__((unused)))
}
}
void GLScopeGUI::on_memoryLoad_clicked(bool checked __attribute__((unused)))
void GLScopeGUI::on_memoryLoad_clicked(bool checked)
{
(void) checked;
qDebug("GLScopeGUI::on_memoryLoad_clicked");
QString fileName = QFileDialog::getOpenFileName(this,
@ -857,14 +874,16 @@ void GLScopeGUI::on_mem_valueChanged(int value)
m_scopeVis->setMemoryIndex(value);
}
void GLScopeGUI::on_trigMode_currentIndexChanged(int index __attribute__((unused)))
void GLScopeGUI::on_trigMode_currentIndexChanged(int index)
{
(void) index;
setTrigLevelDisplay();
changeCurrentTrigger();
}
void GLScopeGUI::on_trigCount_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_trigCount_valueChanged(int value)
{
(void) value;
setTrigCountDisplay();
changeCurrentTrigger();
}
@ -905,32 +924,37 @@ void GLScopeGUI::on_trigHoldoff_valueChanged(int value)
changeCurrentTrigger();
}
void GLScopeGUI::on_trigLevelCoarse_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_trigLevelCoarse_valueChanged(int value)
{
(void) value;
setTrigLevelDisplay();
changeCurrentTrigger();
}
void GLScopeGUI::on_trigLevelFine_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_trigLevelFine_valueChanged(int value)
{
(void) value;
setTrigLevelDisplay();
changeCurrentTrigger();
}
void GLScopeGUI::on_trigDelayCoarse_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_trigDelayCoarse_valueChanged(int value)
{
(void) value;
setTrigDelayDisplay();
changeCurrentTrigger();
}
void GLScopeGUI::on_trigDelayFine_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_trigDelayFine_valueChanged(int value)
{
(void) value;
setTrigDelayDisplay();
changeCurrentTrigger();
}
void GLScopeGUI::on_trigPre_valueChanged(int value __attribute__((unused)))
void GLScopeGUI::on_trigPre_valueChanged(int value)
{
(void) value;
setTrigPreDisplay();
m_scopeVis->configure(m_traceLenMult*ScopeVis::m_traceChunkSize,
m_timeBase,
@ -1436,8 +1460,9 @@ void GLScopeGUI::applySettings()
{
}
bool GLScopeGUI::handleMessage(Message* message __attribute__((unused)))
bool GLScopeGUI::handleMessage(Message* message)
{
(void) message;
return false;
}

3
sdrgui/gui/glspectrumgui.cpp
Wyświetl plik

@ -451,8 +451,9 @@ void GLSpectrumGUI::on_traceIntensity_valueChanged(int index)
}
}
void GLSpectrumGUI::on_clearSpectrum_clicked(bool checked __attribute__((unused)))
void GLSpectrumGUI::on_clearSpectrum_clicked(bool checked)
{
(void) checked;
if(m_glSpectrum != 0) {
m_glSpectrum->clearSpectrumHistogram();
}

3
sdrgui/gui/loggingdialog.cpp
Wyświetl plik

@ -47,8 +47,9 @@ void LoggingDialog::accept()
QDialog::accept();
}
void LoggingDialog::on_showFileDialog_clicked(bool checked __attribute__((unused)))
void LoggingDialog::on_showFileDialog_clicked(bool checked)
{
(void) checked;
QString fileName = QFileDialog::getSaveFileName(this,
tr("Save log file"), ".", tr("Log Files (*.log)"), 0, QFileDialog::DontUseNativeDialog);

4
sdrgui/gui/tickedslider.cpp
Wyświetl plik

@ -28,9 +28,9 @@ TickedSlider::TickedSlider(QWidget* parent) :
m_tickColor(Qt::white)
{ }
void TickedSlider::paintEvent(QPaintEvent *ev __attribute__((unused)))
void TickedSlider::paintEvent(QPaintEvent *ev)
{
(void) ev;
QStylePainter p(this);
QStyleOptionSlider opt;
initStyleOption(&opt);

3
sdrgui/gui/tvscreen.cpp
Wyświetl plik

@ -180,8 +180,9 @@ void TVScreen::paintGL()
m_objMutex.unlock();
}
void TVScreen::mousePressEvent(QMouseEvent* event __attribute__((unused)))
void TVScreen::mousePressEvent(QMouseEvent* event)
{
(void) event;
}
void TVScreen::tick()

14
sdrgui/mainwindow.cpp
Wyświetl plik

@ -1404,13 +1404,17 @@ void MainWindow::on_presetDelete_clicked()
}
}
void MainWindow::on_presetTree_currentItemChanged(QTreeWidgetItem *current __attribute__((unused)), QTreeWidgetItem *previous __attribute__((unused)))
void MainWindow::on_presetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
{
(void) current;
(void) previous;
updatePresetControls();
}
void MainWindow::on_presetTree_itemActivated(QTreeWidgetItem *item __attribute__((unused)), int column __attribute__((unused)))
void MainWindow::on_presetTree_itemActivated(QTreeWidgetItem *item, int column)
{
(void) item;
(void) column;
on_presetLoad_clicked();
}
@ -1644,8 +1648,9 @@ void MainWindow::sampleSinkChanged()
}
}
void MainWindow::channelAddClicked(bool checked __attribute__((unused)))
void MainWindow::channelAddClicked(bool checked)
{
(void) checked;
// Do it in the currently selected source tab
int currentSourceTabIndex = ui->tabInputsSelect->currentIndex();
@ -1778,8 +1783,9 @@ void MainWindow::setLoggingOptions()
}
}
void MainWindow::focusHasChanged(QWidget *oldWidget __attribute__((unused)), QWidget *newWidget)
void MainWindow::focusHasChanged(QWidget *oldWidget, QWidget *newWidget)
{
(void) oldWidget;
// this is the hard way:
// if (ui->commandKeyboardConnect->isChecked() && (newWidget != this)) {
// setFocus();

3
sdrgui/sdrgui.pro
Wyświetl plik

@ -30,10 +30,13 @@ QMAKE_CXXFLAGS += -std=c++11
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
CONFIG(MSVC):DEFINES += sdrgui_EXPORTS
CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0
CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"

50
sdrgui/webapi/webapiadaptergui.cpp
Wyświetl plik

@ -20,8 +20,6 @@
#include <QList>
#include <QSysInfo>
#include <unistd.h>
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "loggerwithfile.h"
@ -73,8 +71,9 @@ WebAPIAdapterGUI::~WebAPIAdapterGUI()
int WebAPIAdapterGUI::instanceSummary(
SWGSDRangel::SWGInstanceSummaryResponse& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
*response.getAppname() = qApp->applicationName();
*response.getVersion() = qApp->applicationVersion();
@ -105,9 +104,10 @@ int WebAPIAdapterGUI::instanceSummary(
}
int WebAPIAdapterGUI::instanceDelete(
SWGSDRangel::SWGSuccessResponse& response __attribute__((unused)),
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) response;
*error.getMessage() = QString("Not supported in GUI instance");
return 400;
}
@ -115,8 +115,9 @@ int WebAPIAdapterGUI::instanceDelete(
int WebAPIAdapterGUI::instanceDevices(
bool tx,
SWGSDRangel::SWGInstanceDevicesResponse& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
int nbSamplingDevices = tx ? DeviceEnumerator::instance()->getNbTxSamplingDevices() : DeviceEnumerator::instance()->getNbRxSamplingDevices();
response.setDevicecount(nbSamplingDevices);
@ -143,8 +144,9 @@ int WebAPIAdapterGUI::instanceDevices(
int WebAPIAdapterGUI::instanceChannels(
bool tx,
SWGSDRangel::SWGInstanceChannelsResponse& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
PluginAPI::ChannelRegistrations *channelRegistrations = tx ? m_mainWindow.m_pluginManager->getTxChannelRegistrations() : m_mainWindow.m_pluginManager->getRxChannelRegistrations();
int nbChannelDevices = channelRegistrations->size();
@ -170,8 +172,9 @@ int WebAPIAdapterGUI::instanceChannels(
int WebAPIAdapterGUI::instanceLoggingGet(
SWGSDRangel::SWGLoggingInfo& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
response.setDumpToFile(m_mainWindow.m_logger->getUseFileLogger() ? 1 : 0);
@ -188,8 +191,9 @@ int WebAPIAdapterGUI::instanceLoggingGet(
int WebAPIAdapterGUI::instanceLoggingPut(
SWGSDRangel::SWGLoggingInfo& query,
SWGSDRangel::SWGLoggingInfo& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
// response input is the query actually
bool dumpToFile = (query.getDumpToFile() != 0);
QString* consoleLevel = query.getConsoleLevel();
@ -225,8 +229,9 @@ int WebAPIAdapterGUI::instanceLoggingPut(
int WebAPIAdapterGUI::instanceAudioGet(
SWGSDRangel::SWGAudioDevices& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
const QList<QAudioDeviceInfo>& audioInputDevices = m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputDevices();
const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainWindow.m_dspEngine->getAudioDeviceManager()->getOutputDevices();
int nbInputDevices = audioInputDevices.size();
@ -454,8 +459,9 @@ int WebAPIAdapterGUI::instanceAudioOutputDelete(
int WebAPIAdapterGUI::instanceAudioInputCleanupPatch(
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
m_mainWindow.m_dspEngine->getAudioDeviceManager()->inputInfosCleanup();
response.init();
@ -466,8 +472,9 @@ int WebAPIAdapterGUI::instanceAudioInputCleanupPatch(
int WebAPIAdapterGUI::instanceAudioOutputCleanupPatch(
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
m_mainWindow.m_dspEngine->getAudioDeviceManager()->outputInfosCleanup();
response.init();
@ -478,8 +485,9 @@ int WebAPIAdapterGUI::instanceAudioOutputCleanupPatch(
int WebAPIAdapterGUI::instanceLocationGet(
SWGSDRangel::SWGLocationInformation& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
response.setLatitude(m_mainWindow.m_settings.getLatitude());
response.setLongitude(m_mainWindow.m_settings.getLongitude());
@ -489,8 +497,9 @@ int WebAPIAdapterGUI::instanceLocationGet(
int WebAPIAdapterGUI::instanceLocationPut(
SWGSDRangel::SWGLocationInformation& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
float latitude = response.getLatitude();
float longitude = response.getLongitude();
@ -508,8 +517,9 @@ int WebAPIAdapterGUI::instanceLocationPut(
int WebAPIAdapterGUI::instanceDVSerialGet(
SWGSDRangel::SWGDVSeralDevices& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
std::vector<std::string> deviceNames;
@ -533,8 +543,9 @@ int WebAPIAdapterGUI::instanceDVSerialGet(
int WebAPIAdapterGUI::instanceDVSerialPatch(
bool dvserial,
SWGSDRangel::SWGDVSeralDevices& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
m_mainWindow.m_dspEngine->setDVSerialSupport(dvserial);
m_mainWindow.ui->action_DV_Serial->setChecked(dvserial);
response.init();
@ -566,8 +577,9 @@ int WebAPIAdapterGUI::instanceDVSerialPatch(
int WebAPIAdapterGUI::instancePresetsGet(
SWGSDRangel::SWGPresets& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
int nbPresets = m_mainWindow.m_settings.getPresetCount();
int nbGroups = 0;
int nbPresetsThisGroup = 0;
@ -816,8 +828,9 @@ int WebAPIAdapterGUI::instancePresetDelete(
int WebAPIAdapterGUI::instanceDeviceSetsGet(
SWGSDRangel::SWGDeviceSetList& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
getDeviceSetList(&response);
return 200;
}
@ -825,8 +838,9 @@ int WebAPIAdapterGUI::instanceDeviceSetsGet(
int WebAPIAdapterGUI::instanceDeviceSetPost(
bool tx,
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
MainWindow::MsgAddDeviceSet *msg = MainWindow::MsgAddDeviceSet::create(tx);
m_mainWindow.m_inputMessageQueue.push(msg);