libcupsfilters: Renamed files to use "-", not "_", ¨-private.h" for non-API

Renamed all source files so that they do not use "_" but use "-"
instead.

Renamed header files which are not containing public API to
"*-private.h".

diff --git a/Makefile.am b/Makefile.am
index abbf220914c5b7026d215d466410d6a3d3f3842a..42e223dd63fecb03ed186993e34f2831358a630d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -471,27 +471,27 @@ libcupsfilters_la_SOURCES = \
        cupsfilters/pclmtoraster.cxx \
        cupsfilters/pdf.cxx \
        cupsfilters/pdftopdf/pdftopdf.cxx \
-       cupsfilters/pdftopdf/pdftopdf.h \
-       cupsfilters/pdftopdf/pdftopdf_jcl.cxx \
-       cupsfilters/pdftopdf/pdftopdf_jcl.h \
-       cupsfilters/pdftopdf/pdftopdf_processor.cxx \
-       cupsfilters/pdftopdf/pdftopdf_processor.h \
-       cupsfilters/pdftopdf/qpdf_pdftopdf_processor.cxx \
-       cupsfilters/pdftopdf/qpdf_pdftopdf_processor.h \
+       cupsfilters/pdftopdf/pdftopdf-private.h \
+       cupsfilters/pdftopdf/pdftopdf-jcl.cxx \
+       cupsfilters/pdftopdf/pdftopdf-jcl-private.h \
+       cupsfilters/pdftopdf/pdftopdf-processor.cxx \
+       cupsfilters/pdftopdf/pdftopdf-processor-private.h \
+       cupsfilters/pdftopdf/qpdf-pdftopdf-processor.cxx \
+       cupsfilters/pdftopdf/qpdf-pdftopdf-processor-private.h \
        cupsfilters/pdftopdf/pptypes.cxx \
-       cupsfilters/pdftopdf/pptypes.h \
+       cupsfilters/pdftopdf/pptypes-private.h \
        cupsfilters/pdftopdf/nup.cxx \
-       cupsfilters/pdftopdf/nup.h \
+       cupsfilters/pdftopdf/nup-private.h \
        cupsfilters/pdftopdf/intervalset.cxx \
-       cupsfilters/pdftopdf/intervalset.h \
-       cupsfilters/pdftopdf/qpdf_tools.cxx \
-       cupsfilters/pdftopdf/qpdf_tools.h \
-       cupsfilters/pdftopdf/qpdf_xobject.cxx \
-       cupsfilters/pdftopdf/qpdf_xobject.h \
-       cupsfilters/pdftopdf/qpdf_pdftopdf.cxx \
-       cupsfilters/pdftopdf/qpdf_pdftopdf.h \
-       cupsfilters/pdftopdf/qpdf_cm.cxx \
-       cupsfilters/pdftopdf/qpdf_cm.h \
+       cupsfilters/pdftopdf/intervalset-private.h \
+       cupsfilters/pdftopdf/qpdf-tools.cxx \
+       cupsfilters/pdftopdf/qpdf-tools-private.h \
+       cupsfilters/pdftopdf/qpdf-xobject.cxx \
+       cupsfilters/pdftopdf/qpdf-xobject-private.h \
+       cupsfilters/pdftopdf/qpdf-pdftopdf.cxx \
+       cupsfilters/pdftopdf/qpdf-pdftopdf-private.h \
+       cupsfilters/pdftopdf/qpdf-cm.cxx \
+       cupsfilters/pdftopdf/qpdf-cm-private.h \
        cupsfilters/pdftops.c \
        cupsfilters/pdftoraster.cxx \
        cupsfilters/pdfutils.c \

diff --git a/cupsfilters/pdftopdf/intervalset.h b/cupsfilters/pdftopdf/intervalset-private.h
similarity index 96%
rename from cupsfilters/pdftopdf/intervalset.h
rename to cupsfilters/pdftopdf/intervalset-private.h
index 538deafcc197b0a70f1db246091c745e55a1630e..2532d32b45f982bb64fe9177b910b31e0651aae1 100644 (file)
--- a/cupsfilters/pdftopdf/intervalset.h
+++ b/cupsfilters/pdftopdf/intervalset-private.h
@@ -1,7 +1,7 @@
 #ifndef _CUPS_FILTERS_PDFTOPDF_INTERVALSET_H_
 #define _CUPS_FILTERS_PDFTOPDF_INTERVALSET_H_
 
-#include "pdftopdf.h"
+#include "pdftopdf-private.h"
 #include <stddef.h>
 #include <vector>
 

diff --git a/cupsfilters/pdftopdf/intervalset.cxx b/cupsfilters/pdftopdf/intervalset.cxx
index ab5ae776f91509e0b2cec90e460db62417291d9a..6fe32bb686417b14aa2004b342469ec71f3e1880 100644 (file)
--- a/cupsfilters/pdftopdf/intervalset.cxx
+++ b/cupsfilters/pdftopdf/intervalset.cxx
@@ -1,4 +1,4 @@
-#include "intervalset.h"
+#include "intervalset-private.h"
 #include <stdio.h>
 #include <assert.h>
 #include <limits>

diff --git a/cupsfilters/pdftopdf/nup.h b/cupsfilters/pdftopdf/nup-private.h
similarity index 98%
rename from cupsfilters/pdftopdf/nup.h
rename to cupsfilters/pdftopdf/nup-private.h
index ce55ad7ac1d7168a0aea32ee31c1ef28e177739e..e29ddef40c20c6f98cde6002dd1f43143843d875 100644 (file)
--- a/cupsfilters/pdftopdf/nup.h
+++ b/cupsfilters/pdftopdf/nup-private.h
@@ -1,7 +1,7 @@
 #ifndef _CUPS_FILTERS_PDFTOPDF_NUP_H_
 #define _CUPS_FILTERS_PDFTOPDF_NUP_H_
 
-#include "pptypes.h"
+#include "pptypes-private.h"
 #include <utility>
 
 // you have to provide this

diff --git a/cupsfilters/pdftopdf/nup.cxx b/cupsfilters/pdftopdf/nup.cxx
index c218a85ec0bc7cae4f5d8f7a41affe29bb8a720c..b0e820985a466a216685164511985d1ee7d6eac0 100644 (file)
--- a/cupsfilters/pdftopdf/nup.cxx
+++ b/cupsfilters/pdftopdf/nup.cxx
@@ -1,4 +1,4 @@
-#include "nup.h"
+#include "nup-private.h"
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>

diff --git a/cupsfilters/pdftopdf/pdftopdf_jcl.h b/cupsfilters/pdftopdf/pdftopdf-jcl-private.h
similarity index 100%
rename from cupsfilters/pdftopdf/pdftopdf_jcl.h
rename to cupsfilters/pdftopdf/pdftopdf-jcl-private.h

diff --git a/cupsfilters/pdftopdf/pdftopdf_jcl.cxx b/cupsfilters/pdftopdf/pdftopdf-jcl.cxx
similarity index 99%
rename from cupsfilters/pdftopdf/pdftopdf_jcl.cxx
rename to cupsfilters/pdftopdf/pdftopdf-jcl.cxx
index 6e7f3d50453adb2aa9ea912159b3b8b2065273d6..9d64ea1ab6d103946c4c1292761d63f83052836c 100644 (file)
--- a/cupsfilters/pdftopdf/pdftopdf_jcl.cxx
+++ b/cupsfilters/pdftopdf/pdftopdf-jcl.cxx
@@ -1,5 +1,5 @@
 #include <ctype.h>
-#include "pdftopdf_processor.h"
+#include "pdftopdf-processor-private.h"
 #include <ppd/ppd.h>
 
 #include <string.h>

diff --git a/cupsfilters/pdftopdf/pdftopdf.h b/cupsfilters/pdftopdf/pdftopdf-private.h
similarity index 100%
rename from cupsfilters/pdftopdf/pdftopdf.h
rename to cupsfilters/pdftopdf/pdftopdf-private.h

diff --git a/cupsfilters/pdftopdf/pdftopdf_processor.h b/cupsfilters/pdftopdf/pdftopdf-processor-private.h
similarity index 98%
rename from cupsfilters/pdftopdf/pdftopdf_processor.h
rename to cupsfilters/pdftopdf/pdftopdf-processor-private.h
index 18dd58fa064bcf2f2491adaa6effe59304237198..dcd594f56c7a7e69db058e32a97dae3d2ad6771e 100644 (file)
--- a/cupsfilters/pdftopdf/pdftopdf_processor.h
+++ b/cupsfilters/pdftopdf/pdftopdf-processor-private.h
@@ -1,10 +1,10 @@
 #ifndef _CUPS_FILTERS_PDFTOPDF_PDFTOPDF_PROCESSOR_H
 #define _CUPS_FILTERS_PDFTOPDF_PDFTOPDF_PROCESSOR_H
 
-#include "pptypes.h"
-#include "nup.h"
-#include "pdftopdf.h"
-#include "intervalset.h"
+#include "pptypes-private.h"
+#include "nup-private.h"
+#include "pdftopdf-private.h"
+#include "intervalset-private.h"
 #include <vector>
 #include <string>
 #include <memory>

diff --git a/cupsfilters/pdftopdf/pdftopdf_processor.cxx b/cupsfilters/pdftopdf/pdftopdf-processor.cxx
similarity index 99%
rename from cupsfilters/pdftopdf/pdftopdf_processor.cxx
rename to cupsfilters/pdftopdf/pdftopdf-processor.cxx
index 1fa4f602750bb55daacc0dacbdee73ebae8fdd4a..fd3343eb93b41eb0d1c7ae22f652053ff65ee91a 100644 (file)
--- a/cupsfilters/pdftopdf/pdftopdf_processor.cxx
+++ b/cupsfilters/pdftopdf/pdftopdf-processor.cxx
@@ -1,5 +1,5 @@
-#include "pdftopdf_processor.h"
-#include "qpdf_pdftopdf_processor.h"
+#include "pdftopdf-processor-private.h"
+#include "qpdf-pdftopdf-processor-private.h"
 #include <stdio.h>
 #include <assert.h>
 #include <numeric>

diff --git a/cupsfilters/pdftopdf/pdftopdf.cxx b/cupsfilters/pdftopdf/pdftopdf.cxx
index eddd1f7e39efda3d5c1da73b53f3f50041b19db1..25faf0a40bad2508006527da8b1cfd0ab0a9909f 100644 (file)
--- a/cupsfilters/pdftopdf/pdftopdf.cxx
+++ b/cupsfilters/pdftopdf/pdftopdf.cxx
@@ -21,11 +21,11 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "pdftopdf.h"
+#include "pdftopdf-private.h"
 #include "cupsfilters/raster.h"
 #include "cupsfilters/ppdgenerator.h"
-#include "pdftopdf_processor.h"
-#include "pdftopdf_jcl.h"
+#include "pdftopdf-processor-private.h"
+#include "pdftopdf-jcl-private.h"
 
 #include <stdarg.h>
 

diff --git a/cupsfilters/pdftopdf/pptypes.h b/cupsfilters/pdftopdf/pptypes-private.h
similarity index 98%
rename from cupsfilters/pdftopdf/pptypes.h
rename to cupsfilters/pdftopdf/pptypes-private.h
index dc1225fcfe9c5d3abe29d799c30503233cd764dc..8b91b20c51a6ef277bee93705fa620d0adc12277 100644 (file)
--- a/cupsfilters/pdftopdf/pptypes.h
+++ b/cupsfilters/pdftopdf/pptypes-private.h
@@ -1,7 +1,7 @@
 #ifndef _CUPS_FILTERS_PDFTOPDF_PPTYPES_H_
 #define _CUPS_FILTERS_PDFTOPDF_PPTYPES_H_
 
-#include "pdftopdf.h"
+#include "pdftopdf-private.h"
 #include <cmath> // NAN
 
 // namespace PPTypes {}   TODO?

diff --git a/cupsfilters/pdftopdf/pptypes.cxx b/cupsfilters/pdftopdf/pptypes.cxx
index 126dbc10f6bd4bf47c9e1df61210b55b64c7d6d1..15536e2ecdfab3ae1824c74c17760ce02e78190f 100644 (file)
--- a/cupsfilters/pdftopdf/pptypes.cxx
+++ b/cupsfilters/pdftopdf/pptypes.cxx
@@ -1,4 +1,4 @@
-#include "pptypes.h"
+#include "pptypes-private.h"
 #include <utility>
 #include <stdio.h>
 #include <assert.h>

diff --git a/cupsfilters/pdftopdf/qpdf_cm.h b/cupsfilters/pdftopdf/qpdf-cm-private.h
similarity index 100%
rename from cupsfilters/pdftopdf/qpdf_cm.h
rename to cupsfilters/pdftopdf/qpdf-cm-private.h

diff --git a/cupsfilters/pdftopdf/qpdf_cm.cxx b/cupsfilters/pdftopdf/qpdf-cm.cxx
similarity index 99%
rename from cupsfilters/pdftopdf/qpdf_cm.cxx
rename to cupsfilters/pdftopdf/qpdf-cm.cxx
index 9a6a2c7a0e5c0ace84057118cce40fbb9a2177d0..966f5e6c969669db2eff7f7ff33aa6fc8b5edd43 100644 (file)
--- a/cupsfilters/pdftopdf/qpdf_cm.cxx
+++ b/cupsfilters/pdftopdf/qpdf-cm.cxx
@@ -1,4 +1,4 @@
-#include "qpdf_cm.h"
+#include "qpdf-cm-private.h"
 #include <stdio.h>
 #include <assert.h>
 

diff --git a/cupsfilters/pdftopdf/qpdf_pdftopdf.h b/cupsfilters/pdftopdf/qpdf-pdftopdf-private.h
similarity index 97%
rename from cupsfilters/pdftopdf/qpdf_pdftopdf.h
rename to cupsfilters/pdftopdf/qpdf-pdftopdf-private.h
index 27bb357b8d73236547ace3eb9aea85acd3f19106..5115f1fada9f7ea56d28371b3232985a7fa7feb5 100644 (file)
--- a/cupsfilters/pdftopdf/qpdf_pdftopdf.h
+++ b/cupsfilters/pdftopdf/qpdf-pdftopdf-private.h
@@ -2,7 +2,7 @@
 #define _CUPS_FILTERS_PDFTOPDF_QPDF_PDFTOPDF_H
 
 #include <qpdf/QPDFObjectHandle.hh>
-#include "pptypes.h"
+#include "pptypes-private.h"
 
 // helper functions
 

diff --git a/cupsfilters/pdftopdf/qpdf_pdftopdf_processor.h b/cupsfilters/pdftopdf/qpdf-pdftopdf-processor-private.h
similarity index 98%
rename from cupsfilters/pdftopdf/qpdf_pdftopdf_processor.h
rename to cupsfilters/pdftopdf/qpdf-pdftopdf-processor-private.h
index 18b84e9ce216827e910b03a9e5810e5d023f846d..7686de47bfadd59e49ebb81c2537fa693bf61d76 100644 (file)
--- a/cupsfilters/pdftopdf/qpdf_pdftopdf_processor.h
+++ b/cupsfilters/pdftopdf/qpdf-pdftopdf-processor-private.h
@@ -1,7 +1,7 @@
 #ifndef _CUPS_FILTERS_PDFTOPDF_QPDF_PDFTOPDF_PROCESSOR_H
 #define _CUPS_FILTERS_PDFTOPDF_QPDF_PDFTOPDF_PROCESSOR_H
 
-#include "pdftopdf_processor.h"
+#include "pdftopdf-processor-private.h"
 #include <qpdf/QPDF.hh>
 
 class _cfPDFToPDFQPDFPageHandle : public _cfPDFToPDFPageHandle {

diff --git a/cupsfilters/pdftopdf/qpdf_pdftopdf_processor.cxx b/cupsfilters/pdftopdf/qpdf-pdftopdf-processor.cxx
similarity index 99%
rename from cupsfilters/pdftopdf/qpdf_pdftopdf_processor.cxx
rename to cupsfilters/pdftopdf/qpdf-pdftopdf-processor.cxx
index 981fd77565ed1907f88567f47d675d3ab9005db0..f436ecfcfd7593baf1564b8b8702bcc2bd82329b 100644 (file)
--- a/cupsfilters/pdftopdf/qpdf_pdftopdf_processor.cxx
+++ b/cupsfilters/pdftopdf/qpdf-pdftopdf-processor.cxx
@@ -1,4 +1,4 @@
-#include "qpdf_pdftopdf_processor.h"
+#include "qpdf-pdftopdf-processor-private.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <assert.h>
@@ -7,10 +7,10 @@
 #include <qpdf/QUtil.hh>
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFAcroFormDocumentHelper.hh>
-#include "qpdf_tools.h"
-#include "qpdf_xobject.h"
-#include "qpdf_pdftopdf.h"
-#include "pdftopdf.h"
+#include "qpdf-tools-private.h"
+#include "qpdf-xobject-private.h"
+#include "qpdf-pdftopdf-private.h"
+#include "pdftopdf-private.h"
 
 // Use: content.append(debug_box(pe.sub,xpos,ypos));
 static std::string debug_box(const _cfPDFToPDFPageRect &box,float xshift,float yshift) // {{{
@@ -667,7 +667,7 @@ void _cfPDFToPDFQPDFProcessor::auto_rotate_all(bool dst_lscape,pdftopdf_rotation
 }
 // }}}
 
-#include "qpdf_cm.h"
+#include "qpdf-cm-private.h"
 
 // TODO
 void _cfPDFToPDFQPDFProcessor::add_cm(const char *defaulticc,const char *outputicc) // {{{

diff --git a/cupsfilters/pdftopdf/qpdf_pdftopdf.cxx b/cupsfilters/pdftopdf/qpdf-pdftopdf.cxx
similarity index 98%
rename from cupsfilters/pdftopdf/qpdf_pdftopdf.cxx
rename to cupsfilters/pdftopdf/qpdf-pdftopdf.cxx
index 869eee46f3347228e4bc21694b61c144eb58cbda..a3e5b33fe69a66e501c499baeb3d89fb5759940f 100644 (file)
--- a/cupsfilters/pdftopdf/qpdf_pdftopdf.cxx
+++ b/cupsfilters/pdftopdf/qpdf-pdftopdf.cxx
@@ -1,4 +1,4 @@
-#include "qpdf_pdftopdf.h"
+#include "qpdf-pdftopdf-private.h"
 #include <assert.h>
 #include <stdexcept>
 #include <qpdf/QUtil.hh>
@@ -68,7 +68,7 @@ QPDFObjectHandle _cfPDFToPDFMakeRotate(pdftopdf_rotation_e rot) // {{{
 }
 // }}}
 
-#include "qpdf_tools.h"
+#include "qpdf-tools-private.h"
 
 QPDFObjectHandle _cfPDFToPDFGetRectAsBox(const _cfPDFToPDFPageRect &rect) // {{{
 {

diff --git a/cupsfilters/pdftopdf/qpdf_tools.h b/cupsfilters/pdftopdf/qpdf-tools-private.h
similarity index 100%
rename from cupsfilters/pdftopdf/qpdf_tools.h
rename to cupsfilters/pdftopdf/qpdf-tools-private.h

diff --git a/cupsfilters/pdftopdf/qpdf_tools.cxx b/cupsfilters/pdftopdf/qpdf-tools.cxx
similarity index 98%
rename from cupsfilters/pdftopdf/qpdf_tools.cxx
rename to cupsfilters/pdftopdf/qpdf-tools.cxx
index 5be6b6f4290dda6c9f4ffdd83710fd18f31b3c53..b6a64273595bfbce2018728bc8d44cb8fa0517c2 100644 (file)
--- a/cupsfilters/pdftopdf/qpdf_tools.cxx
+++ b/cupsfilters/pdftopdf/qpdf-tools.cxx
@@ -1,4 +1,4 @@
-#include "qpdf_tools.h"
+#include "qpdf-tools-private.h"
 
 QPDFObjectHandle _cfPDFToPDFGetMediaBox(QPDFObjectHandle page) // {{{
 {

diff --git a/cupsfilters/pdftopdf/qpdf_xobject.h b/cupsfilters/pdftopdf/qpdf-xobject-private.h
similarity index 100%
rename from cupsfilters/pdftopdf/qpdf_xobject.h
rename to cupsfilters/pdftopdf/qpdf-xobject-private.h

diff --git a/cupsfilters/pdftopdf/qpdf_xobject.cxx b/cupsfilters/pdftopdf/qpdf-xobject.cxx
similarity index 98%
rename from cupsfilters/pdftopdf/qpdf_xobject.cxx
rename to cupsfilters/pdftopdf/qpdf-xobject.cxx
index 5914c2baeb77863901cac203880c623343104cd7..f088b327ff36e2bdbb9bfa4d9c16ad211d548053 100644 (file)
--- a/cupsfilters/pdftopdf/qpdf_xobject.cxx
+++ b/cupsfilters/pdftopdf/qpdf-xobject.cxx
@@ -1,11 +1,11 @@
-#include "qpdf_xobject.h"
+#include "qpdf-xobject-private.h"
 //#include <qpdf/Types.h>
 #include <qpdf/QPDF.hh>
 #include <qpdf/Pl_Discard.hh>
 #include <qpdf/Pl_Count.hh>
 #include <qpdf/Pl_Concatenate.hh>
-#include "qpdf_tools.h"
-#include "qpdf_pdftopdf.h"
+#include "qpdf-tools-private.h"
+#include "qpdf-pdftopdf-private.h"
 
 // TODO: need to remove  Struct Parent stuff  (or fix)