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/recentcontactsview.cpp

diff --git a/src/recentcontactsview.cpp b/src/recentcontactsview.cpp
index 2a044f1..573ef4b 100644
--- a/src/recentcontactsview.cpp
+++ b/src/recentcontactsview.cpp
@@ -67,11 +67,11 @@
 update_call_model_selection(GtkTreeSelection *selection, G_GNUC_UNUSED gpointer user_data)
 {
     auto current_proxy = get_index_from_selection(selection);
-    auto current = RecentModel::instance()->peopleProxy()->mapToSource(current_proxy);
-    if (auto call_to_select = RecentModel::instance()->getActiveCall(current)) {
-        CallModel::instance()->selectCall(call_to_select);
+    auto current = RecentModel::instance().peopleProxy()->mapToSource(current_proxy);
+    if (auto call_to_select = RecentModel::instance().getActiveCall(current)) {
+        CallModel::instance().selectCall(call_to_select);
     } else {
-        CallModel::instance()->selectionModel()->clearCurrentIndex();
+        CallModel::instance().selectionModel()->clearCurrentIndex();
     }
 }
 
@@ -236,7 +236,7 @@
             {
                 // check if there are any children (calls); we need to convert to source model in
                 // case there is only one
-                auto idx_source = RecentModel::instance()->peopleProxy()->mapToSource(idx);
+                auto idx_source = RecentModel::instance().peopleProxy()->mapToSource(idx);
                 auto duration = idx.data(static_cast<int>(Ring::Role::Length));
                 if (idx_source.isValid()
                     && (idx_source.model()->rowCount(idx_source) == 1)
@@ -509,7 +509,7 @@
     gtk_tree_view_set_enable_search(GTK_TREE_VIEW(self), FALSE);
 
     GtkQSortFilterTreeModel *recent_model = gtk_q_sort_filter_tree_model_new(
-        RecentModel::instance()->peopleProxy(),
+        RecentModel::instance().peopleProxy(),
         1,
         Qt::DisplayRole, G_TYPE_STRING);
 
@@ -572,21 +572,21 @@
 
     /* try to select the same call as the call model */
     priv->selection_updated = QObject::connect(
-        CallModel::instance()->selectionModel(),
+        CallModel::instance().selectionModel(),
         &QItemSelectionModel::currentChanged,
         [self, recent_model](const QModelIndex current, G_GNUC_UNUSED const QModelIndex & previous) {
             GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
 
             /* select the current */
-            auto call = CallModel::instance()->getCall(current);
-            auto recent_idx = RecentModel::instance()->getIndex(call);
+            auto call = CallModel::instance().getCall(current);
+            auto recent_idx = RecentModel::instance().getIndex(call);
             if (recent_idx.isValid()) {
                 QModelIndex proxy_selection; // the index to select in the peopleProxy
-                if (RecentModel::instance()->rowCount(recent_idx.parent()) > 1) {
-                    proxy_selection = RecentModel::instance()->peopleProxy()->mapFromSource(recent_idx);
+                if (RecentModel::instance().rowCount(recent_idx.parent()) > 1) {
+                    proxy_selection = RecentModel::instance().peopleProxy()->mapFromSource(recent_idx);
                 } else {
                     // if single call, select the parent
-                    proxy_selection = RecentModel::instance()->peopleProxy()->mapFromSource(recent_idx.parent());
+                    proxy_selection = RecentModel::instance().peopleProxy()->mapFromSource(recent_idx.parent());
                 }
 
                 GtkTreeIter new_iter;