diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2015-10-26 16:23:34 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2015-10-26 16:23:34 +1100 |
| commit | 06730b803c373be1160f14aeda8c15210e860f50 (patch) | |
| tree | 8364daa85b4223621b26be3c5d854876cbe18d0d | |
| parent | 5c1d404acca099d947a3f6fa6fb0c0b9125fddcf (diff) | |
| download | scintilla-mirror-06730b803c373be1160f14aeda8c15210e860f50.tar.gz | |
Remove unnecessary timer variables.
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 4c7c2cc16..1bf05c9f0 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -111,8 +111,6 @@ private: int scrollSpeed; int scrollTicks; - NSTimer* tickTimer; - NSTimer* idleTimer; CFRunLoopObserverRef observer; FindHighlightLayer *layerFindIndicator; diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 954854af6..8b95aae0e 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -403,8 +403,6 @@ ScintillaCocoa::ScintillaCocoa(SCIContentView* view, SCIMarginView* viewMargin) enteredSetScrollingSize = false; scrollSpeed = 1; scrollTicks = 2000; - tickTimer = NULL; - idleTimer = NULL; observer = NULL; layerFindIndicator = NULL; imeInteraction = imeInline; @@ -997,11 +995,11 @@ bool ScintillaCocoa::SetIdle(bool on) if (idler.state) { // Scintilla ticks = milliseconds - idleTimer = [NSTimer scheduledTimerWithTimeInterval: timer.tickSize / 1000.0 - target: timerTarget - selector: @selector(idleTimerFired:) - userInfo: nil - repeats: YES]; + NSTimer *idleTimer = [NSTimer scheduledTimerWithTimeInterval: timer.tickSize / 1000.0 + target: timerTarget + selector: @selector(idleTimerFired:) + userInfo: nil + repeats: YES]; [NSRunLoop.currentRunLoop addTimer: idleTimer forMode: NSModalPanelRunLoopMode]; idler.idlerID = reinterpret_cast<IdlerID>(idleTimer); } |