commit 5d1514b8c2489329765672918dd66d361a2772bb
author Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Thu Oct 22 15:55:31 2015 -0400
committer Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Tue Oct 27 10:11:04 2015 -0400
tree 8c3a42e448932feee55d8fdca78d2d9834051092
parent cebc592f0786154c15c6f8cd0475e71c4a2bbdec

adapt code to LRC API change

LRC API (Singleton's implementation) has changed.
This patch adapats the code to these changes.
Moslty changes deferencement '->' for direct access '.'

Tuleap: #44
Change-Id: Ic87b1306a1239fdb8a6af0affe1ecbc1d16f609c

src/editcontactview.cpp

diff --git a/src/editcontactview.cpp b/src/editcontactview.cpp
index e581b16..fa6a7cc 100644
--- a/src/editcontactview.cpp
+++ b/src/editcontactview.cpp
@@ -92,7 +92,7 @@
     /* get the selected number category */
     const auto& idx = gtk_combo_box_get_index(GTK_COMBO_BOX(priv->combobox_detail));
     if (idx.isValid()) {
-        auto category = NumberCategoryModel::instance()->getCategory(idx.data().toString());
+        auto category = NumberCategoryModel::instance().getCategory(idx.data().toString());
         priv->cm->setCategory(category);
     }
 
@@ -114,7 +114,7 @@
         numbers << priv->cm;
         priv->person->setContactMethods(numbers);
 
-        PersonModel::instance()->addNewPerson(priv->person, collection);
+        PersonModel::instance().addNewPerson(priv->person, collection);
     } else {
         auto numbers = priv->person->phoneNumbers();
         numbers << priv->cm;
@@ -161,7 +161,7 @@
                                    renderer, "text", 0, NULL);
 
     /* get all the available contact backends (addressbooks) */
-    const auto& collections = PersonModel::instance()->enabledCollections();
+    const auto& collections = PersonModel::instance().enabledCollections();
     for (int i = 0; i < collections.size(); ++i) {
         GtkTreeIter iter;
         gtk_list_store_append(addressbook_model, &iter);
@@ -190,10 +190,10 @@
 
     /* model for the available details to choose from */
     gtk_combo_box_set_qmodel(GTK_COMBO_BOX(priv->combobox_detail),
-                             (QAbstractItemModel *)NumberCategoryModel::instance(), NULL);
+                             (QAbstractItemModel *)&NumberCategoryModel::instance(), NULL);
 
     /* set "home" as the default number category */
-    const auto& idx = NumberCategoryModel::instance()->nameToIndex(C_("Phone number category", "home"));
+    const auto& idx = NumberCategoryModel::instance().nameToIndex(C_("Phone number category", "home"));
     if (idx.isValid())
         gtk_combo_box_set_active_index(GTK_COMBO_BOX(priv->combobox_detail), idx);