aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/ScintillaCocoa.mm
diff options
context:
space:
mode:
authornyamatongwe <nyamatongwe@gmail.com>2011-10-28 23:29:26 +1100
committernyamatongwe <nyamatongwe@gmail.com>2011-10-28 23:29:26 +1100
commit93bc5b8f9b0f34f38f2bc141d177a9ee2188edee (patch)
tree41fb1836c28875ab722d43ca17da383a8f93de98 /cocoa/ScintillaCocoa.mm
parent24680747f54813149d5984339726d961964ac34f (diff)
downloadscintilla-mirror-93bc5b8f9b0f34f38f2bc141d177a9ee2188edee.tar.gz
Fix warnings from Clang analyze by using single statement alloc and init.
Remove unused variables. Fix potential leak.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
-rw-r--r--cocoa/ScintillaCocoa.mm5
1 files changed, 2 insertions, 3 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 7927652a7..eb3fbc50c 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -417,7 +417,7 @@ std::string ScintillaCocoa::CaseMapString(const std::string &s, int caseMapping)
sMapped = [(NSString *)cfsVal lowercaseString];
break;
default:
- sMapped = [(NSString *)cfsVal copy];
+ sMapped = (NSString *)cfsVal;
}
// Back to encoding
@@ -782,8 +782,7 @@ void ScintillaCocoa::CreateCallTipWindow(PRectangle rc) {
[callTip setLevel:NSFloatingWindowLevel];
[callTip setHasShadow:YES];
NSRect ctContent = NSMakeRect(0,0, rc.Width(), rc.Height());
- CallTipView *caption = [CallTipView alloc];
- [caption initWithFrame: ctContent];
+ CallTipView *caption = [[CallTipView alloc] initWithFrame: ctContent];
[caption setAutoresizingMask: NSViewWidthSizable | NSViewMaxYMargin];
[caption setSci: this];
[[callTip contentView] addSubview: caption];