From b7e05ee6eed248617f79bf483d3629cd3b354969 Mon Sep 17 00:00:00 2001
From: Brad Parker <bparker@reach3d.net>
Date: Sun, 2 Feb 2014 18:53:26 -0500
Subject: [PATCH] fix typo and use pre-compiled regex

---
 interface.cpp | 2 +-
 wireless.cpp  | 7 +++----
 wireless.h    | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface.cpp b/interface.cpp
index 98ed5c3..1d7a843 100644
--- a/interface.cpp
+++ b/interface.cpp
@@ -535,7 +535,7 @@ QStringList Interface::list() {
   nl_socket_free(sock);
 
   // workaround for libnl issue: https://github.com/tgraf/libnl/issues/49
-  // find any interfaces libnl doesn't know about (e.g. USB wireless adapters after they're been unplugged and replugged)
+  // find any interfaces libnl doesn't know about (e.g. USB wireless adapters after they've been unplugged and replugged)
   QDir dir("/sys/class/net");
   QStringList interfaces = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 
diff --git a/wireless.cpp b/wireless.cpp
index ce60b36..4d90ae9 100644
--- a/wireless.cpp
+++ b/wireless.cpp
@@ -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) {
diff --git a/wireless.h b/wireless.h
index 2f4f4bc..6094364 100644
--- a/wireless.h
+++ b/wireless.h
@@ -97,6 +97,7 @@ private:
   QString m_interface;
   QString m_interfaceType;
   QList<BandInfo> m_bands;
+  QRegularExpression m_noDigitRegex;
   bool m_isValid;
   bool m_isNL80211;
   nl80211_iftype m_iftype;