From 8ec9e490edfa8566751bb07e33ae259a69b031d8 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Mon, 25 Mar 2013 21:02:39 +0100 Subject: [PATCH] Update to ObjFW changes --- src/gui/cli/JubCLIUI.m | 2 +- src/gui/gtk/JubGObjectMap.m | 4 ++-- src/gui/gtk/JubGtkRosterUI.m | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/cli/JubCLIUI.m b/src/gui/cli/JubCLIUI.m index 16083c0..6f0b03a 100644 --- a/src/gui/cli/JubCLIUI.m +++ b/src/gui/cli/JubCLIUI.m @@ -228,7 +228,7 @@ ENDCLICOMMAND __block size_t longest = 0; [_commands enumerateKeysAndObjectsUsingBlock: - ^(OFString *key, id command, BOOL *stop) { + ^(OFString *key, id command, bool *stop) { size_t length = [command.command length] + (command.params == nil ? 0 : (1 + [command.params length])); diff --git a/src/gui/gtk/JubGObjectMap.m b/src/gui/gtk/JubGObjectMap.m index ce6217a..0f58589 100644 --- a/src/gui/gtk/JubGObjectMap.m +++ b/src/gui/gtk/JubGObjectMap.m @@ -16,7 +16,7 @@ static uint32_t hash(void *value) return [(id)value hash]; } -static BOOL equal(void *value1, void *value2) +static bool equal(void *value1, void *value2) { return [(id)value1 isEqual: (id)value2]; } @@ -53,7 +53,7 @@ static uint32_t default_hash(void *value) #undef NUM } -static BOOL default_equal(void *value1, void *value2) +static bool default_equal(void *value1, void *value2) { return (value1 == value2); } diff --git a/src/gui/gtk/JubGtkRosterUI.m b/src/gui/gtk/JubGtkRosterUI.m index c18f007..a805adf 100644 --- a/src/gui/gtk/JubGtkRosterUI.m +++ b/src/gui/gtk/JubGtkRosterUI.m @@ -311,7 +311,7 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model, [OFMutableString stringWithString: @"Resources:"]; [allPresences enumerateKeysAndObjectsUsingBlock: - ^(OFString *resource, XMPPPresence *pres, BOOL *stop) { + ^(OFString *resource, XMPPPresence *pres, bool *stop) { [tooltip appendString: @"\n"]; [tooltip appendString: resource]; if ([pres.type isEqual: @"available"]) { -- 2.39.2