[libcontacts] Use generic version of normalization function

sailfishos · Aug 20, 2013 · c6c4825 · c6c4825
1 parent c12c0a6
commit c6c4825
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 81 deletions.
diff --git a/rpm/libcontacts-qt5.spec b/rpm/libcontacts-qt5.spec
@@ -12,7 +12,7 @@ BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Contacts)
 BuildRequires:  pkgconfig(Qt5Versit)
 BuildRequires:  pkgconfig(mlite5)
-BuildRequires:  pkgconfig(qtcontacts-sqlite-qt5-extensions) >= 0.1.1
+BuildRequires:  pkgconfig(qtcontacts-sqlite-qt5-extensions) >= 0.1.8
 
 %description
 %{summary}.

diff --git a/rpm/libcontacts.spec b/rpm/libcontacts.spec
@@ -11,7 +11,7 @@ BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(QtContacts)
 BuildRequires:  pkgconfig(QtVersit)
 BuildRequires:  pkgconfig(mlite)
-BuildRequires:  pkgconfig(qtcontacts-sqlite-extensions) >= 0.1.1
+BuildRequires:  pkgconfig(qtcontacts-sqlite-extensions) >= 0.1.8
 
 %description
 %{summary}.

diff --git a/src/normalization.cpp b/src/normalization.cpp
diff --git a/src/normalization_p.h b/src/normalization_p.h
diff --git a/src/seasidecache.cpp b/src/seasidecache.cpp
@@ -32,8 +32,8 @@
 #include "seasidecache.h"
 
 #include "synchronizelists.h"
-#include "normalization_p.h"
 
+#include "qtcontacts-extensions_impl.h"
 #include "qcontactstatusflags_impl.h"
 
 #include <QCoreApplication>
@@ -700,7 +700,7 @@ void SeasideCache::refreshContact(CacheItem *cacheItem)
 
 SeasideCache::CacheItem *SeasideCache::itemByPhoneNumber(const QString &number, bool requireComplete)
 {
-    QString normalizedNumber = Normalization::normalizePhoneNumber(number);
+    QString normalizedNumber = normalizePhoneNumber(number);
     QHash<QString, quint32>::const_iterator it = instancePtr->m_phoneNumberIds.find(normalizedNumber);
     if (it != instancePtr->m_phoneNumberIds.end())
         return itemById(*it, requireComplete);
@@ -975,6 +975,14 @@ QString SeasideCache::generateDisplayLabelFromNonNameDetails(const QContact &con
     return QString();
 }
 
+QString SeasideCache::normalizePhoneNumber(const QString &input)
+{
+    // TODO: use a configuration variable to make this configurable
+    static const int maxCharacters = 7;
+
+    return QtContactsSqliteExtensions::minimizePhoneNumber(input, maxCharacters);
+}
+
 static QContactFilter filterForMergeCandidates(const QContact &contact)
 {
     // Find any contacts that we might merge with the supplied contact
@@ -1426,12 +1434,12 @@ bool SeasideCache::updateContactIndexing(const QContact &oldContact, const QCont
         // Addresses which are no longer in the contact should be de-indexed
         QSet<QString> oldPhoneNumbers;
         foreach (const QContactPhoneNumber &phoneNumber, oldContact.details<QContactPhoneNumber>()) {
-            oldPhoneNumbers.insert(Normalization::normalizePhoneNumber(phoneNumber.number()));
+            oldPhoneNumbers.insert(normalizePhoneNumber(phoneNumber.number()));
         }
 
         // Update our address indexes for any address details in this contact
         foreach (const QContactPhoneNumber &phoneNumber, contact.details<QContactPhoneNumber>()) {
-            QString normalizedNumber = Normalization::normalizePhoneNumber(phoneNumber.number());
+            QString normalizedNumber = normalizePhoneNumber(phoneNumber.number());
             m_phoneNumberIds[normalizedNumber] = iid;
             modified |= !oldPhoneNumbers.remove(normalizedNumber);
         }

diff --git a/src/seasidecache.h b/src/seasidecache.h
@@ -336,6 +336,8 @@ class CONTACTCACHE_EXPORT SeasideCache : public QObject
     static QString generateDisplayLabel(const QContact &contact, DisplayLabelOrder order = FirstNameFirst);
     static QString generateDisplayLabelFromNonNameDetails(const QContact &contact);
 
+    static QString normalizePhoneNumber(const QString &input);
+
     bool event(QEvent *event);
 
     // For synchronizeLists()

diff --git a/src/src.pro b/src/src.pro
@@ -10,7 +10,7 @@ target.path = $$PREFIX/lib
 INSTALLS += target
 
 # set version for generated pkgconfig files
-VERSION=0.0.13
+VERSION=0.0.14
 QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include/$${PACKAGENAME}
 QMAKE_PKGCONFIG_LIBDIR = $$PREFIX/lib
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
@@ -36,11 +36,9 @@ equals(QT_MAJOR_VERSION, 5) {
 DEFINES += CONTACTCACHE_BUILD
 
 SOURCES += \
-    $$PWD/normalization.cpp \
     $$PWD/seasidecache.cpp
 
 HEADERS += \
-    $$PWD/normalization_p.h \
     $$PWD/contactcacheexport.h \
     $$PWD/seasidecache.h \
     $$PWD/synchronizelists.h \