Oops, DemoAppController builds again now.

Forgot to update DemoAppController to use the new replication API, so it broke. Also changed the #import in the demo source files to use the framework style, so they'll still build if they're copied into another project.
vfournie · Aug 16, 2011 · b5583f8 · b5583f8
1 parent c4627c7
commit b5583f8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/Demo/DemoAppController.h b/Demo/DemoAppController.h
@@ -14,7 +14,7 @@
 //  and limitations under the License.
 
 #import <Cocoa/Cocoa.h>
-@class CouchDatabase, DemoQuery;
+@class CouchDatabase, CouchReplication, DemoQuery;
 
 
 /** Generic application delegate for simple Mac OS CouchDB demo apps.
@@ -28,6 +28,7 @@
 
     CouchDatabase* _database;
     DemoQuery* _query;
+    CouchReplication *_pull, *_push;
     BOOL _glowing;
 }
 

diff --git a/Demo/DemoAppController.m b/Demo/DemoAppController.m
@@ -16,7 +16,7 @@
 #import "DemoAppController.h"
 #import "DemoItem.h"
 #import "DemoQuery.h"
-#import "CouchCocoa.h"  // in a separate project you would use <CouchCocoa/CouchCocoa.h>
+#import <CouchCocoa/CouchCocoa.h>
 
 
 #define kChangeGlowDuration 3.0
@@ -64,19 +64,10 @@ - (void) applicationDidFinishLaunching: (NSNotification*)n {
 
 
 - (void) startContinuousSyncWith: (NSURL*)otherDbURL {
-    RESTOperation *pull = [_database pullFromDatabaseAtURL: otherDbURL
-                                                  options: kCouchReplicationContinuous];
-    [pull onCompletion:^() {
-		NSLog(@"Pull ended, error=%@", pull.error);
-	}];
-    [pull start];
-
-    RESTOperation *push = [_database pushToDatabaseAtURL: otherDbURL
-                                                options: kCouchReplicationContinuous];
-    [push onCompletion:^() {
-		NSLog(@"Push ended, error=%@", pull.error);
-	}];
-    [push start];
+    _pull = [[_database pullFromDatabaseAtURL: otherDbURL
+                                      options: kCouchReplicationContinuous] retain];
+    _push = [[_database pushToDatabaseAtURL: otherDbURL
+                                    options: kCouchReplicationContinuous] retain];
 }
 
 

diff --git a/Demo/DemoItem.m b/Demo/DemoItem.m
@@ -14,7 +14,7 @@
 //  and limitations under the License.
 
 #import "DemoItem.h"
-#import "CouchCocoa.h"  // in a separate project you would use <CouchCocoa/CouchCocoa.h>
+#import <CouchCocoa/CouchCocoa.h>
 
 
 @interface DemoItem ()

diff --git a/Demo/DemoQuery.m b/Demo/DemoQuery.m
@@ -16,7 +16,7 @@
 #import "DemoQuery.h"
 #import "DemoItem.h"
 
-#import "CouchCocoa.h"  // in a separate project you would use <CouchCocoa/CouchCocoa.h>
+#import <CouchCocoa/CouchCocoa.h>
 
 
 @interface DemoQuery ()