summaryrefslogtreecommitdiffstats
path: root/src/printsupport
diff options
context:
space:
mode:
Diffstat (limited to 'src/printsupport')
-rw-r--r--src/printsupport/kernel/qplatformprintdevice.cpp5
-rw-r--r--src/printsupport/kernel/qplatformprintdevice.h7
-rw-r--r--src/printsupport/kernel/qprintdevice.cpp2
-rw-r--r--src/printsupport/kernel/qprintdevice_p.h2
4 files changed, 4 insertions, 12 deletions
diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp
index bd6d81774c..6385f58aa1 100644
--- a/src/printsupport/kernel/qplatformprintdevice.cpp
+++ b/src/printsupport/kernel/qplatformprintdevice.cpp
@@ -75,11 +75,6 @@ QPlatformPrintDevice::~QPlatformPrintDevice()
{
}
-bool QPlatformPrintDevice::operator==(const QPlatformPrintDevice &other) const
-{
- return m_id == other.m_id;
-}
-
QString QPlatformPrintDevice::id() const
{
return m_id;
diff --git a/src/printsupport/kernel/qplatformprintdevice.h b/src/printsupport/kernel/qplatformprintdevice.h
index 1e21e608ad..8bb87a70f9 100644
--- a/src/printsupport/kernel/qplatformprintdevice.h
+++ b/src/printsupport/kernel/qplatformprintdevice.h
@@ -55,17 +55,14 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_PRINTER
-class Q_PRINTSUPPORT_EXPORT QPlatformPrintDevice : public QSharedData
+class Q_PRINTSUPPORT_EXPORT QPlatformPrintDevice
{
+ Q_DISABLE_COPY(QPlatformPrintDevice)
public:
QPlatformPrintDevice();
explicit QPlatformPrintDevice(const QString &id);
virtual ~QPlatformPrintDevice();
- QPlatformPrintDevice *clone();
-
- bool operator==(const QPlatformPrintDevice &other) const;
-
virtual QString id() const;
virtual QString name() const;
virtual QString location() const;
diff --git a/src/printsupport/kernel/qprintdevice.cpp b/src/printsupport/kernel/qprintdevice.cpp
index 7c18b53e09..a640c14483 100644
--- a/src/printsupport/kernel/qprintdevice.cpp
+++ b/src/printsupport/kernel/qprintdevice.cpp
@@ -73,7 +73,7 @@ QPrintDevice &QPrintDevice::operator=(const QPrintDevice &other)
bool QPrintDevice::operator==(const QPrintDevice &other) const
{
if (d && other.d)
- return *d == *other.d;
+ return d->id() == other.d->id();
return d == other.d;
}
diff --git a/src/printsupport/kernel/qprintdevice_p.h b/src/printsupport/kernel/qprintdevice_p.h
index ad55cded0e..ddf5595734 100644
--- a/src/printsupport/kernel/qprintdevice_p.h
+++ b/src/printsupport/kernel/qprintdevice_p.h
@@ -136,7 +136,7 @@ private:
friend class QPlatformPrinterSupport;
friend class QPlatformPrintDevice;
QPrintDevice(QPlatformPrintDevice *dd);
- QSharedDataPointer<QPlatformPrintDevice> d;
+ QSharedPointer<QPlatformPrintDevice> d;
};
Q_DECLARE_SHARED(QPrintDevice)