Merge changes from CUPS 1.5svn-r9385.

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

diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx
index 314d63108774d703d8df6807b2b774a9fd1d0b51..abc4173f3ab54991fa6afffa1bdcd2a89fb36d70 100644 (file)
--- a/ppdc/ppdi.cxx
+++ b/ppdc/ppdi.cxx
@@ -3,7 +3,7 @@
 //
 //   PPD file import utility for the CUPS PPD Compiler.
 //
-//   Copyright 2007-2008 by Apple Inc.
+//   Copyright 2007-2010 by Apple Inc.
 //   Copyright 2002-2005 by Easy Software Products.
 //
 //   These coded instructions, statements, and computer programs are the
@@ -22,11 +22,10 @@
 // Include necessary headers...
 //
 
-#include "ppdc.h"
+#include "ppdc-private.h"
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <cups/i18n.h>
 
 
 //
@@ -112,7 +111,7 @@ main(int  argc,                             // I - Number of command-line arguments
   src->write_file(srcfile);
 
   // Delete the printer driver information...
-  delete src;
+  src->release();
 
   // Return with no errors.
   return (0);
@@ -126,11 +125,11 @@ main(int  argc,                           // I - Number of command-line arguments
 static void
 usage(void)
 {
-  _cupsLangPuts(stdout,
-                _("Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]\n"
-                 "Options:\n"
-                 "  -I include-dir\n"
-                 "  -o filename.drv\n"));
+  _cupsLangPuts(stdout, _("Usage: ppdi [options] filename.ppd [ ... "
+                         "filenameN.ppd ]"));
+  _cupsLangPuts(stdout, _("Options:"));
+  _cupsLangPuts(stdout, _("  -I include-dir"));
+  _cupsLangPuts(stdout, _("  -o filename.drv"));
 
   exit(1);
 }