Minor code cleanup

JFTHRingtoneDataController.h

@@ -1,5 +1,6 @@
 
-#import <Foundation/Foundation.h>
+#import "JFTHHeaders.h"
+#import "JFTHRingtoneImporter.h"
 
 
 typedef NS_ENUM(NSInteger, JFTHRingtoneParameterType) {

JFTHRingtoneDataController.m

@@ -1,5 +1,4 @@
 #import "JFTHRingtoneDataController.h"
-#import "JFTHRingtoneImporter.h"
 
 NSString * const RINGTONE_PLIST_PATH = @"/var/mobile/Media/iTunes_Control/iTunes/Ringtones.plist";
 NSString * const TONEHELPERDATA_PLIST_PATH = @"/var/mobile/Library/Application Support/ToneHelper/ToneHelperData.plist";

JFTHRingtoneImporter.h

@@ -1,7 +1,11 @@
-#import "ToneHelper.h"
+#import "JFTHHeaders.h"
 #import "JFTHRingtoneDataController.h"
+
+//For md5 calculations
 #include "FileHash.h"
 
+@class JFTHRingtoneDataController;
+
 @interface JFTHRingtoneImporter : NSObject {
 
     NSMutableDictionary *ringtonesToImport;

Tweak.xm

@@ -1,4 +1,4 @@
-#import "ToneHelper.h"
+#import "JFTHHeaders.h"
 #import "JFTHRingtoneImporter.h"
 
 #import <objc/runtime.h>

layout/DEBIAN/control

@@ -1,7 +1,7 @@
 Package: fi.flodin.tonehelper
 Name: ToneHelper
 Depends: mobilesubstrate, ws.hbang.common (>= 1.12)
-Version: 0.2.7
+Version: 0.2.8
 Architecture: iphoneos-arm
 Description: Automatically adds ringtones from Audiko to device
 Maintainer: Jesper Flodin <[email protected]>

thprefsbundle/JFTHPrefHeaders.h

@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <Preferences/PSListController.h>
+#import <Preferences/PSSpecifier.h>
+
+//libcephei prefs headers we need 
+#import <CepheiPrefs/HBTintedTableCell.h>
+#import <CepheiPrefs/HBRootListController.h>
+#import <CepheiPrefs/HBLinkTableCell.h>
+#import <CepheiPrefs/HBTwitterCell.h>
+#import <CepheiPrefs/HBImageTableCell.h>
+#import <CepheiPrefs/HBPackageNameHeaderCell.h>
+#import <CepheiPrefs/HBSupportController.h>
+
+#import <SafariServices/SFSafariViewController.h>
+#import <TechSupport/TechSupport.h>
+
+#import "../Log.h"
+
+@interface NSTask : NSObject
+
+- (id)init;
+- (void)launch;
+- (void)setArguments:(id)arg1;
+- (void)setLaunchPath:(id)arg1;
+- (void)setStandardOutput:(id)arg1;
+- (id)standardOutput;
+
+@end
+
+@interface PSEditableListController : PSListController
+@end

thprefsbundle/JFTHRingtoneListController.h

@@ -1,14 +1,9 @@
 //libcephei prefs headers we need 
 //#import <CepheiPrefs/HBListController.h>
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <Preferences/PSListController.h>
-#import <Preferences/PSSpecifier.h>
+#import "JFTHPrefHeaders.h"
+
 #import "../JFTHRingtoneDataController.h"
-#import "../Log.h"
 
-@interface PSEditableListController : PSListController
-@end
 @interface JFTHRingtoneListController : PSEditableListController {
     JFTHRingtoneDataController *_toneData;
 }

thprefsbundle/JFTHRootListController.h

@@ -1,19 +1,4 @@
-//libcephei prefs headers we need 
-#import <CepheiPrefs/HBTintedTableCell.h>
-#import <CepheiPrefs/HBRootListController.h>
-#import <CepheiPrefs/HBLinkTableCell.h>
-#import <CepheiPrefs/HBTwitterCell.h>
-#import <CepheiPrefs/HBImageTableCell.h>
-#import <CepheiPrefs/HBPackageNameHeaderCell.h>
-#import <CepheiPrefs/HBSupportController.h>
-
-#import <SafariServices/SFSafariViewController.h>
-
-#import <Preferences/PSSpecifier.h>
-
-#import <TechSupport/TechSupport.h>
-
-#import "../Log.h"
+#import "JFTHPrefHeaders.h"
 
 @class TSIncludeInstruction;
 
@@ -32,13 +17,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-@interface NSTask : NSObject
-
-- (id)init;
-- (void)launch;
-- (void)setArguments:(id)arg1;
-- (void)setLaunchPath:(id)arg1;
-- (void)setStandardOutput:(id)arg1;
-- (id)standardOutput;
 
-@end