QtPrintSupport: Move plugin access of QPrinterInfo internals to base

Move all plugin methods requiring access to QPrinterInfo internals
into the plugin base class, and remove the plugin classes as friends
from QPrinterInfo.

Change-Id: Ic527efc681e198abf19e038dd77c36bb8017d049
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/printsupport/kernel/qprinterinfo_p.h b/src/printsupport/kernel/qprinterinfo_p.h
index 6e1c088f79..97f0986b66 100644
--- a/src/printsupport/kernel/qprinterinfo_p.h
+++ b/src/printsupport/kernel/qprinterinfo_p.h
@@ -65,11 +65,7 @@ class QPrinterInfoPrivate
 {
 public:
     QPrinterInfoPrivate(const QString& name = QString()) :
-        name(name), isDefault(false)
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-        , cupsPrinterIndex(0)
-#endif
-        , hasPaperSizes(false)
+        name(name), isDefault(false), index(-1), hasPaperSizes(false)
     {}
     ~QPrinterInfoPrivate()
     {}
@@ -81,10 +77,8 @@ public:
     QString location;
     QString makeAndModel;
     bool isDefault;
+    int index;  // Internal printer plugin use only
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-    int cupsPrinterIndex;
-#endif
     mutable bool hasPaperSizes;
     mutable QList<QPrinter::PaperSize> paperSizes;
 };