diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2010-12-01 11:28:32 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-12-20 15:14:39 (GMT) |
| commit | 1d6266e751d6b23a15f56bc21c503fe1a71da975 (patch) | |
| tree | 752fca1b67fc5787bc835ea4450cb329a5bd6cc5 /src/gui | |
| parent | 50af3716c956be0f50fdd896925da7af91d5da2c (diff) | |
| download | Qt-1d6266e751d6b23a15f56bc21c503fe1a71da975.zip Qt-1d6266e751d6b23a15f56bc21c503fe1a71da975.tar.gz Qt-1d6266e751d6b23a15f56bc21c503fe1a71da975.tar.bz2 | |
get rid of QPrinterInfoPrivate::isNull member
invalid QPrinterInfo always have d_ptr == &QPrinterInfoPrivate::shared_null;
no need in separate flag for that
Merge-request: 2516
Signed-off-by: axis
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qprinterinfo.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qprinterinfo_p.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/painting/qprinterinfo.cpp b/src/gui/painting/qprinterinfo.cpp index 21d56f3..72f8be3 100644 --- a/src/gui/painting/qprinterinfo.cpp +++ b/src/gui/painting/qprinterinfo.cpp @@ -146,7 +146,7 @@ QString QPrinterInfo::printerName() const bool QPrinterInfo::isNull() const { const Q_D(QPrinterInfo); - return d->isNull; + return d == &QPrinterInfoPrivate::shared_null; } /*! diff --git a/src/gui/painting/qprinterinfo_p.h b/src/gui/painting/qprinterinfo_p.h index f5981d4..7781d59 100644 --- a/src/gui/painting/qprinterinfo_p.h +++ b/src/gui/painting/qprinterinfo_p.h @@ -65,7 +65,7 @@ class QPrinterInfoPrivate { public: QPrinterInfoPrivate(const QString& name = QString()) : - name(name), isNull(false), isDefault(false) + name(name), isDefault(false) #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)) || defined(Q_WS_QPA) #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) , cupsPrinterIndex(0), hasPaperSizes(false) @@ -78,7 +78,6 @@ public: static QPrinterInfoPrivate shared_null; QString name; - bool isNull; bool isDefault; #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)) || defined(Q_WS_QPA) |