Use common IFS prefix for all iTunesFS classes to avoid name clashes

Author: znek

GNUmakefile

@@ -48,14 +48,14 @@ iTunesFS_OBJC_FILES +=				\
 						\
 	iTunesFileSystem.m			\
 						\
-	iTunesLibrary.m				\
-	iPodLibrary.m				\
-	JBiPodLibrary.m				\
-	iTunesPlaylist.m			\
-	iTunesM3UPlaylist.m			\
-	iTunesTrack.m				\
-	iTunesFormatFile.m			\
-	iTunesFSFormatter.m			\
+	IFSiTunesLibrary.m			\
+	IFSiPodLibrary.m			\
+	IFSJBiPodLibrary.m			\
+	IFSiTunesPlaylist.m			\
+	IFSM3UPlaylist.m			\
+	IFSiTunesTrack.m			\
+	IFSFormatFile.m				\
+	IFSFormatter.m				\
 						\
 	StreamReader.m				\
 	NSString+Extensions.m			\

iTunesFormatFile.h IFSFormatFile.h

@@ -30,14 +30,14 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef	__iTunesFS_iTunesFormatFile_H
-#define	__iTunesFS_iTunesFormatFile_H
+#ifndef	__iTunesFS_IFSFormatFile_H
+#define	__iTunesFS_IFSFormatFile_H
 
 #import "FUSEOFSMemoryFile.h"
 
-@class iTunesFSFormatter;
+@class IFSFormatter;
 
-@interface iTunesFormatFile : FUSEOFSMemoryFile
+@interface IFSFormatFile : FUSEOFSMemoryFile
 {
 	NSString *defaultTemplate;
   NSString *defaultKey;
@@ -49,8 +49,8 @@
 
 - (void)remove;
 
-- (iTunesFSFormatter *)getFormatter;
+- (IFSFormatter *)getFormatter;
 
-@end /* iTunesFormatFile */
+@end /* IFSFormatFile */
 
-#endif	/* __iTunesFS_iTunesFormatFile_H */
+#endif	/* __iTunesFS_IFSFormatFile_H */

iTunesFormatFile.m IFSFormatFile.m

@@ -30,18 +30,18 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import "iTunesFormatFile.h"
-#import "iTunesFSFormatter.h"
+#import "IFSFormatFile.h"
+#import "IFSFormatter.h"
 #import "NSObject+FUSEOFS.h"
 
-@interface iTunesFormatFile (Private)
+@interface IFSFormatFile (Private)
 - (void)_setup;
 - (NSString *)defaultKeyForTemplateId:(NSString *)_id;
 - (NSString *)templateDefaultFormatString;
 - (NSString *)templateFormatString;
 @end
 
-@implementation iTunesFormatFile
+@implementation IFSFormatFile
 
 static BOOL           doDebug  = NO;
 static NSCharacterSet *trimSet = nil;
@@ -53,7 +53,7 @@ + (void)initialize {
   if (didInit) return;
   didInit = YES;
   ud      = [NSUserDefaults standardUserDefaults];
-  doDebug = [ud boolForKey:@"iTunesFormatFileDebugEnabled"];
+  doDebug = [ud boolForKey:@"IFSFormatFileDebugEnabled"];
   trimSet = [[NSCharacterSet characterSetWithCharactersInString:@"\n\r\t "]
                              copy];
 }
@@ -140,7 +140,7 @@ - (NSString *)templateFormatString {
 
 /* accessors */
 
-- (iTunesFSFormatter *)getFormatter {
+- (IFSFormatter *)getFormatter {
   NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
   NSString *fmtKey = nil;
   NSString *fmt = nil;
@@ -165,13 +165,13 @@ - (iTunesFSFormatter *)getFormatter {
       NSLog(@"WARN: no format found for reference %@ -> alias failed!", fmtKey);
   }
   if (fmt) {
-    return [[[iTunesFSFormatter alloc] initWithFormatString:fmt]
+    return [[[IFSFormatter alloc] initWithFormatString:fmt]
                                        autorelease];
   }
 
   // fallback - hopefully indicates failure appropriately
   fmt = fmtKey;
-  return [[[iTunesFSFormatter alloc] initWithFormatString:fmt] autorelease];
+  return [[[IFSFormatter alloc] initWithFormatString:fmt] autorelease];
 }
 
 - (void)remove {
@@ -254,4 +254,4 @@ - (NSDictionary *)extendedFileAttributes {
 }
 #endif
 
-@end /* iTunesFormatFile */
+@end /* IFSFormatFile */

iTunesFSFormatter.h IFSFormatter.h

@@ -30,12 +30,12 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef	__iTunesFS_iTunesFSFormatter_H
-#define	__iTunesFS_iTunesFSFormatter_H
+#ifndef	__iTunesFS_IFSFormatter_H
+#define	__iTunesFS_IFSFormatter_H
 
 #import <Foundation/Foundation.h>
 
-@interface iTunesFSFormatter : NSObject
+@interface IFSFormatter : NSObject
 {
   NSString       *format;
   NSMutableArray *formattingOps;
@@ -48,6 +48,6 @@
 - (BOOL)isPathFormat;
 - (NSArray *)pathComponentsByFormattingObject:(id)_obj;
 
-@end /* iTunesFSFormatter */
+@end /* IFSFormatter */
 
-#endif	/* __iTunesFS_iTunesFSFormatter_H */
+#endif	/* __iTunesFS_IFSFormatter_H */

iTunesFSFormatter.m IFSFormatter.m

@@ -31,7 +31,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 */
 
 #import "common.h"
-#import "iTunesFSFormatter.h"
+#import "IFSFormatter.h"
 #import "NSObject+FUSEOFS.h"
 
 @interface iTunesFSFormattingResult : NSObject
@@ -48,13 +48,13 @@ - (NSString *)formattedString;
 
 @end
 
-@interface iTunesFSFormatter (Private)
+@interface IFSFormatter (Private)
 - (void)setupFormattingOps;
 - (void)appendStringToFormattingOps:(NSString *)_s;
 - (NSString *)_stringValueByFormattingObject:(id)_obj;
 @end
 
-@implementation iTunesFSFormatter
+@implementation IFSFormatter
 
 static NSCharacterSet *wsSet                          = nil;
 static NSValue        *appendToBufferValue            = nil;
@@ -202,7 +202,7 @@ - (void)appendStringToFormattingOps:(NSString *)_s {
   [self->formattingOps addObject:_s];
 }
 
-@end /* iTunesFSFormatter */
+@end /* IFSFormatter */
 
 @implementation iTunesFSFormattingResult
 

JBiPodLibrary.h IFSJBiPodLibrary.h

@@ -30,29 +30,29 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef	__iTunesFS_JBiPodLibrary_H
-#define	__iTunesFS_JBiPodLibrary_H
+#ifndef	__iTunesFS_IFSJBiPodLibrary_H
+#define	__iTunesFS_IFSJBiPodLibrary_H
 
-#import "iPodLibrary.h"
+#import "IFSiPodLibrary.h"
 
-@interface JBiPodLibrary : iPodLibrary
+@interface IFSJBiPodLibrary : IFSiPodLibrary
 {
 }
 
-@end // JBiPodLibrary
+@end // IFSJBiPodLibrary
 
 // com.apple.afc
-@interface IPhoneDiskIPodLibrary : JBiPodLibrary
+@interface IPhoneDiskIPodLibrary : IFSJBiPodLibrary
 {
 }
 
 @end // IPhoneDiskIPodLibrary
 
 // com.apple.afc2
-@interface JBiPhoneDiskIPodLibrary : JBiPodLibrary
+@interface JBiPhoneDiskIPodLibrary : IFSJBiPodLibrary
 {
 }
 
 @end // JBiPhoneDiskIPodLibrary
 
-#endif	/* __iTunesFS_JBiPodLibrary_H */
+#endif	/* __iTunesFS_IFSJBiPodLibrary_H */

JBiPodLibrary.m IFSJBiPodLibrary.m

@@ -31,9 +31,9 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 */
 
 #import "common.h"
-#import "JBiPodLibrary.h"
+#import "IFSJBiPodLibrary.h"
 
-@implementation JBiPodLibrary
+@implementation IFSJBiPodLibrary
 
 /* NOTE:
  * This used to be true for old 1.1.x iPhones mounted via SSH
@@ -46,7 +46,7 @@ - (NSString *)iTunesDeviceInfoPath {
   return nil;
 }
 
-@end /* JBiPodLibrary */
+@end /* IFSJBiPodLibrary */
 
 @implementation IPhoneDiskIPodLibrary
 

iTunesM3UPlaylist.h IFSM3UPlaylist.h

@@ -30,20 +30,20 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef	__iTunesFS_iTunesM3UPlaylist_H
-#define	__iTunesFS_iTunesM3UPlaylist_H
+#ifndef	__iTunesFS_IFSM3UPlaylist_H
+#define	__iTunesFS_IFSM3UPlaylist_H
 
 #import <Foundation/Foundation.h>
 
-@class iTunesPlaylist;
+@class IFSiTunesPlaylist;
 
-@interface iTunesM3UPlaylist : NSObject
+@interface IFSM3UPlaylist : NSObject
 {
-	iTunesPlaylist *playlist;
+	IFSiTunesPlaylist *playlist;
 	BOOL useRelativePaths;
 }
 
-- (id)initWithPlaylist:(iTunesPlaylist *)_playlist
+- (id)initWithPlaylist:(IFSiTunesPlaylist *)_playlist
   useRelativePaths:(BOOL)_useRelativePaths;
 
 - (NSString *)name;
@@ -52,6 +52,6 @@
 - (NSString *)fileExtension;
 - (NSStringEncoding)fileEncoding;
 
-@end /* iTunesM3UPlaylist */
+@end /* IFSM3UPlaylist */
 
-#endif	/* __iTunesFS_iTunesM3UPlaylist_H */
+#endif	/* __iTunesFS_IFSM3UPlaylist_H */

iTunesM3UPlaylist.m IFSM3UPlaylist.m

@@ -31,13 +31,13 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 */
 
 #import "common.h"
-#import "iTunesM3UPlaylist.h"
+#import "IFSM3UPlaylist.h"
 #import "NSObject+FUSEOFS.h"
-#import "iTunesPlaylist.h"
-#import "iTunesTrack.h"
-#import "iTunesFSFormatter.h"
+#import "IFSiTunesPlaylist.h"
+#import "IFSiTunesTrack.h"
+#import "IFSFormatter.h"
 
-@implementation iTunesM3UPlaylist
+@implementation IFSM3UPlaylist
 
 static BOOL useM3U8 = NO;
 static NSString *fileExt = nil;
@@ -52,7 +52,7 @@ + (void)initialize {
 	fileExt = [ud stringForKey:@"M3UPlaylistFileExtension"];
 }
 
-- (id)initWithPlaylist:(iTunesPlaylist *)_playlist
+- (id)initWithPlaylist:(IFSiTunesPlaylist *)_playlist
   useRelativePaths:(BOOL)_useRelativePaths
 {
 	self = [super init];
@@ -115,7 +115,7 @@ - (NSDictionary *)fileAttributes {
 - (NSData *)fileContents {
 	NSString *fmt = [[NSUserDefaults standardUserDefaults]
 									  stringForKey:@"M3UTrackFormat"];
-	iTunesFSFormatter *formatter = [[iTunesFSFormatter alloc]
+	IFSFormatter *formatter = [[IFSFormatter alloc]
 									                    initWithFormatString:fmt];
 
 	NSMutableString *rep = [[NSMutableString alloc] init];
@@ -124,7 +124,7 @@ - (NSData *)fileContents {
 	NSArray *tracks = [self tracks];
 	NSUInteger i, count = [tracks count];
 	for (i = 0; i < count; i++) {
-		iTunesTrack *track =  [tracks objectAtIndex:i];
+		IFSiTunesTrack *track =  [tracks objectAtIndex:i];
 		NSString *title = [formatter stringValueByFormattingObject:track];
 		[rep appendFormat:@"#EXTINF:-1,%@\n", title];
 

iPodLibrary.h IFSiPodLibrary.h

@@ -30,12 +30,12 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef	__iTunesFS_iPodLibrary_H
-#define	__iTunesFS_iPodLibrary_H
+#ifndef	__iTunesFS_IFSiPodLibrary_H
+#define	__iTunesFS_IFSiPodLibrary_H
 
-#import "iTunesLibrary.h"
+#import "IFSiTunesLibrary.h"
 
-@interface iPodLibrary : iTunesLibrary
+@interface IFSiPodLibrary : IFSiTunesLibrary
 {
   NSString *mountPoint;
 
@@ -50,6 +50,6 @@
 
 - (NSString *)mountPoint;
 
-@end /* iPodLibrary */
+@end /* IFSiPodLibrary */
 
-#endif	/* __iTunesFS_iPodLibrary_H */
+#endif	/* __iTunesFS_IFSiPodLibrary_H */