Swap awkward va_list hack for awkward switch hack.

[cydia.git] / CyteKit / ViewController.h

diff --git a/CyteKit/ViewController.h b/CyteKit/ViewController.h
index f724837de8ffbf1e8c18a444e4c9a49d7de37535..da4a33b9d060926c1a42e3857adc1045ea8965fd 100644 (file)
--- a/CyteKit/ViewController.h
+++ b/CyteKit/ViewController.h
@@ -24,20 +24,10 @@
 
 #include <UIKit/UIKit.h>
 
-#include <Menes/ObjectHandle.h>
-
 @interface UIViewController (Cydia)
-- (BOOL) hasLoaded;
-- (void) reloadData;
-- (void) unloadData;
-- (UIViewController *) parentOrPresentingViewController;
-@end
 
-@interface CyteViewController : UIViewController {
-    _transient id delegate_;
-    BOOL loaded_;
-    _H<UIColor> color_;
-}
+// Override this in subclasses if you manage the "has seen first load" state yourself.
+- (BOOL) hasLoaded;
 
 // The default implementation of this method is essentially a no-op,
 // but calling the superclass implementation is *required*.
@@ -45,18 +35,22 @@
 
 - (void) unloadData;
 
+- (UIViewController *) parentOrPresentingViewController;
+- (UIViewController *) rootViewController;
+
 // This URL is used to save the state of the view controller. Return
 // nil if you cannot or should not save the URL for this page.
 - (NSURL *) navigationURL;
 
+@end
+
+@interface CyteViewController : UIViewController
+
 // By default, this delegate is unused. However, it's provided here in case
 // you need some kind of delegate in a subclass.
 - (void) setDelegate:(id)delegate;
 - (id) delegate;
 
-// Override this in subclasses if you manage the "has seen first load" state yourself.
-- (BOOL) hasLoaded;
-
 // This is called when the view managed by the view controller is released.
 // That is not always when the controller itself is released: it also can
 // happen when more memory is needed by the system or whenever the controller
@@ -64,6 +58,7 @@
 - (void) releaseSubviews;
 
 - (void) setPageColor:(UIColor *)color;
+- (UIColor *) pageColor;
 
 @end