diff options
author | Jose <jose@zeroc.com> | 2018-06-01 17:41:03 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-06-01 17:41:03 +0200 |
commit | cbe92e540a7f02f0bdf93192424bd119189365b7 (patch) | |
tree | 411c50dc0ae9c669d31a940b1b4903b5deac4f12 /cpp/test/ios/controller/Classes | |
parent | Fixed Util.py check for binary installation directory on Windows (diff) | |
download | ice-cbe92e540a7f02f0bdf93192424bd119189365b7.tar.bz2 ice-cbe92e540a7f02f0bdf93192424bd119189365b7.tar.xz ice-cbe92e540a7f02f0bdf93192424bd119189365b7.zip |
Do not use Ice::Application for Ice testsuite
Diffstat (limited to 'cpp/test/ios/controller/Classes')
-rw-r--r-- | cpp/test/ios/controller/Classes/ControllerView.h (renamed from cpp/test/ios/controller/Classes/ViewController.h) | 8 | ||||
-rw-r--r-- | cpp/test/ios/controller/Classes/ControllerView.m (renamed from cpp/test/ios/controller/Classes/ViewController.m) | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/ios/controller/Classes/ViewController.h b/cpp/test/ios/controller/Classes/ControllerView.h index 47fbd1851a0..8a7b43f414f 100644 --- a/cpp/test/ios/controller/Classes/ViewController.h +++ b/cpp/test/ios/controller/Classes/ControllerView.h @@ -9,19 +9,19 @@ #import <UIKit/UIKit.h> -@protocol ViewController +@protocol ControllerView -(void) print:(NSString*)msg; -(void) println:(NSString*)msg; @end -@interface ViewController : UIViewController<ViewController, UIPickerViewDataSource, UIPickerViewDelegate> +@interface ControllerView : UIViewController<ControllerView, UIPickerViewDataSource, UIPickerViewDelegate> { @private IBOutlet UIPickerView* interfaceIPv4; IBOutlet UIPickerView* interfaceIPv6; IBOutlet UITextView* output; - void (*startController)(id<ViewController>, NSString*, NSString*); - void (*stopController)(id<ViewController>); + void (*startController)(id<ControllerView>, NSString*, NSString*); + void (*stopController)(id<ControllerView>); NSMutableArray* interfacesIPv4; NSMutableArray* interfacesIPv6; } diff --git a/cpp/test/ios/controller/Classes/ViewController.m b/cpp/test/ios/controller/Classes/ControllerView.m index debb1023c71..474b9daf21f 100644 --- a/cpp/test/ios/controller/Classes/ViewController.m +++ b/cpp/test/ios/controller/Classes/ControllerView.m @@ -7,13 +7,13 @@ // // ********************************************************************** -#import "ViewController.h" +#import "ControllerView.h" #include <ifaddrs.h> #include <arpa/inet.h> #include <net/if.h> -@implementation ViewController +@implementation ControllerView - (void)viewDidLoad { @@ -123,7 +123,7 @@ [output scrollRangeToVisible:NSMakeRange([output.text length] - 1, 1)]; } -#pragma mark ViewController +#pragma mark ControllerView -(void) print:(NSString*)msg { |