Changeset 4275 for trunk/macosx/Controller.m

Timestamp:

Dec 22, 2007, 3:31:22 AM (15 years ago)

Author:

livings124

Message:

get rid of all the deprecated functions for the ctor versions

File:

• trunk/macosx/Controller.m (modified) (8 diffs)

trunk/macosx/Controller.m

@@ -740 +740 @@
             location = [torrentPath stringByDeletingLastPathComponent];
         
-        if (tr_torrentParse(fLib, [torrentPath UTF8String], NULL, &info) == TR_EDUPLICATE)
+        tr_ctor * ctor = tr_ctorNew(fLib);
+        tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
+        if (tr_torrentParseFromCtor(fLib, ctor, &info) == TR_EDUPLICATE)
         {
             [self duplicateOpenAlert: [NSString stringWithUTF8String: info.name]];
@@ -747 +749 @@
         }
         tr_metainfoFree(&info);
+        tr_ctorFree(ctor);
         
         if (!(torrent = [[Torrent alloc] initWithPath: torrentPath location: location deleteTorrentFile: deleteTorrent lib: fLib]))
@@ -807 +810 @@
     int canAdd;
     tr_info info;
+    tr_ctor * ctor;
     while ([files count] > 0)
     {
         torrentPath = [[files objectAtIndex: 0] retain];
-        canAdd = tr_torrentParse(fLib, [torrentPath UTF8String], NULL, &info);
+        
+        ctor = tr_ctorNew(fLib);
+        tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
+        canAdd = tr_torrentParseFromCtor(fLib, ctor, &info);
+        tr_ctorFree(ctor);
+        
         if (canAdd == TR_OK)
             break;
@@ -2322 +2331 @@
     NSEnumerator * enumerator = [newNames objectEnumerator];
     int canAdd, count;
+    tr_ctor * ctor;
     while ((file = [enumerator nextObject]))
     {
-        canAdd = tr_torrentParse(fLib, [file UTF8String], NULL, NULL);
+        tr_ctor * ctor = tr_ctorNew(fLib);
+        tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
+        canAdd = tr_torrentParseFromCtor(fLib, ctor, NULL);
+        tr_ctorFree(ctor);
+        
         if (canAdd == TR_OK)
         {
@@ -2476 +2490 @@
         BOOL torrent = NO;
         int canAdd;
+        tr_ctor * ctor;
         while ((file = [enumerator nextObject]))
         {
             if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
             {
-                switch (canAdd = tr_torrentParse(fLib, [file UTF8String], NULL, NULL))
+                ctor = tr_ctorNew(fLib);
+                tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
+                switch (tr_torrentParseFromCtor(fLib, ctor, NULL))
                 {
                     case TR_OK:
@@ -2492 +2509 @@
                         torrent = YES;
                 }
+                tr_ctorFree(ctor);
             }
         }
@@ -2539 +2557 @@
         NSEnumerator * enumerator = [files objectEnumerator];
         NSString * file;
+        tr_ctor * ctor;
         while ((file = [enumerator nextObject]))
         {
             if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
             {
-                switch(tr_torrentParse(fLib, [file UTF8String], NULL, NULL))
+                ctor = tr_ctorNew(fLib);
+                tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
+                switch (tr_torrentParseFromCtor(fLib, ctor, NULL))
                 {
                     case TR_OK:
@@ -2553 +2574 @@
                         torrent = YES;
                 }
+                tr_ctorFree(ctor);
             }
         }