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/AppDelegate.mm

diff --git a/src/AppDelegate.mm b/src/AppDelegate.mm
index cfc32c3..a20c063 100644
--- a/src/AppDelegate.mm
+++ b/src/AppDelegate.mm
@@ -63,7 +63,7 @@
 
 - (void) connect
 {
-    QObject::connect(CallModel::instance(),
+    QObject::connect(&CallModel::instance(),
                      &CallModel::incomingCall,
                      [=](Call* call) {
                          BOOL shouldComeToForeground = [[NSUserDefaults standardUserDefaults] boolForKey:Preferences::WindowBehaviour];
@@ -120,9 +120,9 @@
 - (BOOL) checkForRingAccount
 {
     BOOL foundRingAcc = NO;
-    for (int i = 0 ; i < AccountModel::instance()->rowCount() ; ++i) {
-        QModelIndex idx = AccountModel::instance()->index(i);
-        Account* acc = AccountModel::instance()->getAccountByModelIndex(idx);
+    for (int i = 0 ; i < AccountModel::instance().rowCount() ; ++i) {
+        QModelIndex idx = AccountModel::instance().index(i);
+        Account* acc = AccountModel::instance().getAccountByModelIndex(idx);
         if(acc->protocol() == Account::Protocol::RING) {
             if (acc->displayName().isEmpty())
                 acc->setDisplayName(acc->alias());
@@ -160,7 +160,7 @@
     BOOL valid = [[ringID stringByTrimmingCharactersInSet:hexSet] isEqualToString:@""];
 
     if(valid && ringID.length == 40) {
-        Call* c = CallModel::instance()->dialingCall();
+        Call* c = CallModel::instance().dialingCall();
         c->setDialNumber(QString::fromNSString([NSString stringWithFormat:@"ring:%@",ringID]));
         c << Call::Action::ACCEPT;
     } else {
@@ -185,13 +185,13 @@
 
 - (void)handleQuitEvent:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent
 {
-    delete CallModel::instance()->QObject::parent();
+    delete CallModel::instance().QObject::parent();
     [[NSApplication sharedApplication] terminate:self];
 }
 
 -(void)applicationWillTerminate:(NSNotification *)notification
 {
-    delete CallModel::instance()->QObject::parent();
+    delete CallModel::instance().QObject::parent();
     [[NSApplication sharedApplication] terminate:self];
 }