diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-17 15:44:59 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-08-19 09:16:32 +0200 |
| commit | a1016213d02c2f562fcf7a22a8fcfb2bd45cd674 (patch) | |
| tree | 91ee31e7680845d7b038312e36b3c1713bfe72a3 /src/widgets/widgets/qwidgettextcontrol.cpp | |
| parent | 699e8fe3a6724dd8288dd6a55b25e070eb198c9d (diff) | |
Don't rely on QPrinter in widgets
Use the QPagedPaintDevice instead for the current
print() methods. Like this we can move the whole
printing system into it's own library.
Change-Id: I5e23fb3a9304eb3d12aa54959893601566249e23
Reviewed-on: http://codereview.qt.nokia.com/3208
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol.cpp')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 0f241136a5..609a67b27a 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -62,7 +62,7 @@ #include "qtextlist.h" #include "private/qwidgettextcontrol_p.h" #include "qgraphicssceneevent.h" -#include "qprinter.h" +#include "qpagedpaintdevice.h" #include "qtextdocumentwriter.h" #include "private/qtextcursor_p.h" @@ -2423,14 +2423,15 @@ bool QWidgetTextControl::isWordSelectionEnabled() const return d->wordSelectionEnabled; } -#ifndef QT_NO_PRINTER -void QWidgetTextControl::print(QPrinter *printer) const +void QWidgetTextControl::print(QPagedPaintDevice *printer) const { Q_D(const QWidgetTextControl); - if (!printer || !printer->isValid()) + if (!printer) return; QTextDocument *tempDoc = 0; const QTextDocument *doc = d->doc; +#if 0 + // #### if (printer->printRange() == QPrinter::Selection) { if (!d->cursor.hasSelection()) return; @@ -2445,10 +2446,10 @@ void QWidgetTextControl::print(QPrinter *printer) const // copy the custom object handlers doc->documentLayout()->d_func()->handlers = d->doc->documentLayout()->d_func()->handlers; } +#endif doc->print(printer); delete tempDoc; } -#endif // QT_NO_PRINTER QMimeData *QWidgetTextControl::createMimeDataFromSelection() const { |