From 0d6a3a4f47cb555884cdc206266db7fa7c177b90 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 19 Jan 2021 12:36:56 +0100 Subject: [PATCH] Fix some typos spotted by lintian --- devices/plutosdr/deviceplutosdrbox.cpp | 2 +- plugins/channelrx/chanalyzer/chanalyzersink.cpp | 2 +- plugins/channelrx/demodadsb/adsbdemoddisplaydialog.ui | 2 +- plugins/channelrx/demodadsb/adsbdemodgui.ui | 2 +- plugins/channelrx/demodadsb/adsbdemodworker.cpp | 2 +- plugins/channelrx/filesink/filesinksink.cpp | 2 +- plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp | 2 +- plugins/channeltx/modchirpchat/chirpchatmodgui.ui | 2 +- .../feature/gs232controller/gs232controllerworker.cpp | 2 +- plugins/samplesink/usrpoutput/usrpoutputgui.ui | 2 +- plugins/samplesource/usrpinput/usrpinputgui.ui | 4 ++-- qrtplib/rtperrors.cpp | 10 +++++----- sdrbase/dsp/filerecord.cpp | 2 +- sdrbase/dsp/sigmffilerecord.cpp | 4 ++-- sdrbase/webapi/webapirequestmapper.cpp | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/devices/plutosdr/deviceplutosdrbox.cpp b/devices/plutosdr/deviceplutosdrbox.cpp index 5426448a5..e0af8aba5 100644 --- a/devices/plutosdr/deviceplutosdrbox.cpp +++ b/devices/plutosdr/deviceplutosdrbox.cpp @@ -134,7 +134,7 @@ void DevicePlutoSDRBox::set_params(DeviceType devType, if (pos == std::string::npos) { - std::cerr << "DevicePlutoSDRBox::set_params: Misformed line: " << *it << std::endl; + std::cerr << "DevicePlutoSDRBox::set_params: Malformed line: " << *it << std::endl; continue; } diff --git a/plugins/channelrx/chanalyzer/chanalyzersink.cpp b/plugins/channelrx/chanalyzer/chanalyzersink.cpp index 8e953b632..dfd1586dc 100644 --- a/plugins/channelrx/chanalyzer/chanalyzersink.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzersink.cpp @@ -165,7 +165,7 @@ void ChannelAnalyzerSink::applyChannelSettings(int channelSampleRate, int sinkSa int decim = channelSampleRate / sinkSampleRate; m_decimator.setLog2Decim(0); - for (int i = 0; i < 7; i++) // find log2 beween 0 and 6 + for (int i = 0; i < 7; i++) // find log2 between 0 and 6 { if ((decim & 1) == 1) { diff --git a/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.ui b/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.ui index db428c060..50690da43 100644 --- a/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.ui +++ b/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.ui @@ -63,7 +63,7 @@ - How long in seconds after not receving any frames will an aircraft be removed from the table and map + How long in seconds after not receiving any frames will an aircraft be removed from the table and map 1000000 diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.ui b/plugins/channelrx/demodadsb/adsbdemodgui.ui index 5a0a8d312..02cdf07ba 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.ui +++ b/plugins/channelrx/demodadsb/adsbdemodgui.ui @@ -586,7 +586,7 @@ - Enable feeding of received ADS-B messages to the specifed server. Right click for settings. + Enable feeding of received ADS-B messages to the specified server. Right click for settings. ... diff --git a/plugins/channelrx/demodadsb/adsbdemodworker.cpp b/plugins/channelrx/demodadsb/adsbdemodworker.cpp index 1f011fcdc..fe835c5a7 100644 --- a/plugins/channelrx/demodadsb/adsbdemodworker.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodworker.cpp @@ -146,7 +146,7 @@ void ADSBDemodWorker::errorOccurred(QAbstractSocket::SocketError socketError) void ADSBDemodWorker::recv() { - // Not expecting to receving anything from server + // Not expecting to receiving anything from server qDebug() << "ADSBDemodWorker::recv"; qDebug() << m_socket.readAll(); } diff --git a/plugins/channelrx/filesink/filesinksink.cpp b/plugins/channelrx/filesink/filesinksink.cpp index b1d2daf0a..712ded813 100644 --- a/plugins/channelrx/filesink/filesinksink.cpp +++ b/plugins/channelrx/filesink/filesinksink.cpp @@ -217,7 +217,7 @@ void FileSinkSink::applyChannelSettings( { int decim = channelSampleRate / sinkSampleRate; - for (int i = 0; i < 7; i++) // find log2 beween 0 and 6 + for (int i = 0; i < 7; i++) // find log2 between 0 and 6 { if ((decim & 1) == 1) { diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp index cba0896ed..d82a99385 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp @@ -190,7 +190,7 @@ void SigMFFileSinkSink::applyChannelSettings( { int decim = channelSampleRate / sinkSampleRate; - for (int i = 0; i < 7; i++) // find log2 beween 0 and 6 + for (int i = 0; i < 7; i++) // find log2 between 0 and 6 { if ((decim & 1) == 1) { diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.ui b/plugins/channeltx/modchirpchat/chirpchatmodgui.ui index 391385f18..f001176ed 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.ui +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.ui @@ -450,7 +450,7 @@ - Idle time beween packets (s) + Idle time between packets (s) 1 diff --git a/plugins/feature/gs232controller/gs232controllerworker.cpp b/plugins/feature/gs232controller/gs232controllerworker.cpp index 25ba64ac0..15a6ae453 100644 --- a/plugins/feature/gs232controller/gs232controllerworker.cpp +++ b/plugins/feature/gs232controller/gs232controllerworker.cpp @@ -200,7 +200,7 @@ void GS232ControllerWorker::readSerialData() { qDebug() << "GS232ControllerWorker::readSerialData - unexpected response " << response; if (m_msgQueueToFeature) - m_msgQueueToFeature->push(GS232Controller::MsgReportWorker::create(QString("Unexpected GS-232 serial reponse: %1").arg(response))); + m_msgQueueToFeature->push(GS232Controller::MsgReportWorker::create(QString("Unexpected GS-232 serial response: %1").arg(response))); } } } diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.ui b/plugins/samplesink/usrpoutput/usrpoutputgui.ui index 2ac70316e..3e0d3ba25 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.ui +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.ui @@ -668,7 +668,7 @@ - Red if underruns occured. Cleared when restarting acquisition + Red if underruns occurred. Cleared when restarting acquisition background:rgb(79,79,79); diff --git a/plugins/samplesource/usrpinput/usrpinputgui.ui b/plugins/samplesource/usrpinput/usrpinputgui.ui index 9ac893c4f..80be6c42a 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.ui +++ b/plugins/samplesource/usrpinput/usrpinputgui.ui @@ -734,7 +734,7 @@ - Red if overruns occured. Cleared when restarting acquisition + Red if overruns occurred. Cleared when restarting acquisition background:rgb(79,79,79); @@ -756,7 +756,7 @@ - Red if timeouts occured. Cleared when restarting acquisition + Red if timeouts occurred. Cleared when restarting acquisition background:rgb(79,79,79); diff --git a/qrtplib/rtperrors.cpp b/qrtplib/rtperrors.cpp index 1baa7c872..cef5c4df9 100644 --- a/qrtplib/rtperrors.cpp +++ b/qrtplib/rtperrors.cpp @@ -67,7 +67,7 @@ static RTPErrorInfo ErrorDescriptions[] = { ERR_RTP_PACKBUILD_INVALIDMAXPACKETSIZE, "The specified maximum packet size for the RTP packet builder is invalid" }, { ERR_RTP_PACKBUILD_NOTINIT, "The RTP packet builder is not initialized" }, { ERR_RTP_PACKET_BADPAYLOADTYPE, "Invalid payload type" }, -{ ERR_RTP_PACKET_DATAEXCEEDSMAXSIZE, "Tried to create an RTP packet which whould exceed the specified maximum packet size" }, +{ ERR_RTP_PACKET_DATAEXCEEDSMAXSIZE, "Tried to create an RTP packet which would exceed the specified maximum packet size" }, { ERR_RTP_PACKET_EXTERNALBUFFERNULL, "Illegal value (null) passed as external buffer for the RTP packet" }, { ERR_RTP_PACKET_ILLEGALBUFFERSIZE, "Illegal buffer size specified for the RTP packet" }, { ERR_RTP_PACKET_INVALIDPACKET, "Invalid RTP packet format" }, @@ -80,7 +80,7 @@ static RTPErrorInfo ErrorDescriptions[] = { ERR_RTP_RTCPCOMPPACKBUILDER_ALREADYBUILT, "This RTCP compound packet is already built" }, { ERR_RTP_RTCPCOMPPACKBUILDER_ALREADYGOTREPORT, "There's already a SR or RR in this RTCP compound packet" }, { ERR_RTP_RTCPCOMPPACKBUILDER_APPDATALENTOOBIG, "The specified APP data length for the RTCP compound packet is too big" }, -{ ERR_RTP_RTCPCOMPPACKBUILDER_BUFFERSIZETOOSMALL, "The specified buffer size for the RTCP comound packet is too small" }, +{ ERR_RTP_RTCPCOMPPACKBUILDER_BUFFERSIZETOOSMALL, "The specified buffer size for the RTCP compound packet is too small" }, { ERR_RTP_RTCPCOMPPACKBUILDER_ILLEGALAPPDATALENGTH, "The APP data length must be a multiple of four" }, { ERR_RTP_RTCPCOMPPACKBUILDER_ILLEGALSUBTYPE, "The APP packet subtype must be smaller than 32" }, { ERR_RTP_RTCPCOMPPACKBUILDER_INVALIDITEMTYPE, "Invalid SDES item type specified for the RTCP compound packet" }, @@ -94,7 +94,7 @@ static RTPErrorInfo ErrorDescriptions[] = { ERR_RTP_RTCPCOMPPACKBUILDER_TOTALITEMLENGTHTOOBIG, "The total data for the SDES PRIV item exceeds the maximum size (255 bytes) of an SDES item" }, { ERR_RTP_RTCPPACKETBUILDER_ALREADYINIT, "The RTCP packet builder is already initialized" }, { ERR_RTP_RTCPPACKETBUILDER_ILLEGALMAXPACKSIZE, "The specified maximum packet size for the RTCP packet builder is too small" }, -{ ERR_RTP_RTCPPACKETBUILDER_ILLEGALTIMESTAMPUNIT, "Speficied an illegal timestamp unit for the the RTCP packet builder" }, +{ ERR_RTP_RTCPPACKETBUILDER_ILLEGALTIMESTAMPUNIT, "Specified an illegal timestamp unit for the the RTCP packet builder" }, { ERR_RTP_RTCPPACKETBUILDER_NOTINIT, "The RTCP packet builder was not initialized" }, { ERR_RTP_RTCPPACKETBUILDER_PACKETFILLEDTOOSOON, "The RTCP compound packet filled sooner than expected" }, { ERR_RTP_SCHEDPARAMS_BADFRACTION, "Illegal sender bandwidth fraction specified" }, @@ -169,7 +169,7 @@ static RTPErrorInfo ErrorDescriptions[] = { ERR_RTP_FAKETRANS_ALREADYINIT, "The transmitter was already initialize" }, { ERR_RTP_FAKETRANS_CANTINITMUTEX, "Failed to initialize a mutex used by the transmitter" }, { ERR_RTP_FAKETRANS_COULDNTJOINMULTICASTGROUP, "Unable to join the specified multicast group" }, -{ ERR_RTP_FAKETRANS_DIFFERENTRECEIVEMODE, "The function called doens't match the current receive mode" }, +{ ERR_RTP_FAKETRANS_DIFFERENTRECEIVEMODE, "The function called doesn't match the current receive mode" }, { ERR_RTP_FAKETRANS_ILLEGALPARAMETERS, "Illegal parameters type passed to the transmitter" }, { ERR_RTP_FAKETRANS_INVALIDADDRESSTYPE, "Specified address type isn't compatible with this transmitter" }, { ERR_RTP_FAKETRANS_NOLOCALIPS, "Couldn't determine the local host name since the local IP list is empty" }, @@ -211,7 +211,7 @@ static RTPErrorInfo ErrorDescriptions[] = { ERR_RTP_SECURESESSION_CONTEXTALREADYINITIALIZED, "The initialization function was already called" }, { ERR_RTP_SECURESESSION_CANTINITIALIZE_SRTPCONTEXT, "Unable to initialize libsrtp context" }, { ERR_RTP_SECURESESSION_CANTINITMUTEX, "Unable to initialize a mutex" }, -{ ERR_RTP_SECURESESSION_CONTEXTNOTINITIALIZED, "The libsrtp context initilization function must be called before it can be used" }, +{ ERR_RTP_SECURESESSION_CONTEXTNOTINITIALIZED, "The libsrtp context initialization function must be called before it can be used" }, { ERR_RTP_SECURESESSION_NOTENOUGHDATATOENCRYPT, "There's not enough RTP or RTCP data to encrypt" }, { ERR_RTP_SECURESESSION_CANTENCRYPTRTPDATA, "Unable to encrypt RTP data" }, { ERR_RTP_SECURESESSION_CANTENCRYPTRTCPDATA, "Unable to encrypt RTCP data" }, diff --git a/sdrbase/dsp/filerecord.cpp b/sdrbase/dsp/filerecord.cpp index 8ecd1291b..2ae306858 100644 --- a/sdrbase/dsp/filerecord.cpp +++ b/sdrbase/dsp/filerecord.cpp @@ -136,7 +136,7 @@ bool FileRecord::stopRecording() m_recordStart = false; if (m_sampleFile.bad()) { - qWarning() << "FileRecord::stopRecording: an error occured while writing to " << m_curentFileName; + qWarning() << "FileRecord::stopRecording: an error occurred while writing to " << m_curentFileName; return false; } } diff --git a/sdrbase/dsp/sigmffilerecord.cpp b/sdrbase/dsp/sigmffilerecord.cpp index 3630cacb6..a98407fa5 100644 --- a/sdrbase/dsp/sigmffilerecord.cpp +++ b/sdrbase/dsp/sigmffilerecord.cpp @@ -153,12 +153,12 @@ bool SigMFFileRecord::stopRecording() m_recordOn = false; if (m_sampleFile.bad()) { - qWarning() << "SigMFFileRecord::stopRecording: an error occured while writing to " << m_sampleFileName; + qWarning() << "SigMFFileRecord::stopRecording: an error occurred while writing to " << m_sampleFileName; return false; } if (m_metaFile.bad()) { - qWarning() << "SigMFFileRecord::stopRecording: an error occured while writing to " << m_metaFileName; + qWarning() << "SigMFFileRecord::stopRecording: an error occurred while writing to " << m_metaFileName; return false; } } diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 3bc369076..925e4721d 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -310,7 +310,7 @@ void WebAPIRequestMapper::instanceConfigService(qtwebapp::HttpRequest& request, } else { - normalResponse.setMessage(new QString("Error occured while updating configuration")); + normalResponse.setMessage(new QString("Error occurred while updating configuration")); response.write(errorResponse.asJson().toUtf8()); } }