diff --git a/contrib/mobile/iOS/Onelab/ModelListController.mm b/contrib/mobile/iOS/Onelab/ModelListController.mm index 63ed5dcafbad76263473f53df7382c8dd7ce0647..6112efee94648830b1048bee44f613ec3c820e03 100644 --- a/contrib/mobile/iOS/Onelab/ModelListController.mm +++ b/contrib/mobile/iOS/Onelab/ModelListController.mm @@ -31,7 +31,7 @@ } [models sortUsingSelector:@selector(compare:)]; - UIBarButtonItem *about = [[UIBarButtonItem alloc] initWithTitle:@"About" style:UIBarButtonItemStyleBordered target:self action:@selector(showAbout)]; + UIBarButtonItem *about = [[UIBarButtonItem alloc] initWithTitle:@"About" style:UIBarButtonItemStylePlain target:self action:@selector(showAbout)]; [self.navigationItem setRightBarButtonItems:[NSArray arrayWithObjects: about, nil]]; } diff --git a/contrib/mobile/iOS/Onelab/ModelViewController.mm b/contrib/mobile/iOS/Onelab/ModelViewController.mm index ea44a84c27c6893acd4920f455c974a17f06cab4..097e0bc8b3aba6025fbb5623064d7d22ece16fbe 100644 --- a/contrib/mobile/iOS/Onelab/ModelViewController.mm +++ b/contrib/mobile/iOS/Onelab/ModelViewController.mm @@ -89,15 +89,15 @@ setObjCBridge((__bridge void*) self); [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(requestRender) name:@"requestRender" object:nil]; - _runStopButton = [[UIBarButtonItem alloc] initWithTitle:@"Run" style:UIBarButtonItemStyleBordered target:self action:@selector(compute)]; + _runStopButton = [[UIBarButtonItem alloc] initWithTitle:@"Run" style:UIBarButtonItemStylePlain target:self action:@selector(compute)]; //UIBarButtonItem *share = [[UIBarButtonItem alloc] initWithTitle:@"Share" style:UIBarButtonItemStyleBordered target:self action:@selector(share)]; if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ - UIBarButtonItem *model = [[UIBarButtonItem alloc] initWithTitle:@"Model list" style:UIBarButtonItemStyleBordered target:self action:@selector(showModelsList)]; + UIBarButtonItem *model = [[UIBarButtonItem alloc] initWithTitle:@"Model list" style:UIBarButtonItemStylePlain target:self action:@selector(showModelsList)]; [self.navigationItem setRightBarButtonItems:[NSArray arrayWithObjects:_runStopButton, model, /*share,*/ nil]]; } else { - UIBarButtonItem *settings = [[UIBarButtonItem alloc] initWithTitle:@"Parameters" style:UIBarButtonItemStyleBordered target:self action:@selector(showSettings)]; + UIBarButtonItem *settings = [[UIBarButtonItem alloc] initWithTitle:@"Parameters" style:UIBarButtonItemStylePlain target:self action:@selector(showSettings)]; [self.navigationItem setRightBarButtonItems:[NSArray arrayWithObjects:_runStopButton, settings, /*share,*/ nil]]; } diff --git a/contrib/mobile/iOS/Onelab/OptionsViewController.mm b/contrib/mobile/iOS/Onelab/OptionsViewController.mm index 561c7d97a79719e941966217b10f00bac2922361..c65e9fc9087ce11458e66b47392ae57a04e720cd 100644 --- a/contrib/mobile/iOS/Onelab/OptionsViewController.mm +++ b/contrib/mobile/iOS/Onelab/OptionsViewController.mm @@ -243,7 +243,7 @@ -(BOOL)textFieldShouldEndEditing:(UITextField *)textField { - NSInteger val = [textField.text integerValue]; + int val = (int)[textField.text integerValue]; val = (val > 0)? val : 1; val = (val < 1000)? val : 1000; [textField setText:[NSString stringWithFormat:@"%d",val]]; diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm index e2ce710778d7be0ee69b2beef824906fdf32b305..14855c67597de255d97a4c7e5139f652b387d1bb 100644 --- a/contrib/mobile/iOS/Onelab/ParametersViewController.mm +++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm @@ -52,7 +52,7 @@ target:self action:@selector(backButtonPressed:)]; } self.navigationItem.rightBarButtonItem = - [[UIBarButtonItem alloc] initWithTitle:@"Reset" style:UIBarButtonItemStyleBordered + [[UIBarButtonItem alloc] initWithTitle:@"Reset" style:UIBarButtonItemStylePlain target:self action:@selector(resetParameters:)]; } diff --git a/contrib/mobile/iOS/Onelab/emulatorFix.c b/contrib/mobile/iOS/Onelab/emulatorFix.c index 2624820c141ea90cd8afee28328e5a516456e4ec..c1bc6137a53c85374fd3a640043efb2bffc45501 100644 --- a/contrib/mobile/iOS/Onelab/emulatorFix.c +++ b/contrib/mobile/iOS/Onelab/emulatorFix.c @@ -72,7 +72,7 @@ size_t write$UNIX2003(int fildes, const void *buf, size_t nbytes) int read$UNIX2003(int handle, void *buffer, int nbyte) { - return read(handle, buffer, nbyte); + return (int)read(handle, buffer, nbyte); } int close$UNIX2003(int handle)