VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-22 17:45:48 -05:00
Code Issues Projects Releases Wiki Activity

Fix warnings,

Browse Source
This commit is contained in:
srcejon 2024-10-10 14:36:06 +01:00
parent 78d0160514
commit 3df1ce20ae
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdrgui/gui/workspace.h
View File

@ -119,12 +119,13 @@ private slots:
void stackSubWindows(); void stackSubWindows();
void autoStackSubWindows(const QPoint&); void autoStackSubWindows(const QPoint&);
void tabSubWindows(); void tabSubWindows();
void layoutSubWindows();
void startStopClicked(bool checked = false); void startStopClicked(bool checked = false);
void addFeatureEmitted(int featureIndex); void addFeatureEmitted(int featureIndex);
void toggleFloating(); void toggleFloating();
void deviceStateChanged(int, DeviceAPI *deviceAPI); void deviceStateChanged(int, DeviceAPI *deviceAPI);
void subWindowActivated(QMdiSubWindow *window); void subWindowActivated(QMdiSubWindow *window);
public slots:
void layoutSubWindows();
signals: signals:
void addRxDevice(Workspace *inWorkspace, int deviceIndex); void addRxDevice(Workspace *inWorkspace, int deviceIndex);

18
sdrgui/mainwindow.cpp
View File

@ -137,12 +137,6 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
#endif #endif
m_settingsSaved(false) m_settingsSaved(false)
{ {
#if defined(ANDROID) || defined(__EMSCRIPTEN__)
bool showWelcome = true;
#else
bool showWelcome = false;
#endif
QAccessible::installFactory(AccessibleValueDial::factory); QAccessible::installFactory(AccessibleValueDial::factory);
QAccessible::installFactory(AccessibleValueDialZ::factory); QAccessible::installFactory(AccessibleValueDialZ::factory);
@ -898,7 +892,7 @@ void RemoveAllWorkspacesFSM::removeWorkspaces()
} }
LoadConfigurationFSM::LoadConfigurationFSM(MainWindow *mainWindow, const Configuration *configuration, QProgressDialog *waitBox, QObject *parent) : LoadConfigurationFSM::LoadConfigurationFSM(MainWindow *mainWindow, const Configuration *configuration, QProgressDialog *waitBox, QObject *parent) :
MainWindowFSM(mainWindow), MainWindowFSM(mainWindow, parent),
m_configuration(configuration), m_configuration(configuration),
m_waitBox(waitBox) m_waitBox(waitBox)
{ {
@ -1091,7 +1085,7 @@ void LoadConfigurationFSM::loadDeviceSetSettings()
int deviceSetIndex = 0; int deviceSetIndex = 0;
for (const auto& deviceSetPreset : deviceSetPresets) for (const auto& deviceSetPreset : deviceSetPresets)
{ {
if (m_mainWindow->m_deviceUIs.size() > deviceSetIndex) if (((int) m_mainWindow->m_deviceUIs.size()) > deviceSetIndex)
{ {
MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_deviceGUI, deviceSetPreset.getDeviceGeometry()); MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_deviceGUI, deviceSetPreset.getDeviceGeometry());
MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI, deviceSetPreset.getSpectrumGeometry()); MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI, deviceSetPreset.getSpectrumGeometry());
@ -1170,11 +1164,18 @@ InitFSM::InitFSM(MainWindow *mainWindow, SDRangelSplash *splash, bool loadDefaul
// Create FSM // Create FSM
createStates(2); createStates(2);
if (loadDefault)
{
m_loadConfigurationFSM = new LoadConfigurationFSM(m_mainWindow, m_mainWindow->m_mainCore->getMutableSettings().getWorkingConfiguration(), nullptr, this); m_loadConfigurationFSM = new LoadConfigurationFSM(m_mainWindow, m_mainWindow->m_mainCore->getMutableSettings().getWorkingConfiguration(), nullptr, this);
m_states[0]->addTransition(m_loadConfigurationFSM, &LoadConfigurationFSM::finished, m_finalState); m_states[0]->addTransition(m_loadConfigurationFSM, &LoadConfigurationFSM::finished, m_finalState);
connect(m_states[0], &QState::entered, this, &InitFSM::loadDefaultConfiguration); connect(m_states[0], &QState::entered, this, &InitFSM::loadDefaultConfiguration);
}
else
{
m_states[0]->addTransition(m_finalState);
}
connect(m_finalState, &QState::entered, this, &InitFSM::showDefaultConfigurations); connect(m_finalState, &QState::entered, this, &InitFSM::showDefaultConfigurations);
} }
@ -2792,6 +2793,7 @@ void MainWindow::fftWisdomProcessFinished(int exitCode, QProcess::ExitStatus exi
delete m_fftWisdomProcess; delete m_fftWisdomProcess;
m_fftWisdomProcess = nullptr; m_fftWisdomProcess = nullptr;
} }
#endif
void MainWindow::samplingDeviceChangeHandler(const DeviceGUI *deviceGUI, int newDeviceIndex) void MainWindow::samplingDeviceChangeHandler(const DeviceGUI *deviceGUI, int newDeviceIndex)
{ {