mirror of
https://github.com/qvacua/vimr.git
synced 2024-10-27 10:23:12 +03:00
Remove some compile warnings
This commit is contained in:
parent
0687fb6225
commit
a6990259da
@ -30,11 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
- (void)encodeWithCoder:(NSCoder *)coder;
|
||||
|
||||
- (NSString *)description;
|
||||
|
||||
- (BOOL)isEqual:(id)other;
|
||||
|
||||
- (BOOL)isEqual:(id _Nullable)other;
|
||||
- (BOOL)isEqualToBuffer:(NeoVimBuffer *)buffer;
|
||||
|
||||
- (NSUInteger)hash;
|
||||
|
||||
@end
|
||||
|
@ -67,8 +67,6 @@ static int _marked_delta = 0;
|
||||
static int _put_row = -1;
|
||||
static int _put_column = -1;
|
||||
|
||||
static bool _dirty = false;
|
||||
|
||||
static NSString *_backspace = nil;
|
||||
|
||||
#pragma mark Helper functions
|
||||
@ -219,7 +217,7 @@ static void server_ui_mouse_off(UI *ui __unused) {
|
||||
[_neovim_server sendMessageWithId:NeoVimServerMsgIdMouseOff];
|
||||
}
|
||||
|
||||
static void server_ui_cursor_style_set(UI *ui __unused, Dictionary cursor_shapes __unused) {
|
||||
static void server_ui_cursor_style_set(UI *ui __unused, bool enabled __unused, Dictionary cursor_styles __unused) {
|
||||
// yet noop
|
||||
}
|
||||
|
||||
@ -542,7 +540,7 @@ static void work_and_write_data_sync(void **argv, work_block block) {
|
||||
static NSString *escaped_filename(NSString *filename) {
|
||||
const char *file_system_rep = filename.fileSystemRepresentation;
|
||||
|
||||
char_u *escaped_filename = vim_strsave_fnameescape((char_u *) file_system_rep, 0);
|
||||
char *escaped_filename = vim_strsave_fnameescape(file_system_rep, 0);
|
||||
NSString *result = [NSString stringWithCString:(const char *) escaped_filename encoding:NSUTF8StringEncoding];
|
||||
xfree(escaped_filename);
|
||||
|
||||
|
@ -9,11 +9,15 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* Extracted from snapshot-112 of MacVim
|
||||
* Extracted from snapshot-131 of MacVim
|
||||
* https://github.com/macvim-dev/macvim
|
||||
* See VIM.LICENSE
|
||||
*/
|
||||
|
||||
// We suppress the following warnings since the original code does have it...
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wshorten-64-to-32"
|
||||
|
||||
#import "MMCoreTextView.h"
|
||||
|
||||
static CTFontRef
|
||||
@ -288,3 +292,4 @@ recurseDraw(const unichar *chars, CGGlyph *glyphs, CGPoint *positions,
|
||||
}
|
||||
}
|
||||
|
||||
#pragma clang diagnostic pop
|
||||
|
@ -1650,7 +1650,6 @@
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
"CUSTOM_UI=1",
|
||||
"INCLUDE_GENERATED_DECLARATIONS=1",
|
||||
);
|
||||
HEADER_SEARCH_PATHS = (
|
||||
@ -1675,10 +1674,7 @@
|
||||
4B854A201D31447C00E08DE1 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"INCLUDE_GENERATED_DECLARATIONS=1",
|
||||
"CUSTOM_UI=1",
|
||||
);
|
||||
GCC_PREPROCESSOR_DEFINITIONS = "INCLUDE_GENERATED_DECLARATIONS=1";
|
||||
HEADER_SEARCH_PATHS = (
|
||||
"$(PROJECT_DIR)/neovim/build/include",
|
||||
"$(PROJECT_DIR)/neovim/src",
|
||||
|
@ -38,7 +38,7 @@ class FileItem : CustomStringConvertible, Hashable, Comparable, Copyable {
|
||||
var description: String {
|
||||
return "<FileItem: \(self.url), dir=\(self.isDir), hidden=\(self.isHidden), package=\(self.isPackage), "
|
||||
+ "needsScan=\(self.needsScanChildren), childrenScanned=\(self.childrenScanned), "
|
||||
+ "ignore=\(self.ignore), ignoreToken=\(self.ignoreToken), "
|
||||
+ "ignore=\(self.ignore), ignoreToken=\(String(describing: self.ignoreToken)), "
|
||||
+ "children=\(self.children.count)>"
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user