From 44d34e022dbcda08908c298b5328e0b0bdda6f09 Mon Sep 17 00:00:00 2001
From: Stef <stef@ws.local>
Date: Fri, 23 Jul 2004 22:01:58 +0000
Subject: - Code cleanup.

---
 src/rtfx.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/rtfx.cpp')

diff --git a/src/rtfx.cpp b/src/rtfx.cpp
index a620498..cbecdb9 100644
--- a/src/rtfx.cpp
+++ b/src/rtfx.cpp
@@ -41,8 +41,8 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "rtfreader.h"
-#include "rtfanalyser.h"
+#include "rtfparser.h"
+#include "xmlcomposer.h"
 
 int usage()
 {
@@ -66,14 +66,12 @@ int main(int argc, char* argv[])
 			return 1;
 		}
 
-        // Default options
-		RtfParserOptions options;
-
         // Reads RTF tags and blocks
         RtfParser rtf;
 
         // Interprets tags and blocks from RTFParser
-		XMLComposer composer(options);
+        XmlComposerOptions options;
+		XmlComposer composer(options);
 		rtf.setHandler(&composer);
 
 		bool ret = rtf.parse(file);
-- 
cgit v1.2.3