[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:12:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a4a0927807881cf03aaf11b2f4c025d9e6601b03
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 14 18:07:23 2002 +0000
Fixed 2919027 -- Need to remove unused code in WebKit/History.subproj
* History.subproj/IFAttributedURL.h: Removed.
* History.subproj/IFBackForwardList.h: Removed large #ifdef.
* History.subproj/IFURIEntry.h,
* History.subproj/IFURIEntry.m: Removed all mention of unused
fields comment, creationDate, modificationDate
* WebKit.pbproj/project.pbxproj: Updated for removed file.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1145 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8fe22d7..ac31baf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-14 John Sullivan <sullivan at apple.com>
+
+ Fixed 2919027 -- Need to remove unused code in WebKit/History.subproj
+
+ * History.subproj/IFAttributedURL.h: Removed.
+ * History.subproj/IFBackForwardList.h: Removed large #ifdef.
+ * History.subproj/IFURIEntry.h,
+ * History.subproj/IFURIEntry.m: Removed all mention of unused
+ fields comment, creationDate, modificationDate
+ * WebKit.pbproj/project.pbxproj: Updated for removed file.
+
2002-05-13 System Administrator <cblu at apple.com>
Added support for setting the content policy on the location change handler
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8fe22d7..ac31baf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-05-14 John Sullivan <sullivan at apple.com>
+
+ Fixed 2919027 -- Need to remove unused code in WebKit/History.subproj
+
+ * History.subproj/IFAttributedURL.h: Removed.
+ * History.subproj/IFBackForwardList.h: Removed large #ifdef.
+ * History.subproj/IFURIEntry.h,
+ * History.subproj/IFURIEntry.m: Removed all mention of unused
+ fields comment, creationDate, modificationDate
+ * WebKit.pbproj/project.pbxproj: Updated for removed file.
+
2002-05-13 System Administrator <cblu at apple.com>
Added support for setting the content policy on the location change handler
diff --git a/WebKit/History.subproj/IFAttributedURL.h b/WebKit/History.subproj/IFAttributedURL.h
deleted file mode 100644
index 2b3aff4..0000000
--- a/WebKit/History.subproj/IFAttributedURL.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* IFAttributedURL.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#ifdef NEW_WEBKIT_API
-
-//=============================================================================
-//
-// IFAttributedURL.h
-//
-// IFAttributedURL is the class that is used to store a "reference" to a URL
-// in the various history and bookmark mechanisms. It provides some attributes
-// that clients can use to "decorate" a URL with data that a user might find
-// useful in organizing their internet and browsing experience.
-//
- at interface IFAttributedURL : NSObject
-{
- // The URL that serves as the "anchor" for the accompanying attributes.
- NSURL *url;
-
- // The human-readable title of the URL. Taken from the <TITLE> tag
- // in the case of an HTML document.
- NSString *title;
-
- // An icon to associate with the URL. Can be determined by mime type,
- // file extensions, or the various and sundry "favicon.ico" strategies.
- NSImage *image;
-
- // A place for users to add their own comments.
- NSString *comment;
-
- // The date of object creation.
- NSDate *creationDate;
-
- // The date that any of the settable fields was last changed.
- NSDate *modificationDate;
-
- // The date that the URL was last visited by the user.
- NSDate *lastVisitedDate;
-
- // The total number of times the URL has been visited.
- int visits;
-}
-
-//
-// Initializes a IFAttributedURL object, setting the URL to the given
-// object, the creation and modification dates to "now" and all other
-// fields to empty values (nil or zero).
-//
--(id)initWithURL:(NSURL *)url;
-
-//
-// Initializes a IFAttributedURL object, setting the URL and title to
-// the given objects, the creation and modification dates to "now" and
-// all other fields to empty values (nil or zero).
-//
--(id)initWithURL:(NSURL *)url title:(NSString *)title;
-
-//
-// Returns the URL that serves as the "anchor" for the accompanying
-// attributes.
-//
--(NSURL *)url;
-
-//
-// Returns the human-readable title of the URL, or nil if no title
-// has been set
-//
--(NSString *)title;
-
-//
-// Returns the icon associated with the URL, or nil if no icon image
-// has been set. Note that the image can be determined by mime type,
-// file extensions, or the various and sundry "favicon.ico" strategies.
-//
--(NSImage *)image;
-
-//
-// Returns the comment string set by the user, if any, or nil if no
-// comment has been set.
-//
--(NSString *)comment;
-
-//
-// Returns the date of object creation. This value is immutable.
-//
--(NSDate *)creationDate;
-
-//
-// Returns the date that any of the settable fields was last changed.
-//
--(NSDate *)modificationDate;
-
-//
-// Returns the date that the URL was last visited by the user, or nil
-// if the URL has never been visited.
-//
--(NSDate *)lastVisitedDate;
-
-//
-// Returns the total number of times the URL has been visited.
-//
--(int)visits;
-
-//
-// Sets the URL of the receiver to the given object.
-//
--(void)setURL:(NSURL *)aURL;
-
-//
-// Sets the title of the receiver to the given object.
-//
--(void)setTitle:(NSString *)aTitle;
-
-//
-// Sets the image of the receiver to the given object.
-//
--(void)setImage:(NSImage *)anImage;
-
-//
-// Sets the comment of the receiver to the given object.
-//
--(void)setComment:(NSString *)aComment;
-
-//
-// Sets the modification date of the receiver to the given object.
-//
--(void)setModificationDate:(NSDate *)aDate;
-
-//
-// Sets the last-visited date of the receiver to the given object.
-//
--(void)setLastVisitedDate:(NSDate *)aDate;
-
-//
-// Increments the visited field of the receiver by 1 (one).
-//
--(void)incrementVisits;
-
-//
-// Returns a hash code for the receiver.
-//
--(unsigned)hash;
-
-//
-// Returns YES if the receiver is equal to the given object, no otherwise.
-// Two IFAttributedURL objects are equal if and only if they have the
-// equal URLs and creation dates.
-//
--(BOOL)isEqual:(id)anObject;
-
- at end
-
-//=============================================================================
-
-#endif // NEW_WEBKIT_API
diff --git a/WebKit/History.subproj/IFBackForwardList.h b/WebKit/History.subproj/IFBackForwardList.h
index ff94568..2b32010 100644
--- a/WebKit/History.subproj/IFBackForwardList.h
+++ b/WebKit/History.subproj/IFBackForwardList.h
@@ -36,38 +36,4 @@
-(BOOL)canGoBack;
-(BOOL)canGoForward;
- at end
-
-
-#ifdef NEW_WEBKIT_API
-
-//=============================================================================
-//
-// IFBackForwardList.h
-//
-// It provides the list that enables the "Back" and "Forward" buttons to
-// work correctly. As such, it is merely a user convenience that aids in
-// basic navigation in ways that users have come to expect.
-//
-
- at interface IFBackForwardList
-{
-
--(id)init;
-
--(void)addAttributedURL:(IFAttributedURL *)url;
-
--(IFAttributedURL *)back;
--(IFAttributedURL *)forward;
-
--(NSArray *)backList;
--(NSArray *)forwardList;
-
--(BOOL)canGoBack;
--(BOOL)canGoForward;
-
-}
-
-//=============================================================================
-
-#endif // NEW_WEBKIT_API
+ at end
\ No newline at end of file
diff --git a/WebKit/History.subproj/IFURIEntry.h b/WebKit/History.subproj/IFURIEntry.h
index 26b678f..e4eaa5f 100644
--- a/WebKit/History.subproj/IFURIEntry.h
+++ b/WebKit/History.subproj/IFURIEntry.h
@@ -14,16 +14,12 @@
NSString *_title;
NSString *_displayTitle;
NSImage *_image;
- NSString *_comment;
- NSCalendarDate *_creationDate;
- NSCalendarDate *_modificationDate;
NSCalendarDate *_lastVisitedDate;
}
-(id)init;
-(id)initWithURL:(NSURL *)url title:(NSString *)title;
-(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image;
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image comment:(NSString *)comment;
- (NSDictionary *)dictionaryRepresentation;
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
@@ -32,18 +28,12 @@
-(NSString *)title;
-(NSString *)displayTitle;
-(NSImage *)image;
--(NSString *)comment;
--(NSCalendarDate *)creationDate;
--(NSCalendarDate *)modificationDate;
-(NSCalendarDate *)lastVisitedDate;
-(void)setURL:(NSURL *)url;
-(void)setTitle:(NSString *)title;
-(void)setDisplayTitle:(NSString *)displayTitle;
-(void)setImage:(NSImage *)image;
--(void)setComment:(NSString *)comment;
--(void)setModificationDate:(NSCalendarDate *)date;
--(void)setLastVisitedDate:(NSCalendarDate *)date;
-(unsigned)hash;
-(BOOL)isEqual:(id)anObject;
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
index 5772e6b..42231a0 100644
--- a/WebKit/History.subproj/IFURIEntry.m
+++ b/WebKit/History.subproj/IFURIEntry.m
@@ -13,21 +13,16 @@
-(id)init
{
- return [self initWithURL:nil title:nil image:nil comment:nil];
+ return [self initWithURL:nil title:nil image:nil];
}
-(id)initWithURL:(NSURL *)url title:(NSString *)title
{
- return [self initWithURL:url title:title image:nil comment:nil];
+ return [self initWithURL:url title:title image:nil];
}
-(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image
{
- return [self initWithURL:url title:title image:image comment:nil];
-}
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image comment:(NSString *)comment
-{
if (self != [super init])
{
return nil;
@@ -36,9 +31,6 @@
_url = [url retain];
_title = [title retain];
_image = [image retain];
- _comment = [comment retain];
- _creationDate = [[NSCalendarDate alloc] init];
- _modificationDate = [[NSCalendarDate alloc] init];
_lastVisitedDate = [[NSCalendarDate alloc] init];
return self;
@@ -49,9 +41,6 @@
[_url release];
[_title release];
[_image release];
- [_comment release];
- [_creationDate release];
- [_modificationDate release];
[_lastVisitedDate release];
[super dealloc];
@@ -95,21 +84,6 @@
return defaultImage;
}
--(NSString *)comment
-{
- return _comment;
-}
-
--(NSCalendarDate *)creationDate;
-{
- return _creationDate;
-}
-
--(NSCalendarDate *)modificationDate;
-{
- return _modificationDate;
-}
-
-(NSCalendarDate *)lastVisitedDate
{
return _lastVisitedDate;
@@ -147,22 +121,6 @@
}
}
--(void)setComment:(NSString *)comment
-{
- if (comment != _comment) {
- [_comment release];
- _comment = [comment retain];
- }
-}
-
--(void)setModificationDate:(NSCalendarDate *)date
-{
- if (date != _modificationDate) {
- [_modificationDate release];
- _modificationDate = [date retain];
- }
-}
-
-(void)setLastVisitedDate:(NSCalendarDate *)date
{
if (date != _lastVisitedDate) {
@@ -209,17 +167,6 @@
if (_displayTitle != nil) {
[dict setObject: _displayTitle forKey: @"displayTitle"];
}
- if (_comment != nil) {
- [dict setObject: _comment forKey: @"comment"];
- }
- if (_creationDate != nil) {
- [dict setObject: [NSString stringWithFormat:@"%lf", [_creationDate timeIntervalSinceReferenceDate]]
- forKey: @"creationDate"];
- }
- if (_modificationDate != nil) {
- [dict setObject: [NSString stringWithFormat:@"%lf", [_modificationDate timeIntervalSinceReferenceDate]]
- forKey: @"modificationDate"];
- }
if (_lastVisitedDate != nil) {
[dict setObject: [NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
forKey: @"lastVisitedDate"];
@@ -241,11 +188,6 @@
}
_title = [[dict objectForKey: @"title"] retain];
_displayTitle = [[dict objectForKey: @"displayTitle"] retain];
- _comment = [[dict objectForKey: @"comment"] retain];
- _creationDate = [[[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
- [[dict objectForKey: @"creationDate"] doubleValue]] retain];
- _modificationDate = [[[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
- [[dict objectForKey: @"modificationDate"] doubleValue]] retain];
_lastVisitedDate = [[[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
[[dict objectForKey: @"lastVisitedDate"] doubleValue]] retain];
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index ff94568..2b32010 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -36,38 +36,4 @@
-(BOOL)canGoBack;
-(BOOL)canGoForward;
- at end
-
-
-#ifdef NEW_WEBKIT_API
-
-//=============================================================================
-//
-// IFBackForwardList.h
-//
-// It provides the list that enables the "Back" and "Forward" buttons to
-// work correctly. As such, it is merely a user convenience that aids in
-// basic navigation in ways that users have come to expect.
-//
-
- at interface IFBackForwardList
-{
-
--(id)init;
-
--(void)addAttributedURL:(IFAttributedURL *)url;
-
--(IFAttributedURL *)back;
--(IFAttributedURL *)forward;
-
--(NSArray *)backList;
--(NSArray *)forwardList;
-
--(BOOL)canGoBack;
--(BOOL)canGoForward;
-
-}
-
-//=============================================================================
-
-#endif // NEW_WEBKIT_API
+ at end
\ No newline at end of file
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 26b678f..e4eaa5f 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -14,16 +14,12 @@
NSString *_title;
NSString *_displayTitle;
NSImage *_image;
- NSString *_comment;
- NSCalendarDate *_creationDate;
- NSCalendarDate *_modificationDate;
NSCalendarDate *_lastVisitedDate;
}
-(id)init;
-(id)initWithURL:(NSURL *)url title:(NSString *)title;
-(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image;
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image comment:(NSString *)comment;
- (NSDictionary *)dictionaryRepresentation;
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
@@ -32,18 +28,12 @@
-(NSString *)title;
-(NSString *)displayTitle;
-(NSImage *)image;
--(NSString *)comment;
--(NSCalendarDate *)creationDate;
--(NSCalendarDate *)modificationDate;
-(NSCalendarDate *)lastVisitedDate;
-(void)setURL:(NSURL *)url;
-(void)setTitle:(NSString *)title;
-(void)setDisplayTitle:(NSString *)displayTitle;
-(void)setImage:(NSImage *)image;
--(void)setComment:(NSString *)comment;
--(void)setModificationDate:(NSCalendarDate *)date;
--(void)setLastVisitedDate:(NSCalendarDate *)date;
-(unsigned)hash;
-(BOOL)isEqual:(id)anObject;
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 5772e6b..42231a0 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -13,21 +13,16 @@
-(id)init
{
- return [self initWithURL:nil title:nil image:nil comment:nil];
+ return [self initWithURL:nil title:nil image:nil];
}
-(id)initWithURL:(NSURL *)url title:(NSString *)title
{
- return [self initWithURL:url title:title image:nil comment:nil];
+ return [self initWithURL:url title:title image:nil];
}
-(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image
{
- return [self initWithURL:url title:title image:image comment:nil];
-}
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image comment:(NSString *)comment
-{
if (self != [super init])
{
return nil;
@@ -36,9 +31,6 @@
_url = [url retain];
_title = [title retain];
_image = [image retain];
- _comment = [comment retain];
- _creationDate = [[NSCalendarDate alloc] init];
- _modificationDate = [[NSCalendarDate alloc] init];
_lastVisitedDate = [[NSCalendarDate alloc] init];
return self;
@@ -49,9 +41,6 @@
[_url release];
[_title release];
[_image release];
- [_comment release];
- [_creationDate release];
- [_modificationDate release];
[_lastVisitedDate release];
[super dealloc];
@@ -95,21 +84,6 @@
return defaultImage;
}
--(NSString *)comment
-{
- return _comment;
-}
-
--(NSCalendarDate *)creationDate;
-{
- return _creationDate;
-}
-
--(NSCalendarDate *)modificationDate;
-{
- return _modificationDate;
-}
-
-(NSCalendarDate *)lastVisitedDate
{
return _lastVisitedDate;
@@ -147,22 +121,6 @@
}
}
--(void)setComment:(NSString *)comment
-{
- if (comment != _comment) {
- [_comment release];
- _comment = [comment retain];
- }
-}
-
--(void)setModificationDate:(NSCalendarDate *)date
-{
- if (date != _modificationDate) {
- [_modificationDate release];
- _modificationDate = [date retain];
- }
-}
-
-(void)setLastVisitedDate:(NSCalendarDate *)date
{
if (date != _lastVisitedDate) {
@@ -209,17 +167,6 @@
if (_displayTitle != nil) {
[dict setObject: _displayTitle forKey: @"displayTitle"];
}
- if (_comment != nil) {
- [dict setObject: _comment forKey: @"comment"];
- }
- if (_creationDate != nil) {
- [dict setObject: [NSString stringWithFormat:@"%lf", [_creationDate timeIntervalSinceReferenceDate]]
- forKey: @"creationDate"];
- }
- if (_modificationDate != nil) {
- [dict setObject: [NSString stringWithFormat:@"%lf", [_modificationDate timeIntervalSinceReferenceDate]]
- forKey: @"modificationDate"];
- }
if (_lastVisitedDate != nil) {
[dict setObject: [NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
forKey: @"lastVisitedDate"];
@@ -241,11 +188,6 @@
}
_title = [[dict objectForKey: @"title"] retain];
_displayTitle = [[dict objectForKey: @"displayTitle"] retain];
- _comment = [[dict objectForKey: @"comment"] retain];
- _creationDate = [[[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
- [[dict objectForKey: @"creationDate"] doubleValue]] retain];
- _modificationDate = [[[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
- [[dict objectForKey: @"modificationDate"] doubleValue]] retain];
_lastVisitedDate = [[[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
[[dict objectForKey: @"lastVisitedDate"] doubleValue]] retain];
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index aa5ab5b..ac0460e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -201,7 +201,6 @@
39446092020F50ED0ECA1767,
39446093020F50ED0ECA1767,
39446094020F50ED0ECA1767,
- 39446095020F50ED0ECA1767,
39446096020F50ED0ECA1767,
39446097020F50ED0ECA1767,
39446098020F50ED0ECA1767,
@@ -436,7 +435,6 @@
};
25A8176801B5474B0ECA149E = {
children = (
- 3944607C020F50ED0ECA1767,
3944607D020F50ED0ECA1767,
3944607E020F50ED0ECA1767,
3944607F020F50ED0ECA1767,
@@ -728,11 +726,6 @@
path = Misc.subproj/IFException.m;
refType = 4;
};
- 3944607C020F50ED0ECA1767 = {
- isa = PBXFileReference;
- path = IFAttributedURL.h;
- refType = 4;
- };
3944607D020F50ED0ECA1767 = {
isa = PBXFileReference;
path = IFBackForwardList.h;
@@ -856,15 +849,6 @@
settings = {
};
};
- 39446095020F50ED0ECA1767 = {
- fileRef = 3944607C020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
39446096020F50ED0ECA1767 = {
fileRef = 3944607D020F50ED0ECA1767;
isa = PBXBuildFile;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list