From e6fd11479b6cb1b50376eae12813950a222b9e53 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 26 Sep 2016 10:27:25 +0000
Subject: [PATCH] fix
---
contrib/mobile/iOS/Onelab/ModelListController.mm | 2 +-
contrib/mobile/iOS/Onelab/ModelViewController.mm | 6 +++---
contrib/mobile/iOS/Onelab/OptionsViewController.mm | 2 +-
contrib/mobile/iOS/Onelab/ParametersViewController.mm | 2 +-
contrib/mobile/iOS/Onelab/emulatorFix.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/contrib/mobile/iOS/Onelab/ModelListController.mm b/contrib/mobile/iOS/Onelab/ModelListController.mm
index 63ed5dcafb..6112efee94 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 ea44a84c27..097e0bc8b3 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 561c7d97a7..c65e9fc908 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 e2ce710778..14855c6759 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 2624820c14..c1bc6137a5 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)
--
GitLab