|
|
@ -103,6 +103,7 @@ QObject(0), |
|
|
|
m_interface(interface), |
|
|
|
m_interfaceType(), |
|
|
|
m_bands(), |
|
|
|
m_noDigitRegex("[^\\d]"), |
|
|
|
m_isValid(false), |
|
|
|
m_isNL80211(false), |
|
|
|
m_iftype(NL80211_IFTYPE_UNSPECIFIED) |
|
|
@ -405,8 +406,7 @@ int Wireless::ChanToFreq(int channel) { |
|
|
|
*/ |
|
|
|
QString Wireless::ChanToFreq(QString channel, QString outputFormat) { |
|
|
|
QString freq; |
|
|
|
QRegularExpression re("[^\\d]"); |
|
|
|
channel = channel.replace(re, ""); |
|
|
|
channel = channel.replace(m_noDigitRegex, ""); |
|
|
|
|
|
|
|
if(outputFormat.isEmpty()) { |
|
|
|
bool ok = false; |
|
|
@ -442,8 +442,7 @@ int Wireless::FreqToChan(int frequency) { |
|
|
|
*/ |
|
|
|
QString Wireless::FreqToChan(QString frequency, QString outputFormat) { |
|
|
|
QString chan; |
|
|
|
QRegularExpression re("[^\\d]"); |
|
|
|
frequency = frequency.replace(re, ""); |
|
|
|
frequency = frequency.replace(m_noDigitRegex, ""); |
|
|
|
|
|
|
|
if(frequency.length() < 4) { |
|
|
|
for(int i = frequency.length() + 1; i <= 4; ++i) { |
|
|
|