caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unnecessary null pointer checks, closes #5

Browse Source
This commit is contained in:
Jan Käberich 2020-10-01 17:52:42 +02:00
parent 116794e89b
commit 1ea2771e32
4 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Software/PC_Application/Calibration/calkit.cpp
View File

@ -242,22 +242,14 @@ double Calkit::maxFreq()
void Calkit::clearTouchstoneCache() void Calkit::clearTouchstoneCache()
{ {
if(ts_open) { delete ts_open;
delete ts_open; ts_open = nullptr;
ts_open = nullptr; delete ts_short;
} ts_short = nullptr;
if(ts_short) { delete ts_load;
delete ts_short; ts_load = nullptr;
ts_short = nullptr; delete ts_through;
} ts_through = nullptr;
if(ts_load) {
delete ts_load;
ts_load = nullptr;
}
if(ts_through) {
delete ts_through;
ts_through = nullptr;
}
ts_cached = false; ts_cached = false;
} }

4
Software/PC_Application/Device/firmwareupdatedialog.cpp
View File

@ -28,9 +28,7 @@ void FirmwareUpdateDialog::on_bFile_clicked()
auto filename = QFileDialog::getOpenFileName(nullptr, "Open firmware file", "", "Firmware file (*.vnafw)", nullptr, QFileDialog::DontUseNativeDialog); auto filename = QFileDialog::getOpenFileName(nullptr, "Open firmware file", "", "Firmware file (*.vnafw)", nullptr, QFileDialog::DontUseNativeDialog);
if (filename.length() > 0) { if (filename.length() > 0) {
ui->lFile->setText(filename); ui->lFile->setText(filename);
if(file) { delete file;
delete file;
}
file = new QFile(filename); file = new QFile(filename);
ui->bStart->setEnabled(true); ui->bStart->setEnabled(true);
} }

4
Software/PC_Application/Traces/tracebodeplot.cpp
View File

@ -352,9 +352,7 @@ void TraceBodePlot::enableTraceAxis(Trace *t, int axis, bool enabled)
tracesAxis[axis].erase(t); tracesAxis[axis].erase(t);
// clean up and delete // clean up and delete
if(curves[axis].find(t) != curves[axis].end()) { if(curves[axis].find(t) != curves[axis].end()) {
if(curves[axis][t].curve) { delete curves[axis][t].curve;
delete curves[axis][t].curve;
}
curves[axis].erase(t); curves[axis].erase(t);
} }
int otherAxis = axis == 0 ? 1 : 0; int otherAxis = axis == 0 ? 1 : 0;

6
Software/PC_Application/appwindow.cpp
View File

@ -188,10 +188,8 @@ void AppWindow::ConnectToDevice(QString serial)
void AppWindow::DisconnectDevice() void AppWindow::DisconnectDevice()
{ {
if(device) { delete device;
delete device; device = nullptr;
device = nullptr;
}
ui->actionDisconnect->setEnabled(false); ui->actionDisconnect->setEnabled(false);
ui->actionManual_Control->setEnabled(false); ui->actionManual_Control->setEnabled(false);
ui->actionFirmware_Update->setEnabled(false); ui->actionFirmware_Update->setEnabled(false);