diff options
author | John Layt <jlayt@kde.org> | 2012-05-20 22:38:28 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-17 22:08:16 +0200 |
commit | 54b899f44877d87f6118b1bab02fb67c35d738e8 (patch) | |
tree | b461abfb0853b2d2c38d9c87e337ba414090cfd1 /src/printsupport/dialogs/qpagesetupdialog_unix.cpp | |
parent | 01864d4854557d2cf8b067e229d77cd7c9c553ee (diff) |
SIC: QtPrintSupport - Remove QAbstractPageSetupDialog
QAbstractPageSetupDialog is a completely unnecessary base class that
is not really abstract and is used nowhere else. This changes merges
its methods into the QPageSetupDialog main class.
While technically SIC no-one else uses this so no apps should be
affected.
Change-Id: I59b1739f1c453c34c25d1664d5d042e7918db316
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/printsupport/dialogs/qpagesetupdialog_unix.cpp')
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp index ac8338b739..fabade2d25 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp @@ -50,7 +50,7 @@ #include <ui_qpagesetupwidget.h> #include <QtPrintSupport/qprinter.h> -#include <private/qabstractpagesetupdialog_p.h> +#include <private/qpagesetupdialog_p.h> #include <private/qprinter_p.h> #include <private/qprintengine_pdf_p.h> @@ -214,12 +214,13 @@ private: }; -class QPageSetupDialogPrivate : public QAbstractPageSetupDialogPrivate +class QUnixPageSetupDialogPrivate : public QPageSetupDialogPrivate { Q_DECLARE_PUBLIC(QPageSetupDialog) public: - ~QPageSetupDialogPrivate(); + QUnixPageSetupDialogPrivate(QPrinter *printer); + ~QUnixPageSetupDialogPrivate(); void init(); QPageSetupWidget *widget; @@ -228,14 +229,24 @@ public: #endif }; -QPageSetupDialogPrivate::~QPageSetupDialogPrivate() +QUnixPageSetupDialogPrivate::QUnixPageSetupDialogPrivate(QPrinter *printer) : QPageSetupDialogPrivate(printer) +#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) + , cups(0) +#endif +{ +} + +QUnixPageSetupDialogPrivate::~QUnixPageSetupDialogPrivate() { #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) - delete cups; + if (cups) { + delete cups; + cups = 0; + } #endif } -void QPageSetupDialogPrivate::init() +void QUnixPageSetupDialogPrivate::init() { Q_Q(QPageSetupDialog); @@ -584,30 +595,25 @@ void QPageSetupWidget::setRightMargin(double newValue) QPageSetupDialog::QPageSetupDialog(QPrinter *printer, QWidget *parent) - : QAbstractPageSetupDialog(*(new QPageSetupDialogPrivate), printer, parent) + : QDialog(*(new QUnixPageSetupDialogPrivate(printer)), parent) { - Q_D(QPageSetupDialog); - d->init(); + setWindowTitle(QCoreApplication::translate("QPrintPreviewDialog", "Page Setup")); } QPageSetupDialog::QPageSetupDialog(QWidget *parent) - : QAbstractPageSetupDialog(*(new QPageSetupDialogPrivate), 0, parent) + : QDialog(*(new QUnixPageSetupDialogPrivate(0)), parent) { - Q_D(QPageSetupDialog); - d->init(); + setWindowTitle(QCoreApplication::translate("QPrintPreviewDialog", "Page Setup")); } -/*! - \internal -*/ int QPageSetupDialog::exec() { Q_D(QPageSetupDialog); int ret = QDialog::exec(); if (ret == Accepted) - d->widget->setupPrinter(); + static_cast <QUnixPageSetupDialogPrivate*>(d)->widget->setupPrinter(); return ret; } |