From 867ee9a1590f340ef57cebc15ab5ddb8a08f2a53 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Mon, 2 Oct 2017 15:10:29 +0200
Subject: Fix Code According to New clang warning (-Wobjc-messaging-id)

Test-Information:

Builds and test pass on macOS 10.13 with clang-trunk.

Change-Id: I7a515a003602a983681f85374a8a77dc953f533d

diff --git a/SwifTools/MacOSXChecker.mm b/SwifTools/MacOSXChecker.mm
index aefe3e7..afaa87c 100644
--- a/SwifTools/MacOSXChecker.mm
+++ b/SwifTools/MacOSXChecker.mm
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,6 +19,8 @@
 
 #include <AppKit/AppKit.h>
 
+#include <SwifTools/Cocoa/CocoaUtil.h>
+
 namespace Swift {
 
 MacOSXChecker::MacOSXChecker() {
@@ -54,7 +56,7 @@ void MacOSXChecker::getSuggestions(const std::string& word, std::vector<std::str
     NSString* wordString = [[NSString alloc] initWithUTF8String: word.c_str()];
     NSArray* suggestions = [spellChecker guessesForWordRange:NSMakeRange(0, [wordString length]) inString:wordString language:nil inSpellDocumentWithTag:0];
     for(unsigned int i = 0; i < [suggestions count]; ++i) {
-        list.push_back(std::string([[suggestions objectAtIndex:i] UTF8String]));
+        list.push_back(ns2StdString([suggestions objectAtIndex:i]));
     }
     [wordString release];
 }
diff --git a/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm b/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm
index db0af89..fffb3ed 100644
--- a/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm
+++ b/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -93,13 +93,14 @@ void SecureTransportCertificate::parse() {
         NSDictionary* subjectAltNamesDict = certDict[@"2.5.29.17"][@"value"];
 
         for (NSDictionary* entry in subjectAltNamesDict) {
-            if ([entry[@"label"] isEqualToString:static_cast<NSString * _Nonnull>([NSString stringWithUTF8String:ID_ON_XMPPADDR_OID])]) {
+            NSString* label = entry[@"label"];
+            if ([label isEqualToString:static_cast<NSString * _Nonnull>([NSString stringWithUTF8String:ID_ON_XMPPADDR_OID])]) {
                 xmppAddresses_.push_back(ns2StdString(entry[@"value"]));
             }
-            else if ([entry[@"label"] isEqualToString:static_cast<NSString * _Nonnull>([NSString stringWithUTF8String:ID_ON_DNSSRV_OID])]) {
+            else if ([label isEqualToString:static_cast<NSString * _Nonnull>([NSString stringWithUTF8String:ID_ON_DNSSRV_OID])]) {
                 srvNames_.push_back(ns2StdString(entry[@"value"]));
             }
-            else if ([entry[@"label"] isEqualToString:@"DNS Name"]) {
+            else if ([label isEqualToString:@"DNS Name"]) {
                 dnsNames_.push_back(ns2StdString(entry[@"value"]));
             }
         }
-- 
cgit v0.10.2-6-g49f6