1 files changed, 35 insertions, 47 deletions

diff --git a/Source/SPExporter.h b/Source/SPExporter.h
index 22ca0cc3..5c5e68c1 100644
--- a/Source/SPExporter.h
+++ b/Source/SPExporter.h
@@ -50,88 +50,76 @@
 
 #import "SPConstants.h"
 
-@class MCPConnection, SPFileHandle;
+@class MCPConnection, SPExportFile;
 
 @interface SPExporter : NSOperation
 {	
-	/**
-	 * The MySQL connection to use
-	 */
 	MCPConnection *connection;
 	
-	/**
-	 * The exports current progress value
-	 */
 	double exportProgressValue;
-	
-	/**
-	 * The max progress value of the export operation
-	 */
 	double exportMaxProgress;
 	
-	/**
-	 * Indicates whether or not the exporter is running
-	 */
 	BOOL exportProcessIsRunning;
-	
-	/**
-	 * Indicates whether or not low memory streaming is used
-	 */
 	BOOL exportUsingLowMemoryBlockingStreaming;
-	
-	/**
-	 * Compress output
-	 */
 	BOOL exportOutputCompressFile;
 	
-	/**
-	 * Compression format
-	 */
+	
 	SPFileCompressionFormat exportOutputCompressionFormat;
 	
-	/**
-	 * The resulting exported data as a string
-	 */
 	NSString *exportData;
 	
-	/**
-	 * The output file handle of the exporter
-	 */
-	SPFileHandle *exportOutputFileHandle;
-	
-	/**
-	 * Export output encoding
-	 */
+	SPExportFile *exportOutputFile;
+
 	NSStringEncoding exportOutputEncoding;
 }
 
+/**
+ * @property connection The MySQL connection to use
+ */
 @property(readwrite, retain) MCPConnection *connection;
 
+/**
+ * @property exportProgressValue The export's current progress value
+ */
 @property(readwrite, assign) double exportProgressValue;
 
+/**
+ * @property exportMaxProgress The max progress value of the export operation
+ */
+@property(readwrite, assign) double exportMaxProgress;
+
+/**
+ * @property exportProcessIsRunning Indicates whether or not the exporter is running
+ */
 @property(readwrite, assign) BOOL exportProcessIsRunning;
+
+/**
+ * @property exportUsingLowMemoryBlockingStreaming Indicates whether or not low memory streaming is used
+ */
 @property(readwrite, assign) BOOL exportUsingLowMemoryBlockingStreaming;
 
+/**
+ * @property exportOutputCompressionFormat Compression format
+ */
 @property(readwrite, assign) SPFileCompressionFormat exportOutputCompressionFormat;
 
+/**
+ * @property exportData The resulting exported data as a string
+ */
 @property(readwrite, retain) NSString *exportData;
-@property(readwrite, retain) SPFileHandle *exportOutputFileHandle;
-@property(readwrite, assign) NSStringEncoding exportOutputEncoding;
-
-@property(readwrite, assign) double exportMaxProgress;
 
 /**
- * Returns whether or not file compression is in use.
- *
- * @return A BOOL indicating the use of compression
+ * @property exportOutputFile The output file of the exporter
  */
-- (BOOL)exportOutputCompressFile;
+@property(readwrite, retain) SPExportFile *exportOutputFile;
 
 /**
- * Sets whether or not the resulting output of this exporter should be compressed.
- *
- * @param compress A BOOL indicating the use of compression
+ * @property exportOutputEncoding Export output encoding
  */
+@property(readwrite, assign) NSStringEncoding exportOutputEncoding;
+
+- (BOOL)exportOutputCompressFile;
+
 - (void)setExportOutputCompressFile:(BOOL)compress;
 
 @end