Fix some warnings

trufae · Oct 2, 2018 · 951ea0b · 951ea0b
1 parent c1bff8b
commit 951ea0b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/sources/VT100Screen.h b/sources/VT100Screen.h
@@ -180,7 +180,6 @@ extern int kVT100ScreenMinRows;
 
 - (void)setWorkingDirectory:(NSString *)workingDirectory onLine:(int)line;
 - (NSString *)workingDirectoryOnLine:(int)line;
-- (VT100RemoteHost *)remoteHostOnLine:(int)line;
 - (VT100ScreenMark *)lastCommandMark;  // last mark representing a command
 
 - (NSDictionary *)contentsDictionary;

diff --git a/sources/VT100Screen.m b/sources/VT100Screen.m
@@ -1923,12 +1923,6 @@ - (id)objectOnOrBeforeLine:(int)line ofClass:(Class)cls {
     }
 }
 
-#if 0
-- (VT100RemoteHost *)remoteHostOnLine:(int)line {
-    return (VT100RemoteHost *)[self objectOnOrBeforeLine:line ofClass:[VT100RemoteHost class]];
-}
-#endif
-
 - (NSString *)workingDirectoryOnLine:(int)line {
 #if 0
     VT100WorkingDirectory *workingDirectory =
@@ -3246,13 +3240,15 @@ - (void)terminalSetWorkingDirectoryURL:(NSString *)URLString {
         return;
     }
     NSURLComponents *components = [[[NSURLComponents alloc] initWithURL:URL resolvingAgainstBaseURL:NO] autorelease];
-    NSString *host = components.host;
-    NSString *user = components.user;
     NSString *path = components.path;
 
+#if 0
+    NSString *host = components.host;
+    NSString *user = components.user;
     if (host || user) {
         [self setHost:host user:user];
     }
+#endif
     [self terminalCurrentDirectoryDidChangeTo:path];
     [delegate_ screenPromptDidStartAtLine:[self numberOfScrollbackLines] + self.cursorY - 1];
 }

diff --git a/sources/VT100Terminal.m b/sources/VT100Terminal.m
@@ -2015,7 +2015,7 @@ - (void)executeXtermSetRgb:(VT100Token *)token {
 }
 
 - (void)executeFileCommandWithValue:(NSString *)value {
-return;
+#if 0
     // Takes semicolon-delimited arguments.
     // File=<arg>;<arg>;...;<arg>
     // <arg> is one of:
@@ -2092,6 +2092,7 @@ - (void)executeFileCommandWithValue:(NSString *)value {
         [delegate_ terminalWillReceiveFileNamed:name ofSize:[dict[@"size"] intValue]];
     }
     receivingFile_ = YES;
+#endif
 }
 
 - (NSArray *)keyValuePairInToken:(VT100Token *)token {

diff --git a/sources/iTermApplicationDelegate.m b/sources/iTermApplicationDelegate.m
@@ -120,12 +120,12 @@
 static BOOL ranAutoLaunchScript = NO;
 static BOOL hasBecomeActive = NO;
 
-static NSString *const kBundlesWithAPIAccessSettingKey = @"NoSyncBundlesWithAPIAccessSettings";
-static NSString *const kAPIAccessAllowed = @"allowed";
-static NSString *const kAPIAccessDate = @"date";
-static NSString *const kAPINextConfirmationDate = @"next confirmation";
-static NSString *const kAPIAccessLocalizedName = @"app name";
-static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
+// static NSString *const kBundlesWithAPIAccessSettingKey = @"NoSyncBundlesWithAPIAccessSettings";
+// static NSString *const kAPIAccessAllowed = @"allowed";
+// static NSString *const kAPIAccessDate = @"date";
+// static NSString *const kAPINextConfirmationDate = @"next confirmation";
+// static NSString *const kAPIAccessLocalizedName = @"app name";
+// static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
 
 
 @interface iTermApplicationDelegate ()
@@ -1133,8 +1133,8 @@ - (void)toolDidToggle:(NSNotification *)notification {
 }
 
 - (void)sessionCreated:(NSNotification *)notification {
-    PTYSession *session = notification.object;
     /*
+    PTYSession *session = notification.object;
     [_newSessionSubscriptions enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, ITMNotificationRequest * _Nonnull obj, BOOL * _Nonnull stop) {
         ITMNotification *notification = [[[ITMNotification alloc] init] autorelease];
         notification.newSessionNotification = [[[ITMNewSessionNotification alloc] init] autorelease];
@@ -1161,8 +1161,8 @@ - (void)layoutChanged:(NSNotification *)notification {
 }
 
 - (void)sessionDidTerminate:(NSNotification *)notification {
-    PTYSession *session = notification.object;
     /*
+    PTYSession *session = notification.object;
     [_terminateSessionSubscriptions enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, ITMNotificationRequest * _Nonnull obj, BOOL * _Nonnull stop) {
         ITMNotification *notification = [[[ITMNotification alloc] init] autorelease];
         notification.terminateSessionNotification = [[[ITMTerminateSessionNotification alloc] init] autorelease];

diff --git a/sources/iTermTipController.m b/sources/iTermTipController.m
@@ -155,6 +155,7 @@ - (void)tryToShowTip {
 }
 
 - (void)showTip {
+#if 0
 return;
     if (_showingTip) {
         return;
@@ -170,6 +171,7 @@ - (void)showTip {
     if (key) {  // Key should always be non-nil, but better be safe.
         [self showTipForKey:key];
     }
+#endif
 }
 
 - (BOOL)haveShownTipRecently {