Changeset 56:e63ceb8090cd in SMSSender for lib/libdatatypes/src/snumber.cpp

Timestamp:

Feb 2, 2010 9:53:45 AM (13 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

3.0

Convert:

svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@55

Message:

• Renamed accountmodel to accounttreemodel
• Implemented creation of new contact if number is unknown in vcmain
• Areacode is now in its own field in vceditcontact
• Accountlist in vcmain is now controlled by a model (Needs filtering of only active ones)
• Settingspath is dynamic and user-based now

File:

• lib/libdatatypes/src/snumber.cpp (modified) (7 diffs)

lib/libdatatypes/src/snumber.cpp

@@ -25 +25 @@
  *  aa      area code (2-digits)
  *  aaa     area code (3-digits)
- *
  *  AAA     area code trim zeros
  *
@@ -34 +33 @@
 const QString SNumber::IsoFormat      = "'+'cc' 'aaa' 'u"; // +41 079 1234567
 const QString SNumber::IsoFormatShort = "'+'CC' 'AAA' 'u"; // +41 79 1234567
+const QString SNumber::GuessFormat    = "%%guess%%";
 
 SNumber::SNumber() {
     clear();
 }
-SNumber::SNumber(const QString& numberStr, const QString& format /* = SNumber::IsoFormat */) {
+SNumber::SNumber(const QString& numberStr, const QString& format) {
     setNumber(numberStr, format);
 }
@@ -72 +72 @@
 
 /* CC & AAA are not applicable here! */
-bool SNumber::setNumber(const QString& numberStr, const QString& format /* = SNumber::IsoFormat */){
+bool SNumber::setNumber(const QString& numberStr, const QString& format){
+    if (format == SNumber::GuessFormat) {
+        QStringList formats;
+        formats.append("'+'cc' 'aaa' 'u");// +41 079 1234567
+        formats.append("'+'cc' 'aa' 'u"); // +41 79 1234567
+        formats.append("'+'cc' 'a' 'u");  // +41 7 1234567
+        formats.append("'+'c' 'aaa' 'u"); // +1 079 1234567
+        formats.append("'+'c' 'aa' 'u");  // +1 79 1234567
+        formats.append("'+'c' 'a' 'u");   // +1 7 1234567
+        formats.append("'+'cc' 'aaau");   // +41 0791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'cc' 'aau");    // +41 791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'cc' 'au");     // +41 71234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'c' 'aaau");    // +1 0791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'c' 'aau");     // +1 791234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+        formats.append("'+'c' 'au");      // +1 71234567 (Attention! A part of the usernumber could be interpreted as the areacode)
+
+        foreach(QString format_, formats) {
+            if (setNumber(numberStr, format_)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     clear();
 
-    qDebug() << numberStr;
-    qDebug() << format;
+    qDebug() << "Checking " + format + " on " + numberStr;
 
     const QLatin1Char quote('\'');
@@ -85 +107 @@
     int  j = 0;
     for (int i = 0; i < format.count(); i++) {
+        if (numberStr.count() <= j) {
+            clear();
+            break;
+        }
+
         if (format.at(i) == quote) {
             inQuote = !inQuote;
@@ -129 +156 @@
             j++;
         } else {
+            if (format.mid(i, 2) == "CC") {
+                qWarning() << "CC not supported here!";
+            } else if (format.mid(i, 3) == "AAA") {
+                qWarning() << "AAA not supported here!";
+            }
             clear();
             break;
@@ -168 +200 @@
 }
 
-QString SNumber::toString(const QString& format /* = SNumber::IsoFormat */) const {
+QString SNumber::toString(const QString& format) const {
     if (!isValid()) {
         return "";
@@ -219 +251 @@
 }
 
-void SNumber::fromString(const QString& string, const QString& format /* = SNumber::IsoFormat */) {
-    setNumber(string, format);
+bool SNumber::readFromString(const QString& string, const QString& format) {
+    return setNumber(string, format);
+}
+SNumber SNumber::fromString(const QString& string, const QString& format) {
+    return SNumber(string, format);
 }