commit 4baba4ca0cc7208ba5b5c7d31bf34fceefe26e9c
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Feb 11 13:00:57 2016 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Mar 10 14:33:32 2016 -0500
tree 804e66f896d7bbabf2c8dc93d8c04dad91db8afa
parent 6517be882ba38678568c2b602b9ed334967bdc8e

osx: fix client compatibility

Xcode does not warn when using unavailable APIs on older SDKs.
After recompiling against the 10.8 SDK, errors appeared across the
client.

- NSButton.highlight state has been added in OSX 10.10
- window.beginSheet has been added in OSX 10.9
- window.keyWindow has been added in OSX 10.10
- NSViewController.viewDidLoad has been added in OSX 10.10
- NSString.containsString has been added in OSX 10.10

Change-Id: I9c4e271f49711570859d85d43608cf8edf294e01
Tuleap: #343

src/CurrentCallVC.mm

diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index b3daccc..2d8cbb3 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -46,6 +46,7 @@
 #import "PersonLinkerVC.h"
 #import "ChatVC.h"
 #import "BrokerVC.h"
+#import "views/IconButton.h"
 
 @interface RendererConnectionsHolder : NSObject
 
@@ -73,17 +74,17 @@
 
 // Call Controls
 @property (unsafe_unretained) IBOutlet NSView* controlsPanel;
-@property QHash<int, NSButton*> actionHash;
-@property (unsafe_unretained) IBOutlet NSButton* holdOnOffButton;
-@property (unsafe_unretained) IBOutlet NSButton* hangUpButton;
-@property (unsafe_unretained) IBOutlet NSButton* recordOnOffButton;
-@property (unsafe_unretained) IBOutlet NSButton* pickUpButton;
-@property (unsafe_unretained) IBOutlet NSButton* muteAudioButton;
-@property (unsafe_unretained) IBOutlet NSButton* muteVideoButton;
-@property (unsafe_unretained) IBOutlet NSButton* addContactButton;
-@property (unsafe_unretained) IBOutlet NSButton* transferButton;
-@property (unsafe_unretained) IBOutlet NSButton* addParticipantButton;
-@property (unsafe_unretained) IBOutlet NSButton* chatButton;
+@property QHash<int, IconButton*> actionHash;
+@property (unsafe_unretained) IBOutlet IconButton* holdOnOffButton;
+@property (unsafe_unretained) IBOutlet IconButton* hangUpButton;
+@property (unsafe_unretained) IBOutlet IconButton* recordOnOffButton;
+@property (unsafe_unretained) IBOutlet IconButton* pickUpButton;
+@property (unsafe_unretained) IBOutlet IconButton* muteAudioButton;
+@property (unsafe_unretained) IBOutlet IconButton* muteVideoButton;
+@property (unsafe_unretained) IBOutlet IconButton* addContactButton;
+@property (unsafe_unretained) IBOutlet IconButton* transferButton;
+@property (unsafe_unretained) IBOutlet IconButton* addParticipantButton;
+@property (unsafe_unretained) IBOutlet IconButton* chatButton;
 
 
 // Join call panel
@@ -136,10 +137,9 @@
 {
     const QModelIndex& idx = CallModel::instance().userActionModel()->index(row,0);
     UserActionModel::Action action = qvariant_cast<UserActionModel::Action>(idx.data(UserActionModel::Role::ACTION));
-    NSButton* a = actionHash[(int) action];
-    if (a) {
+    if (auto a = actionHash[(int) action]) {
         [a setHidden:!(idx.flags() & Qt::ItemIsEnabled)];
-        [a setHighlighted:(idx.data(Qt::CheckStateRole) == Qt::Checked) ? YES : NO];
+        [a setPressed:(idx.data(Qt::CheckStateRole) == Qt::Checked) ? YES : NO];
     }
 }
 
@@ -543,7 +543,7 @@
     [self.addParticipantButton setHidden:YES];
     [self.transferButton setHidden:YES];
 
-    [self.chatButton setState:NSOffState];
+    [self.chatButton setPressed:NO];
     [self.mergeCallsButton setState:NSOffState];
     [self collapseRightView];