Changeset 5586


Ignore:
Timestamp:
Apr 11, 2008, 5:52:05 PM (14 years ago)
Author:
livings124
Message:

mac build compiles again

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Transmission.xcodeproj/project.pbxproj

    r5564 r5586  
    249249                BEFC1E2D0C07861A00B0BB3C /* upnp.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF40C07861A00B0BB3C /* upnp.c */; };
    250250                BEFC1E2E0C07861A00B0BB3C /* transmission.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DF50C07861A00B0BB3C /* transmission.h */; };
    251                 BEFC1E2F0C07861A00B0BB3C /* transmission.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF60C07861A00B0BB3C /* transmission.c */; };
     251                BEFC1E2F0C07861A00B0BB3C /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF60C07861A00B0BB3C /* session.c */; };
    252252                BEFC1E300C07861A00B0BB3C /* tracker.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DF70C07861A00B0BB3C /* tracker.h */; };
    253253                BEFC1E310C07861A00B0BB3C /* tracker.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF80C07861A00B0BB3C /* tracker.c */; };
    254254                BEFC1E320C07861A00B0BB3C /* torrent.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF90C07861A00B0BB3C /* torrent.c */; };
    255                 BEFC1E350C07861A00B0BB3C /* shared.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DFC0C07861A00B0BB3C /* shared.h */; };
    256                 BEFC1E360C07861A00B0BB3C /* shared.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DFD0C07861A00B0BB3C /* shared.c */; };
     255                BEFC1E350C07861A00B0BB3C /* port-forwarding.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DFC0C07861A00B0BB3C /* port-forwarding.h */; };
     256                BEFC1E360C07861A00B0BB3C /* port-forwarding.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DFD0C07861A00B0BB3C /* port-forwarding.c */; };
    257257                BEFC1E390C07861A00B0BB3C /* ratecontrol.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1E000C07861A00B0BB3C /* ratecontrol.h */; };
    258258                BEFC1E3A0C07861A00B0BB3C /* ratecontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1E010C07861A00B0BB3C /* ratecontrol.c */; };
    … …  
    267267                BEFC1E4B0C07861A00B0BB3C /* ipcparse.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1E120C07861A00B0BB3C /* ipcparse.h */; };
    268268                BEFC1E4C0C07861A00B0BB3C /* ipcparse.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1E130C07861A00B0BB3C /* ipcparse.c */; };
    269                 BEFC1E4D0C07861A00B0BB3C /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1E140C07861A00B0BB3C /* internal.h */; };
     269                BEFC1E4D0C07861A00B0BB3C /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1E140C07861A00B0BB3C /* session.h */; };
    270270                BEFC1E4E0C07861A00B0BB3C /* inout.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1E150C07861A00B0BB3C /* inout.h */; };
    271271                BEFC1E4F0C07861A00B0BB3C /* inout.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1E160C07861A00B0BB3C /* inout.c */; };
    … …  
    700700                BEFC1DF40C07861A00B0BB3C /* upnp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = upnp.c; path = libtransmission/upnp.c; sourceTree = "<group>"; };
    701701                BEFC1DF50C07861A00B0BB3C /* transmission.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = transmission.h; path = libtransmission/transmission.h; sourceTree = "<group>"; };
    702                 BEFC1DF60C07861A00B0BB3C /* transmission.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmission.c; path = libtransmission/transmission.c; sourceTree = "<group>"; };
     702                BEFC1DF60C07861A00B0BB3C /* session.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = session.c; path = libtransmission/session.c; sourceTree = "<group>"; };
    703703                BEFC1DF70C07861A00B0BB3C /* tracker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tracker.h; path = libtransmission/tracker.h; sourceTree = "<group>"; };
    704704                BEFC1DF80C07861A00B0BB3C /* tracker.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tracker.c; path = libtransmission/tracker.c; sourceTree = "<group>"; };
    705705                BEFC1DF90C07861A00B0BB3C /* torrent.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = torrent.c; path = libtransmission/torrent.c; sourceTree = "<group>"; };
    706                 BEFC1DFC0C07861A00B0BB3C /* shared.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = shared.h; path = libtransmission/shared.h; sourceTree = "<group>"; };
    707                 BEFC1DFD0C07861A00B0BB3C /* shared.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = shared.c; path = libtransmission/shared.c; sourceTree = "<group>"; };
     706                BEFC1DFC0C07861A00B0BB3C /* port-forwarding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "port-forwarding.h"; path = "libtransmission/port-forwarding.h"; sourceTree = "<group>"; };
     707                BEFC1DFD0C07861A00B0BB3C /* port-forwarding.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = "port-forwarding.c"; path = "libtransmission/port-forwarding.c"; sourceTree = "<group>"; };
    708708                BEFC1E000C07861A00B0BB3C /* ratecontrol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ratecontrol.h; path = libtransmission/ratecontrol.h; sourceTree = "<group>"; };
    709709                BEFC1E010C07861A00B0BB3C /* ratecontrol.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ratecontrol.c; path = libtransmission/ratecontrol.c; sourceTree = "<group>"; };
    … …  
    718718                BEFC1E120C07861A00B0BB3C /* ipcparse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ipcparse.h; path = libtransmission/ipcparse.h; sourceTree = "<group>"; };
    719719                BEFC1E130C07861A00B0BB3C /* ipcparse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipcparse.c; path = libtransmission/ipcparse.c; sourceTree = "<group>"; };
    720                 BEFC1E140C07861A00B0BB3C /* internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = internal.h; path = libtransmission/internal.h; sourceTree = "<group>"; };
     720                BEFC1E140C07861A00B0BB3C /* session.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = session.h; path = libtransmission/session.h; sourceTree = "<group>"; };
    721721                BEFC1E150C07861A00B0BB3C /* inout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = inout.h; path = libtransmission/inout.h; sourceTree = "<group>"; };
    722722                BEFC1E160C07861A00B0BB3C /* inout.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = inout.c; path = libtransmission/inout.c; sourceTree = "<group>"; };
    … …  
    10771077                                BEFC1DF40C07861A00B0BB3C /* upnp.c */,
    10781078                                BEFC1DF50C07861A00B0BB3C /* transmission.h */,
    1079                                 BEFC1DF60C07861A00B0BB3C /* transmission.c */,
     1079                                BEFC1DF60C07861A00B0BB3C /* session.c */,
     1080                                BEFC1E140C07861A00B0BB3C /* session.h */,
    10801081                                A20152790D1C26EB0081714F /* torrent-ctor.c */,
    10811082                                BEFC1DF70C07861A00B0BB3C /* tracker.h */,
    10821083                                BEFC1DF80C07861A00B0BB3C /* tracker.c */,
    10831084                                BEFC1DF90C07861A00B0BB3C /* torrent.c */,
    1084                                 BEFC1DFC0C07861A00B0BB3C /* shared.h */,
    1085                                 BEFC1DFD0C07861A00B0BB3C /* shared.c */,
     1085                                BEFC1DFC0C07861A00B0BB3C /* port-forwarding.h */,
     1086                                BEFC1DFD0C07861A00B0BB3C /* port-forwarding.c */,
    10861087                                BEFC1E000C07861A00B0BB3C /* ratecontrol.h */,
    10871088                                BEFC1E010C07861A00B0BB3C /* ratecontrol.c */,
    … …  
    10961097                                BEFC1E120C07861A00B0BB3C /* ipcparse.h */,
    10971098                                BEFC1E130C07861A00B0BB3C /* ipcparse.c */,
    1098                                 BEFC1E140C07861A00B0BB3C /* internal.h */,
    10991099                                BEFC1E150C07861A00B0BB3C /* inout.h */,
    11001100                                BEFC1E160C07861A00B0BB3C /* inout.c */,
    … …  
    13391339                                BEFC1E2E0C07861A00B0BB3C /* transmission.h in Headers */,
    13401340                                BEFC1E300C07861A00B0BB3C /* tracker.h in Headers */,
    1341                                 BEFC1E350C07861A00B0BB3C /* shared.h in Headers */,
     1341                                BEFC1E350C07861A00B0BB3C /* port-forwarding.h in Headers */,
    13421342                                BEFC1E390C07861A00B0BB3C /* ratecontrol.h in Headers */,
    13431343                                BEFC1E3B0C07861A00B0BB3C /* platform.h in Headers */,
    … …  
    13461346                                BEFC1E490C07861A00B0BB3C /* metainfo.h in Headers */,
    13471347                                BEFC1E4B0C07861A00B0BB3C /* ipcparse.h in Headers */,
    1348                                 BEFC1E4D0C07861A00B0BB3C /* internal.h in Headers */,
     1348                                BEFC1E4D0C07861A00B0BB3C /* session.h in Headers */,
    13491349                                BEFC1E4E0C07861A00B0BB3C /* inout.h in Headers */,
    13501350                                BEFC1E520C07861A00B0BB3C /* fdlimit.h in Headers */,
    … …  
    17551755                                BEFC1E2B0C07861A00B0BB3C /* utils.c in Sources */,
    17561756                                BEFC1E2D0C07861A00B0BB3C /* upnp.c in Sources */,
    1757                                 BEFC1E2F0C07861A00B0BB3C /* transmission.c in Sources */,
     1757                                BEFC1E2F0C07861A00B0BB3C /* session.c in Sources */,
    17581758                                BEFC1E310C07861A00B0BB3C /* tracker.c in Sources */,
    17591759                                BEFC1E320C07861A00B0BB3C /* torrent.c in Sources */,
    1760                                 BEFC1E360C07861A00B0BB3C /* shared.c in Sources */,
     1760                                BEFC1E360C07861A00B0BB3C /* port-forwarding.c in Sources */,
    17611761                                BEFC1E3A0C07861A00B0BB3C /* ratecontrol.c in Sources */,
    17621762                                BEFC1E3C0C07861A00B0BB3C /* platform.c in Sources */,

  • trunk/macosx/Controller.m

    r5578 r5586  
    39783978        return fTorrents;
    39793979   
    3980     NSMutableArray * torrents = [NSMutableArray array];
    3981    
    3982     NSEnumerator * torrentEnum = [fTorrents objectEnumerator], * idEnum;
    3983     int torId;
     3980    NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [idlist count]];
     3981   
     3982    NSEnumerator * torrentEnum = [fTorrents objectEnumerator];
    39843983    Torrent * torrent;
    3985     NSNumber * tempId;
    39863984    while ((torrent = [torrentEnum nextObject]))
    39873985    {
    3988         torId = [torrent torrentID];
    3989        
    3990         idEnum = [idlist objectEnumerator];
     3986        int torId = [torrent torrentID];
     3987       
     3988        NSEnumerator * idEnum = [idlist objectEnumerator];
     3989        NSNumber * tempId;
    39913990        while ((tempId = [idEnum nextObject]))
    39923991        {
    … …  
    40074006        return fTorrents;
    40084007   
    4009     NSMutableArray * torrents = [NSMutableArray array];
    4010    
    4011     NSEnumerator * torrentEnum = [fTorrents objectEnumerator], * hashEnum;
    4012     NSString * torHash, * tempHash;
     4008    NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [hashlist count]];
     4009   
     4010    NSEnumerator * torrentEnum = [fTorrents objectEnumerator];
    40134011    Torrent * torrent;
    40144012    while ((torrent = [torrentEnum nextObject]))
    40154013    {
    4016         torHash = [torrent hashString];
    4017        
    4018         hashEnum = [hashlist objectEnumerator];
     4014        NSString * torHash = [torrent hashString], * tempHash;
     4015       
     4016        NSEnumerator * hashEnum = [hashlist objectEnumerator];
    40194017        while ((tempHash = [hashEnum nextObject]))
    40204018        {

  • trunk/macosx/TorrentCell.m

    r5581 r5586  
    679679            {
    680680                int notAvailableWidth = MIN(ceil(barRect.size.width * [torrent notAvailableDesired]), rightWidth);
    681                 rightWidth -= notAvailableWidth;
    682                
    683681                if (notAvailableWidth > 0)
    684682                {
     683                    rightWidth -= notAvailableWidth;
     684                   
    685685                    NSRect notAvailableRect = barRect;
    686686                    notAvailableRect.origin.x += leftWidth + rightWidth;
Note: See TracChangeset for help on using the changeset viewer.