From 0b073b96e0acbcbd9545f723d366384733ca1f0a Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Fri, 23 Oct 2015 19:14:05 +0200
Subject: [PATCH] Partially converted to modern Objective-C

Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
---
 MacPass/MPContextToolbarButton.m | 10 +++++++++-
 MacPass/MPToolbarButton.m        |  3 +++
 MacPass/MPToolbarItem.m          |  2 +-
 MacPass/NSError+Messages.h       |  2 +-
 MacPass/NSError+Messages.m       |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/MacPass/MPContextToolbarButton.m b/MacPass/MPContextToolbarButton.m
index b728fb55..00cc4467 100644
--- a/MacPass/MPContextToolbarButton.m
+++ b/MacPass/MPContextToolbarButton.m
@@ -106,10 +106,18 @@
     default:
       break;
   }
-  self.cell.controlSize = controlSize;
+  if([self.superclass instancesRespondToSelector:@selector(setControlSize:)]) {
+    super.controlSize = controlSize;
+  }
+  else {
+    self.cell.controlSize = controlSize;
+  }
 }
 
 - (NSControlSize)controlSize {
+  if([self.superclass instancesRespondToSelector:@selector(controlSize)]) {
+    return super.controlSize;
+  }
   return self.cell.controlSize;
 }
 
diff --git a/MacPass/MPToolbarButton.m b/MacPass/MPToolbarButton.m
index e473e9c5..70955aca 100644
--- a/MacPass/MPToolbarButton.m
+++ b/MacPass/MPToolbarButton.m
@@ -64,6 +64,9 @@
 }
 
 - (NSControlSize)controlSize {
+  if([self.superclass instancesRespondToSelector:@selector(controlSize)]) {
+    return super.controlSize;
+  }
   return self.cell.controlSize;
 }
 
diff --git a/MacPass/MPToolbarItem.m b/MacPass/MPToolbarItem.m
index 9962cfa6..c1baf60a 100644
--- a/MacPass/MPToolbarItem.m
+++ b/MacPass/MPToolbarItem.m
@@ -33,7 +33,7 @@
     if(validateTarget) {
       isValid &= [validateTarget validateToolbarItem:self];
     }
-    [self setEnabled:isValid];
+    self.enabled = isValid;
   }
 }
 @end
diff --git a/MacPass/NSError+Messages.h b/MacPass/NSError+Messages.h
index 241e0485..21ed9743 100644
--- a/MacPass/NSError+Messages.h
+++ b/MacPass/NSError+Messages.h
@@ -14,6 +14,6 @@ FOUNDATION_EXPORT NSString *const MPErrorDomain;
 
 + (NSError *)errorWithCode:(NSInteger)code description:(NSString *)description;
 
-- (NSString *)descriptionForErrorCode;
+@property (nonatomic, readonly, copy) NSString *descriptionForErrorCode;
 
 @end
diff --git a/MacPass/NSError+Messages.m b/MacPass/NSError+Messages.m
index 5ef6e63c..b7aea665 100644
--- a/MacPass/NSError+Messages.m
+++ b/MacPass/NSError+Messages.m
@@ -13,7 +13,7 @@ NSString *const MPErrorDomain       = @"com.hicknhack.macpass.error";
 @implementation NSError (Messages)
 
 - (NSString *)descriptionForErrorCode {
-  return [NSString stringWithFormat:@"%@ (%ld)", [self localizedDescription], [self code] ];
+  return [NSString stringWithFormat:@"%@ (%ld)", self.localizedDescription, self.code ];
 }
 
 + (NSError *)errorWithCode:(NSInteger)code description:(NSString *)description {