From 33c9f92e99ea539e536da8b679c1acfbd272c0db Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 22 Apr 2008 13:16:39 +0000 Subject: [PATCH] remove an unnecessary class --- Transmission.xcodeproj/project.pbxproj | 6 ----- macosx/Controller.m | 7 ++---- macosx/ToolbarSegmentedCell.h | 29 ---------------------- macosx/ToolbarSegmentedCell.m | 34 -------------------------- macosx/Torrent.m | 4 +-- 5 files changed, 4 insertions(+), 76 deletions(-) delete mode 100644 macosx/ToolbarSegmentedCell.h delete mode 100644 macosx/ToolbarSegmentedCell.m diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 874597c0d..5bf95b732 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -78,7 +78,6 @@ A20B6F8C0C4D90980034AB1D /* PriorityMixed.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F8B0C4D90980034AB1D /* PriorityMixed.png */; }; A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FA40C4D97840034AB1D /* PriorityNone.png */; }; A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */; }; - A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */; }; A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; }; A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; }; A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A219798A0D07B78400438EA7 /* GroupToolbarItem.m */; }; @@ -448,8 +447,6 @@ A20B6F8B0C4D90980034AB1D /* PriorityMixed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityMixed.png; path = macosx/Images/PriorityMixed.png; sourceTree = ""; }; A20B6FA40C4D97840034AB1D /* PriorityNone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNone.png; path = macosx/Images/PriorityNone.png; sourceTree = ""; }; A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNormal.png; path = macosx/Images/PriorityNormal.png; sourceTree = ""; }; - A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolbarSegmentedCell.h; path = macosx/ToolbarSegmentedCell.h; sourceTree = ""; }; - A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolbarSegmentedCell.m; path = macosx/ToolbarSegmentedCell.m; sourceTree = ""; }; A21282A50CA6C66800EAEE0F /* StatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StatusBarView.h; path = macosx/StatusBarView.h; sourceTree = ""; }; A21282A60CA6C66800EAEE0F /* StatusBarView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = StatusBarView.m; path = macosx/StatusBarView.m; sourceTree = ""; }; A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSBezierPathAdditions.m; path = macosx/NSBezierPathAdditions.m; sourceTree = ""; }; @@ -884,8 +881,6 @@ A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */, A21979890D07B78400438EA7 /* GroupToolbarItem.h */, A219798A0D07B78400438EA7 /* GroupToolbarItem.m */, - A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */, - A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */, A22180960D148A71007D09ED /* GroupsWindowController.h */, A22180970D148A71007D09ED /* GroupsWindowController.m */, A2FB701A0D95CAEA0001F331 /* GroupsController.h */, @@ -1858,7 +1853,6 @@ A25892640CF1F7E800CCCDDF /* StatsWindowController.m in Sources */, A2C89D600CFCBF57004CC2BC /* ButtonToolbarItem.m in Sources */, A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */, - A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */, 3C7A11950D0B2EE300B5701F /* getgateway.c in Sources */, 3C7A11960D0B2EE300B5701F /* natpmp.c in Sources */, A26397550D0F714300D36DF2 /* ActionPopUpButton.m in Sources */, diff --git a/macosx/Controller.m b/macosx/Controller.m index 64fe51741..f9e06bd43 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -35,7 +35,6 @@ #import "AboutWindowController.h" #import "ButtonToolbarItem.h" #import "GroupToolbarItem.h" -#import "ToolbarSegmentedCell.h" #import "NSApplicationAdditions.h" #import "NSStringAdditions.h" #import "NSMenuAdditions.h" @@ -3092,8 +3091,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi { GroupToolbarItem * groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier: ident]; - NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] initWithFrame: NSZeroRect]; - [segmentedControl setCell: [[[ToolbarSegmentedCell alloc] init] autorelease]]; + NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] init]; [groupItem setView: segmentedControl]; NSSegmentedCell * segmentedCell = (NSSegmentedCell *)[segmentedControl cell]; @@ -3131,8 +3129,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi { GroupToolbarItem * groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier: ident]; - NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] initWithFrame: NSZeroRect]; - [segmentedControl setCell: [[[ToolbarSegmentedCell alloc] init] autorelease]]; + NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] init]; [groupItem setView: segmentedControl]; NSSegmentedCell * segmentedCell = (NSSegmentedCell *)[segmentedControl cell]; diff --git a/macosx/ToolbarSegmentedCell.h b/macosx/ToolbarSegmentedCell.h deleted file mode 100644 index e07adc316..000000000 --- a/macosx/ToolbarSegmentedCell.h +++ /dev/null @@ -1,29 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Copyright (c) 2007-2008 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import - -@interface ToolbarSegmentedCell : NSSegmentedCell - -@end diff --git a/macosx/ToolbarSegmentedCell.m b/macosx/ToolbarSegmentedCell.m deleted file mode 100644 index 0d8539983..000000000 --- a/macosx/ToolbarSegmentedCell.m +++ /dev/null @@ -1,34 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Copyright (c) 2007-2008 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import "ToolbarSegmentedCell.h" - -@implementation ToolbarSegmentedCell - -- (NSControlSize) controlSize -{ - return NSRegularControlSize; -} - -@end diff --git a/macosx/Torrent.m b/macosx/Torrent.m index c97c9ab31..4d5dd10e3 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -924,7 +924,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * - (BOOL) isError { - return fStat->error != 0; + return fStat->error != TR_OK; } - (NSString *) errorMessage @@ -1088,7 +1088,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * } if (fStalled) - string = [NSString stringWithFormat: @"%@, %@", NSLocalizedString(@"Stalled", "Torrent -> status string"), string]; + string = [NSLocalizedString(@"Stalled", "Torrent -> status string") stringByAppendingFormat: @", %@", string]; } //append even if error