updated code to work with latest PsiToolkit

muhammadriaz · Jan 3, 2011 · ad94190 · ad94190
1 parent 13cd720
commit ad94190
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/Classes/Commit.m b/Classes/Commit.m
@@ -25,12 +25,12 @@ - (BOOL) isMergeCommit {
 }
 
 - (NSDictionary *) toDictionary {
-  return PSDict(
-    authorName, @"authorName",
-    authorEmail, @"authorEmail",
-    subject, @"subject",
-    gitHash, @"gitHash",
-    date, @"date"
+  return PSHash(
+    @"authorName", authorName,
+    @"authorEmail", authorEmail,
+    @"subject", subject,
+    @"gitHash", gitHash,
+    @"date", date
   );
 }
 

diff --git a/Classes/Defaults.m b/Classes/Defaults.m
@@ -12,14 +12,14 @@
 @implementation Defaults
 
 + (void) initialize {
-  defaultPreferenceValues = PSDict(
-    PSInt(5),    MONITOR_INTERVAL_KEY,
-    PSBool(YES), IGNORE_MERGES_KEY,
-    PSBool(YES), IGNORE_OWN_COMMITS,
-    PSBool(NO),  STICKY_NOTIFICATIONS_KEY,
-    PSBool(YES), SHOW_DIFF_WINDOW_KEY,
-    PSBool(NO),  OPEN_DIFF_IN_BROWSER_KEY,
-    PSBool(YES), KEEP_WINDOWS_ON_TOP_KEY
+  defaultPreferenceValues = PSHash(
+    MONITOR_INTERVAL_KEY,      PSInt(5),
+    IGNORE_MERGES_KEY,         PSBool(YES),
+    IGNORE_OWN_COMMITS,        PSBool(YES),
+    STICKY_NOTIFICATIONS_KEY,  PSBool(NO),
+    SHOW_DIFF_WINDOW_KEY,      PSBool(YES),
+    OPEN_DIFF_IN_BROWSER_KEY,  PSBool(NO),
+    KEEP_WINDOWS_ON_TOP_KEY,   PSBool(YES)
   );
 }
 

diff --git a/Classes/Git.m b/Classes/Git.m
@@ -26,7 +26,7 @@ + (void) setGitExecutable: (NSString *) path {
   path = [path psTrimmedString];
   gitExecutable = [path isEqual: @""] ? nil : path;
   [self didChangeValueForKey: @"gitExecutable"];
-  PSNotifyWithData(GitExecutableSetNotification, PSDict(path, @"path"));
+  PSNotifyWithData(GitExecutableSetNotification, PSHash(@"path", path));
 }
 
 - (id) initWithDelegate: (id) aDelegate {

diff --git a/Classes/GitifierAppDelegate.m b/Classes/GitifierAppDelegate.m
@@ -183,7 +183,7 @@ - (void) commandCompleted: (NSString *) command output: (NSString *) output {
   if ([command isEqual: @"config"]) {
     if (output && output.length > 0) {
       userEmail = [output psTrimmedString];
-      PSNotifyWithData(UserEmailChangedNotification, PSDict(userEmail, @"email"));
+      PSNotifyWithData(UserEmailChangedNotification, PSHash(@"email", userEmail));
     }
   } else if ([command isEqual: @"version"]) {
     if (!output || ![output isMatchedByRegex: @"^git version \\d"]) {

diff --git a/Classes/GrowlController.m b/Classes/GrowlController.m
@@ -73,7 +73,7 @@ - (void) openGrowlPreferences {
 
 - (void) showGrowlWithCommit: (Commit *) commit repository: (Repository *) repository {
   BOOL sticky = [GitifierDefaults boolForKey: STICKY_NOTIFICATIONS_KEY];
-  NSDictionary *commitData = PSDict([commit toDictionary], @"commit", repository.url, @"repository");
+  NSDictionary *commitData = PSHash(@"commit", [commit toDictionary], @"repository", repository.url);
 
   [GrowlApplicationBridge notifyWithTitle: PSFormat(@"%@ – %@", repository.name, commit.authorName)
                               description: commit.subject

diff --git a/Classes/Repository.m b/Classes/Repository.m
@@ -72,7 +72,7 @@ - (id) initWithUrl: (NSString *) anUrl {
 }
 
 - (NSDictionary *) hashRepresentation {
-  return PSDict(url, @"url", name, @"name");
+  return PSHash(@"url", url, @"name", name);
 }
 
 - (void) resetStatus {

diff --git a/Gitifier_Prefix.pch b/Gitifier_Prefix.pch
@@ -4,5 +4,7 @@
 
 #ifdef __OBJC__
   #import <Cocoa/Cocoa.h>
+  #define PSITOOLKIT_ENABLE_COCOA
+  #define PSITOOLKIT_ENABLE_MODELS
   #import "PsiToolkit.h"
 #endif