1 files changed, 22 insertions, 16 deletions

diff --git a/utilities/thml2gbs.cpp b/utilities/thml2gbs.cpp
index eb1eadc..ca5b31c 100644
--- a/utilities/thml2gbs.cpp
+++ b/utilities/thml2gbs.cpp
@@ -11,7 +11,7 @@
 #endif
 
 #include <entriesblk.h>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <stdio.h>
 #include <treekeyidx.h>
@@ -21,14 +21,20 @@
 #define O_BINARY 0
 #endif
 
+#ifndef NO_SWORD_NAMESPACE
+using sword::TreeKeyIdx;
+using sword::RawGenBook;
+using sword::SWKey;
+#endif
+
 void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) {
 	if (!target)
 		target = &treeKey;
 	
 	unsigned long currentOffset = target->getOffset();
-       	cout << ((currentOffset == treeKey.getOffset()) ? "==>" : "");
-	for (int i = 0; i < level; i++) cout << "\t";
-	cout << treeKey.getLocalName() << "/\n";
+       	std::cout << ((currentOffset == treeKey.getOffset()) ? "==>" : "");
+	for (int i = 0; i < level; i++) std::cout << "\t";
+	std::cout << treeKey.getLocalName() << "/\n";
 	if (treeKey.firstChild()) {
 		printTree(treeKey, target, level+1);
 		treeKey.parent();
@@ -69,7 +75,7 @@ void setkey (TreeKeyIdx * treeKey, char* keybuffer) {
 	treeKey->save();
       }
       
-      //DEBUG      cout << treeKey->getLocalName() << " : " << tok << endl;
+      //DEBUG      std::cout << treeKey->getLocalName() << " : " << tok << std::endl;
       
       tok = strtok(NULL, "/");
       
@@ -81,7 +87,7 @@ int main(int argc, char **argv) {
   const char * helptext ="thml2gbs 1.0 General Book module creation tool for the SWORD Project\n  usage:\n   %s <filename> [modname] [0|1 - long names] [0|1 - output in 'import format']\n";
 
   signed long i = 0;
-  string divs[6];
+  std::string divs[6];
   int level = 0;
   char* keybuffer = new char[2048];
   char* entbuffer = new char[1048576];
@@ -103,9 +109,8 @@ int main(int argc, char **argv) {
   char* n = new char[256];
   char* type = new char[256];
   char* title= new char[512];
-  
-  char* strtmp;
 
+  char* strtmp;
   if (argc > 2) {
     strcpy (modname, argv[2]);
   }
@@ -120,7 +125,6 @@ int main(int argc, char **argv) {
     exit(-1);
   }
 
-
   FILE *infile;
   infile = fopen(argv[1], "r");
   FILE *outfile;
@@ -128,7 +132,7 @@ int main(int argc, char **argv) {
     strcat (modname, ".imp");
     outfile = fopen(modname, "w");
   }
-  
+
   TreeKeyIdx * treeKey;
   RawGenBook *book;
 
@@ -142,7 +146,7 @@ int main(int argc, char **argv) {
     //DEBUG  TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book)));
     treeKey = ((TreeKeyIdx *)((SWKey *)(*book)));
   }
-  
+
   int c;
   while ((c = fgetc(infile)) != EOF) {
     if (c == '<') {
@@ -160,14 +164,14 @@ int main(int argc, char **argv) {
 	    }
 
 	    if (level) {
-	      cout << keybuffer << endl;
+	      printf ("%s\n", keybuffer);
 	      if (exportfile) {
 		fprintf (outfile, "$$$%s\n%s\n", keybuffer, entbuffer);
 	      }
 	      else {
 		treeKey->root();
 		setkey(treeKey, keybuffer);
-		book->setentry(entbuffer, entrysize); // save text to module at current position
+		book->setEntry(entbuffer, entrysize); // save text to module at current position
 	      }
 	    }
 	  }	    
@@ -200,14 +204,14 @@ int main(int argc, char **argv) {
 	    }
 	    
 	    if (level) {
-	      cout << keybuffer << endl;
+	      printf ("%s\n", keybuffer);
 	      if (exportfile) {
 		fprintf (outfile, "$$$%s\n%s\n", keybuffer, entbuffer);
 	      }
 	      else {
 		treeKey->root();
 		setkey(treeKey, keybuffer);
-		book->setentry(entbuffer, entrysize); // save text to module at current position
+		book->setEntry(entbuffer, entrysize); // save text to module at current position
 	      }
 	    }
 	  }
@@ -227,7 +231,7 @@ int main(int argc, char **argv) {
 	    }
 	  }
 	  keybuffer[keysize] = 0;
-	  
+
 	  type[0] = 0;
 	  strtmp = strstr(keybuffer, "type=\"");
 	  if (strtmp) {
@@ -303,7 +307,9 @@ int main(int argc, char **argv) {
       entbuffer[entrysize] = 0;
     }
   }
+
 //DEBUG  printTree(root, treeKey);
+  return 0;
 
   delete treeKey;
   delete book;