unsigned -> NSUInteger

git-svn-id: svn://qnap.local/TwoTerm/branches/frameless@3096 5590a31f-7b70-45f8-8c82-aa3a8e5f4507

Emulators/Apple80.mm

@@ -220,10 +220,10 @@ enum  {
 
 -(void)keyDown:(NSEvent *)event screen:(Screen *)screen output:(OutputChannel *)output
 {
-    unsigned flags = [event modifierFlags];
+    NSEventModifierFlags flags = [event modifierFlags];
     NSString *chars = [event charactersIgnoringModifiers];
     
-    unsigned length = [chars length];
+    NSUInteger length = [chars length];
     
     for (unsigned i = 0; i < length; ++i)
     {

Emulators/EmulatorManager.mm

@@ -12,9 +12,9 @@
 
 unsigned EventCharacters(NSEvent *event, std::u32string &rv)
 {
-    unsigned flags = [event modifierFlags];
+    NSEventModifierFlags flags = [event modifierFlags];
     NSString *chars = [event charactersIgnoringModifiers];
-    unsigned length = [chars length];
+    NSUInteger length = [chars length];
     
     rv.reserve(length);
     
@@ -37,7 +37,7 @@ unsigned EventCharacters(NSEvent *event, std::u32string &rv)
         rv.push_back(c);
     }
     
-    return length;
+    return (unsigned)length;
 }
 
 

Emulators/PTSE.mm

@@ -314,10 +314,10 @@ enum  {
 
 -(void)keyDown:(NSEvent *)event screen:(Screen *)screen output:(OutputChannel *)output
 {
-    unsigned flags = [event modifierFlags];
+    NSEventModifierFlags flags = [event modifierFlags];
     NSString *chars = [event charactersIgnoringModifiers];
     
-    unsigned length = [chars length];
+    NSUInteger length = [chars length];
     
     for (unsigned i = 0; i < length; ++i)
     {

Emulators/VT05.mm

@@ -67,9 +67,9 @@ enum {
 
 -(void)keyDown: (NSEvent *)event screen: (Screen *)screen output: (OutputChannel *)output
 {
-    unsigned flags = [event modifierFlags];
+    NSEventModifierFlags flags = [event modifierFlags];
     NSString *chars = [event charactersIgnoringModifiers];
-    unsigned length = [chars length];
+    NSUInteger length = [chars length];
     
     
     for (unsigned i = 0; i < length; ++i)

Emulators/VT100.mm

@@ -799,7 +799,7 @@ enum {
 
 
 
-static void vt100ModeKey(unichar uc, unsigned flags, Screen *screen, OutputChannel *output, struct __vt100flags vt100flags)
+static void vt100ModeKey(unichar uc, NSEventModifierFlags flags, Screen *screen, OutputChannel *output, struct __vt100flags vt100flags)
 {
     const char *str = NULL;
 
@@ -926,7 +926,7 @@ static void vt100ModeKey(unichar uc, unsigned flags, Screen *screen, OutputChann
 }
 
 
-static void vt52ModeKey(unichar uc, unsigned flags, Screen * screen, OutputChannel *output, struct __vt100flags vt100flags)
+static void vt52ModeKey(unichar uc, NSEventModifierFlags flags, Screen * screen, OutputChannel *output, struct __vt100flags vt100flags)
 {
     const char *str = NULL;
     
@@ -1043,9 +1043,9 @@ static void vt52ModeKey(unichar uc, unsigned flags, Screen * screen, OutputChann
 
 -(void)keyDown:(NSEvent *)event screen:(Screen *)screen output:(OutputChannel *)output
 {
-    unsigned flags = [event modifierFlags];
+    NSEventModifierFlags flags = [event modifierFlags];
     NSString *chars = [event charactersIgnoringModifiers];
-    unsigned length = [chars length];
+    NSUInteger length = [chars length];
     
     for (unsigned i = 0; i < length; ++i)
     {

Emulators/VT52.mm

@@ -87,9 +87,9 @@ enum {
 
 -(void)keyDown: (NSEvent *)event screen: (Screen *)screen output: (OutputChannel *)output
 {
-    unsigned flags = [event modifierFlags];
+    NSEventModifierFlags flags = [event modifierFlags];
     NSString *chars = [event charactersIgnoringModifiers];
-    unsigned length = [chars length];
+    NSUInteger length = [chars length];
         
     for (unsigned i = 0; i < length; ++i)
     {

Views/EmulatorView.mm

@@ -238,7 +238,7 @@
     }
     else
     {
-        [self setContentFilters: nil];
+        [self setContentFilters: @[]];
     }
 }
 
@@ -471,7 +471,7 @@
     
     NSData *data = [text dataUsingEncoding: NSASCIIStringEncoding allowLossyConversion: YES];
 
-    unsigned length = [data length];
+    NSUInteger length = [data length];
     
     OutputChannel channel(_fd);