libcupsfilters: Rename API functions of colord.h to "cf..."

diff --git a/cupsfilters/colord.c b/cupsfilters/colord.c
index 6459197a1b89b0a3dd10cddbdd295d8f80de5861..68aa3418ea6382b10f45d912a32b643c56eef74a 100644 (file)
--- a/cupsfilters/colord.c
+++ b/cupsfilters/colord.c
@@ -44,7 +44,7 @@ MIT Open Source License  -  http://www.opensource.org/
 #define QUAL_SIZE         3
 
 char **
-colord_get_qualifier_for_ppd (ppd_file_t *ppd)
+cfColordGetQualifierForPPD (ppd_file_t *ppd)
 {
   char q_keyword[PPD_MAX_NAME];
   char **tuple = NULL;
@@ -325,7 +325,7 @@ out:
 }
 
 char *
-colord_get_profile_for_device_id (filter_data_t *data,
+cfColordGetProfileForDeviceID (filter_data_t *data,
                                  const char *device_id,
                                  const char **qualifier_tuple)
 {
@@ -443,7 +443,7 @@ out:
 }
 
 int
-colord_get_inhibit_for_device_id (filter_data_t *data,
+cfColordGetInhibitForDeviceID (filter_data_t *data,
                        const char *device_id)
 {
   filter_logfunc_t log = data->logfunc;
@@ -481,7 +481,7 @@ out:
 #else
 
 char *
-colord_get_profile_for_device_id (filter_data_t *data,
+cfColordGetProfileForDeviceID (filter_data_t *data,
                                  const char *device_id,
                                   const char **qualifier_tuple)
 {
@@ -493,7 +493,7 @@ colord_get_profile_for_device_id (filter_data_t *data,
 }
 
 int
-colord_get_inhibit_for_device_id (filter_data_t *data,
+cfColordGetInhibitForDeviceID (filter_data_t *data,
                        const char *device_id)
 {
   filter_logfunc_t log = data->logfunc;

diff --git a/cupsfilters/colord.h b/cupsfilters/colord.h
index f4867e595ea4d2f0285079f95301b6fdf848bcd7..03b024ef41d79d4c670302c4977642e563c4a561 100644 (file)
--- a/cupsfilters/colord.h
+++ b/cupsfilters/colord.h
@@ -38,12 +38,12 @@ extern "C" {
 #include <ppd/ppd.h>
 #include <cupsfilters/filter.h>
 
-char  **colord_get_qualifier_for_ppd      (ppd_file_t *ppd);
-char   *colord_get_profile_for_device_id  (filter_data_t *data,
-                                           const char *device_id,
-                                           const char **qualifier_tuple);
-int     colord_get_inhibit_for_device_id  ( filter_data_t *data,
-                                            const char *device_id);
+char **cfColordGetQualifierForPPD(ppd_file_t *ppd);
+char *cfColordGetProfileForDeviceID(filter_data_t *data,
+                                   const char *device_id,
+                                   const char **qualifier_tuple);
+int cfColordGetInhibitForDeviceID(filter_data_t *data,
+                                 const char *device_id);
 
 #  ifdef __cplusplus
 }

diff --git a/cupsfilters/colormanager.c b/cupsfilters/colormanager.c
index a1ff5aa520ed79a8af72bbf3181e975077e09a6e..49505f0c98ceeb66a122f9636ebce6f145fe9614 100644 (file)
--- a/cupsfilters/colormanager.c
+++ b/cupsfilters/colormanager.c
@@ -227,7 +227,7 @@ _get_colord_printer_cm_status( filter_data_t *data)
 
     /* Check if device is inhibited/disabled in colord  */
     printer_id = _get_colord_printer_id(data);
-    is_printer_cm_disabled = colord_get_inhibit_for_device_id (data, printer_id);
+    is_printer_cm_disabled = cfColordGetInhibitForDeviceID (data, printer_id);
 
     if (printer_id != NULL)
       free(printer_id);
@@ -258,12 +258,12 @@ _get_colord_profile(filter_data_t *data,
 
 
     /* Get color qualifier triple */
-    qualifier = colord_get_qualifier_for_ppd(ppd);
+    qualifier = cfColordGetQualifierForPPD(ppd);
 
     if (qualifier != NULL) {
       printer_id = _get_colord_printer_id(data);
       /* Get profile from colord using qualifiers */
-      icc_profile = colord_get_profile_for_device_id (data,
+      icc_profile = cfColordGetProfileForDeviceID (data,
                                                      (const char *)printer_id,
                                                      (const char **)qualifier);
     }