commit d3aa3ade79ff382c21e6458661e09afc9e623a8a
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Oct 23 14:28:41 2015 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Oct 27 10:16:00 2015 -0400
tree 7fb30820a92633bf486fae83f67094e86412cfcf
parent c8d9f0baa97776df4ed88d76f0eea605991a90e0

lrc: adapt to API changes

Tuleap: #44
Change-Id: I0b005b7019d204e049a280819aac5f29558cafea

src/HistoryVC.mm

diff --git a/src/HistoryVC.mm b/src/HistoryVC.mm
index 028f398..f111ec0 100644
--- a/src/HistoryVC.mm
+++ b/src/HistoryVC.mm
@@ -52,8 +52,8 @@
 - (void)awakeFromNib
 {
     NSLog(@"INIT HVC");
-    historyProxyModel = new QSortFilterProxyModel(CategorizedHistoryModel::instance());
-    historyProxyModel->setSourceModel(CategorizedHistoryModel::instance());
+    historyProxyModel = new QSortFilterProxyModel(&CategorizedHistoryModel::instance());
+    historyProxyModel->setSourceModel(&CategorizedHistoryModel::instance());
     historyProxyModel->setSortRole(static_cast<int>(Call::Role::Date));
     historyProxyModel->sort(0,Qt::DescendingOrder);
     treeController = [[QNSTreeController alloc] initWithQModel:historyProxyModel];
@@ -69,7 +69,7 @@
     [historyView setContextMenuDelegate:self];
     [historyView setShortcutsDelegate:self];
 
-    QObject::connect(CallModel::instance(),
+    QObject::connect(&CallModel::instance(),
                      &CategorizedHistoryModel::dataChanged,
                      [=](const QModelIndex &topLeft, const QModelIndex &bottomRight) {
                          [historyView reloadDataForRowIndexes:
@@ -98,7 +98,7 @@
         QVariant var = historyProxyModel->data(qIdx, (int)Call::Role::ContactMethod);
         ContactMethod* m = qvariant_cast<ContactMethod*>(var);
         if(m){
-            Call* c = CallModel::instance()->dialingCall();
+            Call* c = CallModel::instance().dialingCall();
             c->setPeerContactMethod(m);
             c << Call::Action::ACCEPT;
         }