Changeset 573 for trunk/src/gui/dialogs/qprintdialog_unix.cpp

Timestamp:

Feb 17, 2010, 8:53:20 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented support for printing through CUPS on OS/2.

File:

• trunk/src/gui/dialogs/qprintdialog_unix.cpp (modified) (24 diffs)

trunk/src/gui/dialogs/qprintdialog_unix.cpp

@@ -61 +61 @@
 #include "ui_qprintwidget.h"
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
 #  include <private/qcups_p.h>
 #  include <cups/cups.h>
@@ -85 +85 @@
     ~QPrintPropertiesDialog();
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     void setCups(QCUPSSupport *cups) { m_cups = cups; }
     void addItemToOptions(QOptionTreeItem *parent, QList<const ppd_option_t*>& options, QList<const char*>& markedOptions) const;
@@ -103 +103 @@
     Ui::QPrintPropertiesWidget widget;
     QDialogButtonBox *m_buttons;
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     QCUPSSupport *m_cups;
     QPPDOptionsModel *m_cupsOptionsModel;
@@ -121 +121 @@
     void applyPrinterProperties(QPrinter *p);
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     void selectPrinter(QCUPSSupport *cups);
 #endif
@@ -143 +143 @@
 };
 
-#if defined (Q_OS_UNIX)
+#if defined (Q_OS_UNIX) || defined (Q_WS_PM)
 class QUnixPrintWidgetPrivate
 {
@@ -172 +172 @@
     QPrintDialogPrivate *optionsPane;
     bool filePrintersAdded;
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     QCUPSSupport* cups;
     int cupsPrinterCount;
@@ -181 +181 @@
 #endif
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
 class QOptionTreeItem
 {
@@ -257 +257 @@
 QPrintPropertiesDialog::QPrintPropertiesDialog(QAbstractPrintDialog *parent)
     : QDialog(parent)
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     , m_cups(0), m_cupsOptionsModel(0)
 #endif
@@ -275 +275 @@
 QPrintPropertiesDialog::~QPrintPropertiesDialog()
 {
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     delete m_cupsOptionsModel;
 #else
@@ -291 +291 @@
     widget.pageSetup->setupPrinter();
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     QPPDOptionsModel* model = static_cast<QPPDOptionsModel*>(widget.treeView->model());
     if (model) {
@@ -306 +306 @@
 void QPrintPropertiesDialog::selectPrinter()
 {
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     widget.pageSetup->selectPrinter(m_cups);
     widget.treeView->setModel(0);
@@ -352 +352 @@
 }
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
 void QPrintPropertiesDialog::addItemToOptions(QOptionTreeItem *parent, QList<const ppd_option_t*>& options, QList<const char*>& markedOptions) const
 {
@@ -566 +566 @@
 }
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
 void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
 {
@@ -644 +644 @@
 #endif // QT3_SUPPORT
 
-#if defined (Q_OS_UNIX)
+#if defined (Q_OS_UNIX) || defined (Q_WS_PM)
 
 /*! \internal
@@ -650 +650 @@
 QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p)
     : parent(p), propertiesDialog(0), printer(0), optionsPane(0), filePrintersAdded(false)
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     , cups(0), cupsPrinterCount(0), cupsPrinters(0), cupsPPD(0)
 #endif
@@ -661 +661 @@
 
     int currentPrinterIndex = 0;
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     cups = new QCUPSSupport;
     if (QCUPSSupport::isAvailable()) {
@@ -685 +685 @@
     } else {
 #endif
+#ifndef Q_WS_PM
         currentPrinterIndex = qt_getLprPrinters(lprPrinters);
         // populating printer combo
@@ -690 +691 @@
         for(; i != lprPrinters.constEnd(); ++i)
             widget.printers->addItem((*i).name);
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#endif
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     }
 #endif
@@ -749 +751 @@
 QUnixPrintWidgetPrivate::~QUnixPrintWidgetPrivate()
 {
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     delete cups;
 #endif
@@ -781 +783 @@
             if (propertiesDialog)
                 propertiesDialog->selectPdfPsPrinter(printer);
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
             if (optionsPane)
                 optionsPane->selectPrinter(0);
@@ -790 +792 @@
 
     widget.location->setText(QString());
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     if (QCUPSSupport::isAvailable()) {
         cups->setCurrentPrinter(index);
@@ -822 +824 @@
                 propertiesDialog->selectPrinter();
         }
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
     }
 #endif
@@ -949 +951 @@
 
     if (propertiesDialog->result() == QDialog::Rejected) {
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
         propertiesDialog->setCups(cups);
 #endif
@@ -1017 +1019 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined (Q_WS_PM))
 
 QPPDOptionsModel::QPPDOptionsModel(QCUPSSupport *c, QObject *parent)