Merge changes from CUPS 1.5svn-r9641

[thirdparty/cups.git] / ppdc / ppdhtml.cxx

diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx
index 8d55639383f7c97c820f43005f01f321c0dff1d7..d5678898d386ba84c9af7f4787b7574c0109926a 100644 (file)
--- a/ppdc/ppdhtml.cxx
+++ b/ppdc/ppdhtml.cxx
@@ -3,7 +3,7 @@
 //
 //   PPD to HTML utility for the CUPS PPD Compiler.
 //
-//   Copyright 2007-2008 by Apple Inc.
+//   Copyright 2007-2011 by Apple Inc.
 //   Copyright 2002-2005 by Easy Software Products.
 //
 //   These coded instructions, statements, and computer programs are the
@@ -22,10 +22,9 @@
 // Include necessary headers...
 //
 
-#include "ppdc.h"
+#include "ppdc-private.h"
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <cups/i18n.h>
 
 
 //
@@ -150,8 +149,8 @@ main(int  argc,                             // I - Number of command-line arguments
       puts("</body>");
       puts("</html>");
       // Delete the printer driver information...
-      delete composite;
-      delete src;
+      composite->release();
+      src->release();
     }
 
   // If no drivers have been loaded, display the program usage message.
@@ -170,12 +169,13 @@ main(int  argc,                           // I - Number of command-line arguments
 static void
 usage(void)
 {
-  _cupsLangPuts(stdout,
-                _("Usage: ppdhtml [options] filename.drv >filename.html\n"
-                 "  -D name=value        Set named variable to value.\n"
-                 "Options:\n"
-                 "  -I include-dir    Add include directory to search "
-                 "path.\n"));
+  _cupsLangPuts(stdout, _("Usage: ppdhtml [options] filename.drv "
+                          ">filename.html"));
+  _cupsLangPuts(stdout, _("Options:"));
+  _cupsLangPuts(stdout, _("  -D name=value           Set named variable to "
+                          "value."));
+  _cupsLangPuts(stdout, _("  -I include-dir          Add include directory "
+                          "to search path."));
 
   exit(1);
 }