From 60c5e3cf25e0966fa7ec5f90d5e04404e7fae81f Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Sun, 14 Jun 2015 06:25:35 +0200 Subject: Printing: pass the print_options struct to TemplateLayout and Printer As the print_options struct is needed by both TemplateLayout and Printer class, it can be passed to their constructor. Signed-off-by: Gehad elrobey Signed-off-by: Lubomir I. Ivanov --- printer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'printer.cpp') diff --git a/printer.cpp b/printer.cpp index 6d4e4898b..5116521fa 100644 --- a/printer.cpp +++ b/printer.cpp @@ -9,9 +9,10 @@ #define A4_300DPI_WIDTH 2480 #define A4_300DPI_HIGHT 3508 -Printer::Printer(QPrinter *printer) +Printer::Printer(QPrinter *printer, print_options *printOptions) { this->printer = printer; + this->printOptions = printOptions; //override these settings for now. printer->setFullPage(true); @@ -112,7 +113,7 @@ void Printer::templateProgessUpdated(int value) void Printer::print() { - TemplateLayout t; + TemplateLayout t(printOptions); connect(&t, SIGNAL(progressUpdated(int)), this, SLOT(templateProgessUpdated(int))); webView = new QWebView(); webView->setHtml(t.generate()); -- cgit v1.2.3-70-g09d2