Removed SDLTTSChunkFactory from project.feature/sdl_0021_tts_factory_removal

9 files changed, 4 insertions, 57 deletions

diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 07b8cc899..efae0cd04 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -19,7 +19,6 @@ s.public_header_files = [
 'SmartDeviceLink/SDLProxyListener.h',
 'SmartDeviceLink/SDLSecurityType.h',
 'SmartDeviceLink/SDLStreamingMediaManager.h',
-'SmartDeviceLink/SDLTTSChunkFactory.h',
 'SmartDeviceLink/SDLTouchManager.h',
 'SmartDeviceLink/SDLTouchManagerDelegate.h',
 'SmartDeviceLink/SDLConsoleController.h',
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index c19ea0aa1..e3198d517 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -714,8 +714,6 @@
 		5D61FDDC1A84238C00846EE7 /* SDLTriggerSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBEF1A84238C00846EE7 /* SDLTriggerSource.m */; };
 		5D61FDDD1A84238C00846EE7 /* SDLTTSChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBF01A84238C00846EE7 /* SDLTTSChunk.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBF11A84238C00846EE7 /* SDLTTSChunk.m */; };
-		5D61FDDF1A84238C00846EE7 /* SDLTTSChunkFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBF21A84238C00846EE7 /* SDLTTSChunkFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5D61FDE01A84238C00846EE7 /* SDLTTSChunkFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBF31A84238C00846EE7 /* SDLTTSChunkFactory.m */; };
 		5D61FDE11A84238C00846EE7 /* SDLTurn.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBF41A84238C00846EE7 /* SDLTurn.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5D61FDE21A84238C00846EE7 /* SDLTurn.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBF51A84238C00846EE7 /* SDLTurn.m */; };
 		5D61FDE31A84238C00846EE7 /* SDLUnregisterAppInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBF61A84238C00846EE7 /* SDLUnregisterAppInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1756,8 +1754,6 @@
 		5D61FBEF1A84238C00846EE7 /* SDLTriggerSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTriggerSource.m; sourceTree = "<group>"; };
 		5D61FBF01A84238C00846EE7 /* SDLTTSChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTTSChunk.h; sourceTree = "<group>"; };
 		5D61FBF11A84238C00846EE7 /* SDLTTSChunk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTTSChunk.m; sourceTree = "<group>"; };
-		5D61FBF21A84238C00846EE7 /* SDLTTSChunkFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTTSChunkFactory.h; sourceTree = "<group>"; };
-		5D61FBF31A84238C00846EE7 /* SDLTTSChunkFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTTSChunkFactory.m; sourceTree = "<group>"; };
 		5D61FBF41A84238C00846EE7 /* SDLTurn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTurn.h; sourceTree = "<group>"; };
 		5D61FBF51A84238C00846EE7 /* SDLTurn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTurn.m; sourceTree = "<group>"; };
 		5D61FBF61A84238C00846EE7 /* SDLUnregisterAppInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnregisterAppInterface.h; sourceTree = "<group>"; };
@@ -2560,8 +2556,6 @@
 				5D61FB641A84238B00846EE7 /* SDLProxy.m */,
 				5D61FB651A84238B00846EE7 /* SDLProxyFactory.h */,
 				5D61FB661A84238B00846EE7 /* SDLProxyFactory.m */,
-				5D61FBF21A84238C00846EE7 /* SDLTTSChunkFactory.h */,
-				5D61FBF31A84238C00846EE7 /* SDLTTSChunkFactory.m */,
 				5D53C46B1B7A99B9003526EA /* SDLStreamingMediaManager.h */,
 				5D53C46C1B7A99B9003526EA /* SDLStreamingMediaManager.m */,
 			);
@@ -3995,7 +3989,6 @@
 				5D8B17531AC9E11B006A6E1C /* SDLDialNumberResponse.h in Headers */,
 				5D61FC921A84238C00846EE7 /* SDLDisplayType.h in Headers */,
 				5D61FD0D1A84238C00846EE7 /* SDLOnHashChange.h in Headers */,
-				5D61FDDF1A84238C00846EE7 /* SDLTTSChunkFactory.h in Headers */,
 				5D61FC6B1A84238C00846EE7 /* SDLCreateInteractionChoiceSet.h in Headers */,
 				5D61FCE61A84238C00846EE7 /* SDLKeypressMode.h in Headers */,
 				5D61FD871A84238C00846EE7 /* SDLSetGlobalProperties.h in Headers */,
@@ -4421,7 +4414,6 @@
 				5D61FD421A84238C00846EE7 /* SDLPRNDL.m in Sources */,
 				E9C32B921AB20BA200F283AF /* SDLIAPSession.m in Sources */,
 				5D61FD0C1A84238C00846EE7 /* SDLOnEncodedSyncPData.m in Sources */,
-				5D61FDE01A84238C00846EE7 /* SDLTTSChunkFactory.m in Sources */,
 				5D61FD0A1A84238C00846EE7 /* SDLOnDriverDistraction.m in Sources */,
 				5D61FCED1A84238C00846EE7 /* SDLListFiles.m in Sources */,
 				DA9F7E801DCC028B00ACAE48 /* SDLOnWaypointChange.m in Sources */,
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index 28669e2a3..0c8c3ab88 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -5,7 +5,6 @@
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 #import "SDLTTSChunk.h"
-#import "SDLTTSChunkFactory.h"
 
 static UInt16 const SDLDefaultDuration = 5000;
 
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index 07bb2ea51..1e483ed2d 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -6,7 +6,6 @@
 
 #import "SDLNames.h"
 #import "SDLTTSChunk.h"
-#import "SDLTTSChunkFactory.h"
 #import "SDLVRHelpItem.h"
 
 static UInt16 const SDLDefaultTimeout = 10000;
diff --git a/SmartDeviceLink/SDLRPCRequestFactory.m b/SmartDeviceLink/SDLRPCRequestFactory.m
index 54296aa0e..48ccbf200 100644
--- a/SmartDeviceLink/SDLRPCRequestFactory.m
+++ b/SmartDeviceLink/SDLRPCRequestFactory.m
@@ -50,7 +50,6 @@
 #import "SDLSubscribeVehicleData.h"
 #import "SDLSyncMsgVersion.h"
 #import "SDLTTSChunk.h"
-#import "SDLTTSChunkFactory.h"
 #import "SDLUnregisterAppInterface.h"
 #import "SDLUnsubscribeButton.h"
 #import "SDLUnsubscribeVehicleData.h"
@@ -346,16 +345,16 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt
 
 //***
 + (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber<SDLInt> *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID {
-    NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
-    NSArray<SDLTTSChunk *> *helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt];
-    NSArray<SDLTTSChunk *> *timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt];
+    NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunk textChunksFromString:initialPrompt];
+    NSArray<SDLTTSChunk *> *helpChunks = [SDLTTSChunk textChunksFromString:helpPrompt];
+    NSArray<SDLTTSChunk *> *timeoutChunks = [SDLTTSChunk textChunksFromString:timeoutPrompt];
 
     return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp correlationID:correlationID];
 }
 
 + (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID {
     NSArray<NSNumber *> *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID];
-    NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
+    NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunk textChunksFromString:initialPrompt];
 
     return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:nil timeoutChunks:nil interactionMode:SDLInteractionModeBoth timeout:nil vrHelp:vrHelp correlationID:correlationID];
 }
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index cfea5fec6..858bfb27e 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -6,7 +6,6 @@
 
 #import "SDLNames.h"
 #import "SDLTTSChunk.h"
-#import "SDLTTSChunkFactory.h"
 
 @implementation SDLSpeak
 
diff --git a/SmartDeviceLink/SDLTTSChunkFactory.h b/SmartDeviceLink/SDLTTSChunkFactory.h
deleted file mode 100644
index 847918ee1..000000000
--- a/SmartDeviceLink/SDLTTSChunkFactory.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//  SDLTTSChunkFactory.h
-//
-
-#import <Foundation/Foundation.h>
-
-#import "SDLSpeechCapabilities.h"
-
-@class SDLTTSChunk;
-
-
-__deprecated_msg("use SDLTTSChunk initializers instead") @interface SDLTTSChunkFactory : NSObject
-
-+ (SDLTTSChunk *)buildTTSChunkForString:(NSString *)text type:(SDLSpeechCapabilities)type __deprecated_msg("use SDLTTSChunk's initWithText:type: instead");
-+ (NSMutableArray<SDLTTSChunk *> *)buildTTSChunksFromSimple:(NSString *)simple __deprecated_msg("use SDLTTSChunk's textChunksFromString: instead");
-
-@end
diff --git a/SmartDeviceLink/SDLTTSChunkFactory.m b/SmartDeviceLink/SDLTTSChunkFactory.m
deleted file mode 100644
index 7d0259e83..000000000
--- a/SmartDeviceLink/SDLTTSChunkFactory.m
+++ /dev/null
@@ -1,23 +0,0 @@
-//  SDLTTSChunkFactory.m
-//
-
-#import "SDLTTSChunkFactory.h"
-
-#import "SDLTTSChunk.h"
-
-@implementation SDLTTSChunkFactory
-
-+ (SDLTTSChunk *)buildTTSChunkForString:(NSString *)text type:(SDLSpeechCapabilities)type {
-    SDLTTSChunk *ret = [[SDLTTSChunk alloc] initWithText:text type:type];
-
-    return ret;
-}
-
-+ (NSMutableArray<SDLTTSChunk *> *)buildTTSChunksFromSimple:(NSString *)simple {
-    if (simple == nil)
-        return nil;
-
-    return [NSMutableArray arrayWithObject:[SDLTTSChunkFactory buildTTSChunkForString:simple type:SDLSpeechCapabilitiesText]];
-}
-
-@end
diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h
index 17cbaa1fa..214996d80 100644
--- a/SmartDeviceLink/SmartDeviceLink.h
+++ b/SmartDeviceLink/SmartDeviceLink.h
@@ -15,7 +15,6 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLProxyListener.h"
 #import "SDLSecurityType.h"
 #import "SDLStreamingMediaManager.h"
-#import "SDLTTSChunkFactory.h"
 #import "SDLTouchManager.h"
 #import "SDLTouchManagerDelegate.h"