From 2014963689dad17dc1116dd02ea5428e3c9ba89f Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Fri, 6 Jan 2017 10:31:45 +0100 Subject: [PATCH] GH-339 Rename wrapper --- NeoVimServer/DataWrapper.h | 14 ++++++++++++++ NeoVimServer/DataWrapper.m | 9 +++++++++ NeoVimServer/NeoVimServer.m | 4 ++-- NeoVimServer/Wrapper.h | 14 -------------- NeoVimServer/Wrapper.m | 12 ------------ NeoVimServer/server_ui.m | 4 ++-- VimR.xcodeproj/project.pbxproj | 12 ++++++------ 7 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 NeoVimServer/DataWrapper.h create mode 100644 NeoVimServer/DataWrapper.m delete mode 100644 NeoVimServer/Wrapper.h delete mode 100644 NeoVimServer/Wrapper.m diff --git a/NeoVimServer/DataWrapper.h b/NeoVimServer/DataWrapper.h new file mode 100644 index 00000000..1378f640 --- /dev/null +++ b/NeoVimServer/DataWrapper.h @@ -0,0 +1,14 @@ +/** + * Tae Won Ha - http://taewon.de - @hataewon + * See LICENSE + */ + +@import Foundation; + + +@interface DataWrapper : NSObject + +@property (strong) NSData *data; +@property (getter=isDataReady) bool dataReady; + +@end diff --git a/NeoVimServer/DataWrapper.m b/NeoVimServer/DataWrapper.m new file mode 100644 index 00000000..7e880526 --- /dev/null +++ b/NeoVimServer/DataWrapper.m @@ -0,0 +1,9 @@ +/** + * Tae Won Ha - http://taewon.de - @hataewon + * See LICENSE + */ + +#import "DataWrapper.h" + + +@implementation DataWrapper { } @end diff --git a/NeoVimServer/NeoVimServer.m b/NeoVimServer/NeoVimServer.m index 11ab0c91..c94e8123 100644 --- a/NeoVimServer/NeoVimServer.m +++ b/NeoVimServer/NeoVimServer.m @@ -7,7 +7,7 @@ #import "server_globals.h" #import "Logging.h" #import "CocoaCategories.h" -#import "Wrapper.h" +#import "DataWrapper.h" // FileInfo and Boolean are #defined by Carbon and NeoVim: Since we don't need the Carbon versions of them, we rename // them. @@ -40,7 +40,7 @@ static CFDataRef null_data_async(CFDataRef data, argv_callback cb) { } static CFDataRef data_sync(CFDataRef data, NSCondition *condition, argv_callback cb) { - Wrapper *wrapper = [[Wrapper alloc] init]; + DataWrapper *wrapper = [[DataWrapper alloc] init]; NSDate *deadline = [[NSDate date] dateByAddingTimeInterval:qTimeout]; [condition lock]; diff --git a/NeoVimServer/Wrapper.h b/NeoVimServer/Wrapper.h deleted file mode 100644 index 136a9656..00000000 --- a/NeoVimServer/Wrapper.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Created by Tae Won Ha on 1/5/17. -// Copyright (c) 2017 Tae Won Ha. All rights reserved. -// - -#import - - -@interface Wrapper : NSObject - -@property (strong) NSData *data; -@property (getter=isDataReady) bool dataReady; - -@end diff --git a/NeoVimServer/Wrapper.m b/NeoVimServer/Wrapper.m deleted file mode 100644 index 252b23d9..00000000 --- a/NeoVimServer/Wrapper.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Created by Tae Won Ha on 1/5/17. -// Copyright (c) 2017 Tae Won Ha. All rights reserved. -// - -#import "Wrapper.h" - - -@implementation Wrapper { - -} -@end diff --git a/NeoVimServer/server_ui.m b/NeoVimServer/server_ui.m index c2ed44b1..610fb6be 100644 --- a/NeoVimServer/server_ui.m +++ b/NeoVimServer/server_ui.m @@ -13,7 +13,7 @@ #import "NeoVimWindow.h" #import "NeoVimTab.h" #import "CocoaCategories.h" -#import "Wrapper.h" +#import "DataWrapper.h" // FileInfo and Boolean are #defined by Carbon and NeoVim: Since we don't need the Carbon versions of them, we rename // them. @@ -520,7 +520,7 @@ static void work_and_write_data_sync(void **argv, work_block block) { [outputCondition lock]; NSData *data = argv[0]; - Wrapper *wrapper = argv[2]; + DataWrapper *wrapper = argv[2]; wrapper.data = block(data); wrapper.dataReady = YES; [data release]; // retained in local_server_callback diff --git a/VimR.xcodeproj/project.pbxproj b/VimR.xcodeproj/project.pbxproj index a0601318..13131c0f 100644 --- a/VimR.xcodeproj/project.pbxproj +++ b/VimR.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 1929B0E0C3BC59F52713D5A2 /* FoundationCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */; }; 1929B165820D7177743B537A /* Component.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B39DA7AC4A9B62D7CD39 /* Component.swift */; }; - 1929B18A0D7C7407C51DB642 /* Wrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6CFF4CC0B5E8B00C62 /* Wrapper.m */; }; + 1929B18A0D7C7407C51DB642 /* DataWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */; }; 1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */; }; 1929B3CEE0C1A1850E9CCE2F /* BasicTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B2FBE11048569391E092 /* BasicTypes.swift */; }; 1929B3F5743967125F357C9F /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEEB33113B0E33C3830F /* Matcher.swift */; }; @@ -266,7 +266,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1929B0EEBE4A765934AF8335 /* Wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Wrapper.h; sourceTree = ""; }; + 1929B0EEBE4A765934AF8335 /* DataWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataWrapper.h; sourceTree = ""; }; 1929B15B7EDC9B0F40E5E95C /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = ""; }; 1929B1A51F076E088EF4CCA4 /* server_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_globals.h; sourceTree = ""; }; 1929B2FBE11048569391E092 /* BasicTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTypes.swift; sourceTree = ""; }; @@ -284,7 +284,7 @@ 1929BA6128BFDD54CA92F46E /* ColorUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorUtils.swift; sourceTree = ""; }; 1929BA8AC40B901B20F20B71 /* FileUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = ""; }; 1929BB251F74BEFC82CEEF84 /* PrefPane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefPane.swift; sourceTree = ""; }; - 1929BB6CFF4CC0B5E8B00C62 /* Wrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Wrapper.m; sourceTree = ""; }; + 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataWrapper.m; sourceTree = ""; }; 1929BBC84557C8351EC6183E /* FileItemIgnorePatternTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemIgnorePatternTest.swift; sourceTree = ""; }; 1929BC19C1BC19246AFF1621 /* MatcherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatcherTests.swift; sourceTree = ""; }; 1929BDF9EBAF1D9D44399045 /* ScoredFileItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScoredFileItem.swift; sourceTree = ""; }; @@ -646,8 +646,8 @@ 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */, 1929BE69CF9AB1A10D0DD4F2 /* CocoaCategories.h */, 1929BFC86BF38D341F2DDCBD /* NeoVim Objects */, - 1929BB6CFF4CC0B5E8B00C62 /* Wrapper.m */, - 1929B0EEBE4A765934AF8335 /* Wrapper.h */, + 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */, + 1929B0EEBE4A765934AF8335 /* DataWrapper.h */, ); path = NeoVimServer; sourceTree = ""; @@ -1168,7 +1168,7 @@ 4BDD058D1DBBC50000D1B405 /* NeoVimWindow.m in Sources */, 4BDD05871DBBC50000D1B405 /* NeoVimBuffer.m in Sources */, 1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */, - 1929B18A0D7C7407C51DB642 /* Wrapper.m in Sources */, + 1929B18A0D7C7407C51DB642 /* DataWrapper.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };