1. Sync with master

[apps/core/preloaded/print-service.git] / include / pt_common.h

diff --git a/include/pt_common.h b/include/pt_common.h
index fbda4cf..95992cf 100644 (file)
--- a/include/pt_common.h
+++ b/include/pt_common.h
@@ -25,8 +25,6 @@
 #include "pt_api.h"
 #include "pt_utils.h"
 
-#define CUPS_161_UPGRADE
-
 #define MAX_URI_SIZE (512)
 
 typedef struct {
@@ -63,25 +61,6 @@ typedef struct {
 } pt_notification_t;
 */
 
-typedef struct {
-       int  copies;                                                    /** the number of copies */
-       int  orientation;                                               /** 0- portrait mode,
-                                                                                         * 1- landscape mode
-                                                                                         */
-       pt_paper_size_e   papersize;                    /** reserved, paper size */
-
-#if 0 // copied from pt_printer_mgr_t
-       int                             copies;                                 /** print copy number */
-       int                             size;                                   /** paper size */
-       pt_orientation_e        landscape;                              /** orientation */
-       pt_scaling_e            scaling;                                        /** scaling mode */
-       pt_image_size_option_e  imagesize;                              /** image size */
-       pt_range_e              range;                                  /** printing range */
-//     pt_grayscale_t grayscale;                                       /** colour mode */
-//     pt_quality_t quality;                                           /** quality */
-//     pt_paper_t paper;                                                       /** paper type */
-#endif
-} pt_print_option_t;
 
 typedef struct {
        int  id;                                                                        /** job id */
@@ -133,7 +112,6 @@ typedef struct {
 typedef struct {
        pt_connection_type_e connect_type;                      /** assigned connection type */
        pt_printer_mgr_t        *active_printer;                /** active printer info */
-       pt_print_option_t       *option;                                /** print option */
        pt_search_data_t                *search;
 
        cups_option_t           *job_options;
@@ -153,10 +131,6 @@ typedef struct {
 } pt_info_t;
 
 extern pt_info_t *g_pt_info;                                   /** print info maintained globally */
-
-/* prototypes */
-void pt_parse_options(ppd_file_t *ppd);
-ppd_choice_t *pt_selected_choice(int op);
-ppd_size_t *pt_utils_paper_size_pts(const char *name);
+extern ppd_file_t *ppd;
 
 #endif /* __PRINT_SERVICE_H__ */