summaryrefslogtreecommitdiffstats
path: root/src/plugins/printsupport/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/printsupport/windows')
-rw-r--r--src/plugins/printsupport/windows/main.cpp2
-rw-r--r--src/plugins/printsupport/windows/qwindowsprintdevice.cpp17
-rw-r--r--src/plugins/printsupport/windows/qwindowsprintdevice.h7
3 files changed, 1 insertions, 25 deletions
diff --git a/src/plugins/printsupport/windows/main.cpp b/src/plugins/printsupport/windows/main.cpp
index f1ee620b8b..28e99f1916 100644
--- a/src/plugins/printsupport/windows/main.cpp
+++ b/src/plugins/printsupport/windows/main.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
class QWindowsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.QPlatformPrinterSupportFactoryInterface" FILE "windows.json")
+ Q_PLUGIN_METADATA(IID QPlatformPrinterSupportFactoryInterface_iid FILE "windows.json")
public:
QPlatformPrinterSupport *create(const QString &);
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
index af8e07edd2..505f3138ca 100644
--- a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
+++ b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
@@ -113,28 +113,11 @@ QWindowsPrintDevice::QWindowsPrintDevice(const QString &id)
}
}
-QWindowsPrintDevice::QWindowsPrintDevice(const QWindowsPrintDevice &other)
- : QPlatformPrintDevice(other)
-{
- OpenPrinter((LPWSTR)other.m_id.utf16(), &m_hPrinter, NULL);
-}
-
QWindowsPrintDevice::~QWindowsPrintDevice()
{
ClosePrinter(m_hPrinter);
}
-QWindowsPrintDevice &QWindowsPrintDevice::operator=(const QWindowsPrintDevice &other)
-{
- OpenPrinter((LPWSTR)other.m_id.utf16(), &m_hPrinter, NULL);
- return *this;
-}
-
-bool QWindowsPrintDevice::operator==(const QWindowsPrintDevice &other) const
-{
- return (m_id == other.m_id);
-}
-
bool QWindowsPrintDevice::isValid() const
{
return m_hPrinter;
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.h b/src/plugins/printsupport/windows/qwindowsprintdevice.h
index 2e0f6e4658..8ab487a59c 100644
--- a/src/plugins/printsupport/windows/qwindowsprintdevice.h
+++ b/src/plugins/printsupport/windows/qwindowsprintdevice.h
@@ -58,15 +58,8 @@ class QWindowsPrintDevice : public QPlatformPrintDevice
public:
QWindowsPrintDevice();
explicit QWindowsPrintDevice(const QString &id);
- QWindowsPrintDevice(const QWindowsPrintDevice &other);
virtual ~QWindowsPrintDevice();
- QWindowsPrintDevice &operator=(const QWindowsPrintDevice &other);
-
- QWindowsPrintDevice *clone();
-
- bool operator==(const QWindowsPrintDevice &other) const;
-
bool isValid() const Q_DECL_OVERRIDE;
bool isDefault() const Q_DECL_OVERRIDE;