Updates to match RDServices protocol changes, move some private items to...

Classes/ContainerController.h

@@ -29,18 +29,8 @@
 
 #import "BaseViewController.h"
 
-@class RDContainer;
-@class RDPackage;
+@interface ContainerController : BaseViewController
 
-@interface ContainerController : BaseViewController <
-	UITableViewDataSource,
-	UITableViewDelegate>
-{
-	@private RDContainer *m_container;
-	@private RDPackage *m_package;
-	@private __weak UITableView *m_table;
-}
-
-- (id)initWithPath:(NSString *)path;
+- (instancetype)initWithPath:(NSString *)path;
 
 @end

Classes/ContainerController.m

@@ -37,17 +37,28 @@
 #import "SpineItemListController.h"
 
 
-@interface ContainerController() <RDContainerDelegate> {
+@interface ContainerController () <
+	RDContainerDelegate,
+	UITableViewDataSource,
+	UITableViewDelegate>
+{
+	@private RDContainer *m_container;
+	@private RDPackage *m_package;
+	@private __weak UITableView *m_table;
 }
+
 @end
 
+
 @implementation ContainerController
 
-- (void)rdcontainer:(RDContainer *)container handleSdkError:(NSString*)message {
-    NSLog(@"READIUM SDK: %@\n", message);
+
+- (void)container:(RDContainer *)container handleSdkError:(NSString *)message {
+	NSLog(@"READIUM SDK: %@\n", message);
 }
 
-- (id)initWithPath:(NSString *)path {
+
+- (instancetype)initWithPath:(NSString *)path {
 	if (self = [super initWithTitle:nil navBarHidden:NO]) {
 
         m_container = [[RDContainer alloc] initWithDelegate:self path:path];

Classes/EPubViewController.h

@@ -33,49 +33,25 @@
 @class RDContainer;
 @class RDNavigationElement;
 @class RDPackage;
-@class RDPackageResourceServer;
 @class RDSpineItem;
 
-@interface EPubViewController : BaseViewController <
-	UIAlertViewDelegate,
-	UIPopoverControllerDelegate,
-	UIWebViewDelegate>
-{
-	@private UIAlertView *m_alertAddBookmark;
-	@private RDContainer *m_container;
+@interface EPubViewController : BaseViewController
 
-    @private BOOL m_currentPageCanGoLeft;
-    @private BOOL m_currentPageCanGoRight;
-    @private BOOL m_currentPageProgressionIsLTR;
-    @private BOOL m_currentPageIsFixedLayout;
-    @private int m_currentPageSpineItemCount;
-    @private NSArray* m_currentPageOpenPagesArray;
-
-	@private NSString *m_initialCFI;
-	@private BOOL m_moIsPlaying;
-	@private RDNavigationElement *m_navElement;
-	@private RDPackage *m_package;
-	@private UIPopoverController *m_popover;
-	@private RDPackageResourceServer *m_resourceServer;
-	@private RDSpineItem *m_spineItem;
-	@private __weak UIWebView *m_webView;
-}
-
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package;
 
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package
 	bookmark:(Bookmark *)bookmark;
 
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package
 	navElement:(RDNavigationElement *)navElement;
 
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package
 	spineItem:(RDSpineItem *)spineItem

Classes/EPubViewController.m

@@ -39,9 +39,30 @@
 #import "RDSpineItem.h"
 
 
-@interface EPubViewController () <RDPackageResourceServerDelegate> {
+@interface EPubViewController () <
+	RDPackageResourceServerDelegate,
+	UIAlertViewDelegate,
+	UIPopoverControllerDelegate,
+	UIWebViewDelegate>
+{
+	@private UIAlertView *m_alertAddBookmark;
+	@private RDContainer *m_container;
+	@private BOOL m_currentPageCanGoLeft;
+	@private BOOL m_currentPageCanGoRight;
+	@private BOOL m_currentPageIsFixedLayout;
+	@private NSArray* m_currentPageOpenPagesArray;
+	@private BOOL m_currentPageProgressionIsLTR;
+	@private int m_currentPageSpineItemCount;
+	@private NSString *m_initialCFI;
+	@private BOOL m_moIsPlaying;
+	@private RDNavigationElement *m_navElement;
+	@private RDPackage *m_package;
+	@private UIPopoverController *m_popover;
+	@private RDPackageResourceServer *m_resourceServer;
 	@private NSData *m_specialPayload_AnnotationsCSS;
 	@private NSData *m_specialPayload_MathJaxJS;
+	@private RDSpineItem *m_spineItem;
+	@private __weak UIWebView *m_webView;
 }
 
 - (void)passSettingsToJavaScript;
@@ -137,15 +158,15 @@ - (void)cleanUp {
 }
 
 
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package
 {
 	return [self initWithContainer:container package:package spineItem:nil cfi:nil];
 }
 
 
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package
 	bookmark:(Bookmark *)bookmark
@@ -166,7 +187,7 @@ - (void)cleanUp {
 		cfi:bookmark.cfi];
 }
 
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package
 	navElement:(RDNavigationElement *)navElement
@@ -213,7 +234,7 @@ - (void)cleanUp {
 }
 
 
-- (id)
+- (instancetype)
 	initWithContainer:(RDContainer *)container
 	package:(RDPackage *)package
 	spineItem:(RDSpineItem *)spineItem
@@ -354,6 +375,16 @@ - (void)onEPubSettingsDidChange:(NSNotification *)notification {
 }
 
 
+- (void)
+	packageResourceServer:(RDPackageResourceServer *)packageResourceServer
+	executeJavaScript:(NSString *)javaScript
+{
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[m_webView stringByEvaluatingJavaScriptFromString:javaScript];
+	});
+}
+
+
 - (void)passSettingsToJavaScript {
 	NSData *data = [NSJSONSerialization dataWithJSONObject:[EPubSettings shared].dictionary
 		options:0 error:nil];
@@ -378,16 +409,6 @@ - (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverControl
 }
 
 
-- (void)
-	rdpackageResourceServer:(RDPackageResourceServer *)packageResourceServer
-	executeJavaScript:(NSString *)javaScript
-{
-	dispatch_async(dispatch_get_main_queue(), ^{
-		[m_webView stringByEvaluatingJavaScriptFromString:javaScript];
-	});
-}
-
-
 - (void)updateNavigationItems {
 	self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
 		initWithBarButtonSystemItem:UIBarButtonSystemItemAction