summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2013-05-11 09:56:48 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-12 13:58:04 +0200
commitb9adf2a90ec43a1ae89b9a68005fc382399d7592 (patch)
treeadc7297821b8264b3034f870ab06289260a96a0c /src
parent741eb8cbb1a443ecad7b6a30dcd64fd857e3223d (diff)
Clean up old PostScript printing code
PostScript support was removed back in 2011: 34f712e79e97b757b4426e1ffa09e065c9e379a1 - The QPSPrint* classes are gone - The QPrinter::OutputFormat enum only has NativeFormat and PdfFormat constants - QPaintEngine::PostScript is unused now Change-Id: I27d595b92341f41e14bd1e4fd860eac6826d7890 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qpaintengine.cpp2
-rw-r--r--src/gui/painting/qpaintengine.h3
-rw-r--r--src/gui/text/qfont.h1
-rw-r--r--src/gui/text/qfontengine_p.h2
-rw-r--r--src/gui/text/qtextlayout.h1
-rw-r--r--src/printsupport/dialogs/qprintpreviewdialog.cpp11
6 files changed, 4 insertions, 16 deletions
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index ac4589df40..aa175c2d65 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -374,7 +374,7 @@ void QPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDraw
\value CoreGraphics Mac OS X's Quartz2D (CoreGraphics)
\value QuickDraw Mac OS X's QuickDraw
\value QWindowSystem Qt for Embedded Linux
- \value PostScript
+ \value PostScript (No longer supported)
\value OpenGL
\value Picture QPicture format
\value SVG Scalable Vector Graphics XML format
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index b3e3762cc8..b4dec2929d 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -196,7 +196,7 @@ public:
Windows,
QuickDraw, CoreGraphics, MacPrinter,
QWindowSystem,
- PostScript,
+ PostScript, // ### Qt 6: Remove, update documentation
OpenGL,
Picture,
SVG,
@@ -253,7 +253,6 @@ private:
#ifndef QT_NO_QWS_QPF2
friend class QFontEngineQPF;
#endif
- friend class QPSPrintEngine;
friend class QMacPrintEngine;
friend class QMacPrintEnginePrivate;
friend class QFontEngineQPA;
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 24a1c4c7c3..6d36f7839b 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -285,7 +285,6 @@ private:
friend class QFontInfo;
friend class QPainter;
friend class QPainterPrivate;
- friend class QPSPrintEngineFont;
friend class QApplication;
friend class QWidget;
friend class QWidgetPrivate;
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index f0f8713f74..855f0099ff 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -411,8 +411,6 @@ public:
virtual void setFallbackFamiliesList(const QStringList &) {}
protected:
- friend class QPSPrintEnginePrivate;
- friend class QPSPrintEngineFontMulti;
friend class QRawFont;
virtual void loadEngine(int at) = 0;
virtual void ensureFallbackFamiliesQueried() {}
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 8a26fed924..cbe42c3844 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -188,7 +188,6 @@ private:
Q_DISABLE_COPY(QTextLayout)
friend class QPainter;
- friend class QPSPrinter;
friend class QGraphicsSimpleTextItemPrivate;
friend class QGraphicsSimpleTextItem;
friend void qt_format_text(const QFont &font, const QRectF &_r, int tf, const QTextOption *, const QString& str,
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index 9fa430e17e..4692fb5c3c 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -562,15 +562,8 @@ void QPrintPreviewDialogPrivate::_q_print()
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
if (printer->outputFormat() != QPrinter::NativeFormat) {
- QString title;
- QString suffix;
- if (printer->outputFormat() == QPrinter::PdfFormat) {
- title = QCoreApplication::translate("QPrintPreviewDialog", "Export to PDF");
- suffix = QLatin1String(".pdf");
- } else {
- title = QCoreApplication::translate("QPrintPreviewDialog", "Export to PostScript");
- suffix = QLatin1String(".ps");
- }
+ QString title = QCoreApplication::translate("QPrintPreviewDialog", "Export to PDF");
+ QString suffix = QLatin1String(".pdf");
QString fileName = QFileDialog::getSaveFileName(q, title, printer->outputFileName(),
QLatin1Char('*') + suffix);
if (!fileName.isEmpty()) {