Some fixes to connection manager.

[jenirok] / src / common / dastelefonbuch.cpp

diff --git a/src/common/dastelefonbuch.cpp b/src/common/dastelefonbuch.cpp
index da890f8..7cb36ad 100644 (file)
--- a/src/common/dastelefonbuch.cpp
+++ b/src/common/dastelefonbuch.cpp
@@ -113,10 +113,10 @@ void DasTelefonbuch::addNumbers(SearchData* searchData,
     }
 
     int pos = 0;
-    QRegExp rx("<table.*class=\"bg-01 entry(.*)</table>");
-    QRegExp name("<div class=\"long hide\">(.*)</a>");
-    QRegExp number("<td class=\"col4\">(.*)</td>");
-    QRegExp address("<td class=\"col2\">(.*)</td>.*<td class=\"col3\">(.*)</td>");
+    static QRegExp rx("<table.*class=\"bg-01 entry(.*)</table>");
+    static QRegExp name("<div class=\"long hide\">(.*)</a>");
+    static QRegExp number("<td class=\"col4\">(.*)</td>");
+    static QRegExp address("<td class=\"col2\">(.*)</td>.*<td class=\"col3\">(.*)</td>");
 
     rx.setMinimal(true);
     name.setMinimal(true);
@@ -197,9 +197,9 @@ void DasTelefonbuch::addOnlyNumber(SearchData* searchData,
                               QString const& data,
                               int index)
 {
-    QRegExp name("<div class=\"long hide\">(.*) (.*)</a>");
-    QRegExp number("<td class=\"col4\">(.*)</td>");
-    QRegExp address("<td class=\"col2\">(.*)</td>.*<td class=\"col3\">(.*)</td>");
+    static QRegExp name("<div class=\"long hide\">(.*) (.*)</a>");
+    static QRegExp number("<td class=\"col4\">(.*)</td>");
+    static QRegExp address("<td class=\"col2\">(.*)</td>.*<td class=\"col3\">(.*)</td>");
     name.setMinimal(true);
     number.setMinimal(true);
     address.setMinimal(true);
@@ -254,6 +254,7 @@ bool DasTelefonbuch::formatResult(QString& name, QString& number,
     city = htmlEntityDecode(city);
     result.street = street.trimmed();
     result.city = city.trimmed();
+    result.country = "Germany";
 
     if(!result.name.isEmpty() && (!getFindNumber() || !result.number.isEmpty()))
     {