aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsqlprodev <sqlprodev@northofthree.com>2011-04-14 22:38:11 +0000
committersqlprodev <sqlprodev@northofthree.com>2011-04-14 22:38:11 +0000
commit555cb252a3e42d0df5835a18df4abbe1a0b0725a (patch)
tree05d6df3aeceb5105df5ca418c3cfc7c2e9f9a46b
parent17a3ea75f52422d1dd1dc0c0deea681d6994750a (diff)
downloadsequelpro-555cb252a3e42d0df5835a18df4abbe1a0b0725a.tar.gz
sequelpro-555cb252a3e42d0df5835a18df4abbe1a0b0725a.tar.bz2
sequelpro-555cb252a3e42d0df5835a18df4abbe1a0b0725a.zip
Fixes source text encoding problems accidentally introduced in r3273
-rw-r--r--Source/SPCustomQuery.m2
-rw-r--r--Source/SPTableContent.m6
-rw-r--r--Source/SPTextViewAdditions.m5
3 files changed, 6 insertions, 7 deletions
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index df377e57..a67ec5f3 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -3186,7 +3186,7 @@
if(![searchString isEqualToString:SP_HELP_TOC_SEARCH_STRING])
[theHelp appendFormat:@"<br><i>%@ “%@”</i><br>", NSLocalizedString(@"Help topics for", @"help topics for"), searchString];
else
- [theHelp appendFormat:@"<br><b>%@:</b><br>", NSLocalizedString(@"MySQL Help – Categories", @"mysql help categories"), searchString];
+ [theHelp appendFormat:@"<br><b>%@:</b><br>", NSLocalizedString(@"MySQL Help – Categories", @"mysql help categories"), searchString];
// iterate through all found rows and print them as HTML ul/li list
[theHelp appendString:@"<ul>"];
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index cfbca3b2..c9b8c145 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -1353,7 +1353,7 @@
if (![prefs boolForKey:SPLimitResults] || [paginationPageField integerValue] <= 0)
contentPage = 1;
else if (([paginationPageField integerValue] - 1) * [prefs integerForKey:SPLimitResultsValue] >= maxNumRows)
- contentPage = ceil((CGFloat)maxNumRows / [prefs floatForKey:SPLimitResultsValue]);
+ contentPage = ceilf((CGFloat)maxNumRows / [prefs floatForKey:SPLimitResultsValue]);
else
contentPage = [paginationPageField integerValue];
@@ -1405,7 +1405,7 @@
return;
}
- // Remember last selection for "Edit filter…"
+ // Remember last selection for "Edit filter…"
lastSelectedContentFilterIndex = [[compareField selectedItem] tag];
NSDictionary *filter = [[contentFilters objectForKey:compareType] objectAtIndex:lastSelectedContentFilterIndex];
@@ -1528,7 +1528,7 @@
*/
- (void) updatePaginationState
{
- NSUInteger maxPage = ceil((CGFloat)maxNumRows / [prefs floatForKey:SPLimitResultsValue]);
+ NSUInteger maxPage = ceilf((CGFloat)maxNumRows / [prefs floatForKey:SPLimitResultsValue]);
if (isFiltered && !isLimited) {
maxPage = contentPage;
}
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m
index e2f1a715..b2a2354b 100644
--- a/Source/SPTextViewAdditions.m
+++ b/Source/SPTextViewAdditions.m
@@ -390,9 +390,8 @@
- (IBAction)insertNULLvalue:(id)sender
{
id prefs = [NSUserDefaults standardUserDefaults];
- if([self respondsToSelector:@selector(insertText:)])
- {
- if([prefs objectForKey:SPNullValue] && [(NSString*)[prefs objectForKey:SPNullValue] length])
+ if ([self respondsToSelector:@selector(insertText:)]) {
+ if([prefs stringForKey:SPNullValue] && [[prefs stringForKey:SPNullValue] length])
[self insertText:[prefs objectForKey:SPNullValue]];
else
[self insertText:@"NULL"];