From c295cd95c6bfcdcc33007668996c9cf93870d6ce Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Tue, 29 Nov 2016 00:22:28 -0800
Subject: Rename some symbols to disambiguate

This helps with building an "amalgamation" build of Qbs where all source
files are concatenated. Otherwise there are duplicate symbols.

Change-Id: Idb92b98709930274aa667d53430f03ac57654c32
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/scanner/qt/qtscanner.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp
index 5b981d47a..75f33de3b 100644
--- a/src/plugins/scanner/qt/qtscanner.cpp
+++ b/src/plugins/scanner/qt/qtscanner.cpp
@@ -61,7 +61,7 @@
 #include <QString>
 #include <QXmlStreamReader>
 
-struct Opaq
+struct OpaqQrc
 {
 #ifdef Q_OS_UNIX
     int fd;
@@ -73,7 +73,7 @@ struct Opaq
     char *map;
     QXmlStreamReader *xml;
     QByteArray current;
-    Opaq()
+    OpaqQrc()
 #ifdef Q_OS_UNIX
         : fd (0),
 #else
@@ -83,7 +83,7 @@ struct Opaq
           xml(0)
     {}
 
-    ~Opaq()
+    ~OpaqQrc()
     {
 #ifdef Q_OS_UNIX
         if (map)
@@ -97,10 +97,10 @@ struct Opaq
     }
 };
 
-static void *openScanner(const unsigned short *filePath, int flags)
+static void *openScannerQrc(const unsigned short *filePath, int flags)
 {
     Q_UNUSED(flags);
-    QScopedPointer<Opaq> opaque(new Opaq);
+    QScopedPointer<OpaqQrc> opaque(new OpaqQrc);
 
 #ifdef Q_OS_UNIX
     QString filePathS = QString::fromUtf16(filePath);
@@ -135,15 +135,15 @@ static void *openScanner(const unsigned short *filePath, int flags)
     return static_cast<void *>(opaque.take());
 }
 
-static void closeScanner(void *ptr)
+static void closeScannerQrc(void *ptr)
 {
-    Opaq *opaque = static_cast<Opaq *>(ptr);
+    OpaqQrc *opaque = static_cast<OpaqQrc *>(ptr);
     delete opaque;
 }
 
 static const char *nextQrc(void *opaq, int *size, int *flags)
 {
-    Opaq *o= static_cast<Opaq *>(opaq);
+    OpaqQrc *o= static_cast<OpaqQrc *>(opaq);
     while (!o->xml->atEnd()) {
         o->xml->readNext();
         switch (o->xml->tokenType()) {
@@ -164,7 +164,7 @@ static const char *nextQrc(void *opaq, int *size, int *flags)
     return 0;
 }
 
-static const char **additionalFileTags(void *, int *size)
+static const char **additionalFileTagsQrc(void *, int *size)
 {
     *size = 0;
     return 0;
@@ -176,10 +176,10 @@ ScannerPlugin qrcScanner =
 {
     "qt_qrc_scanner",
     "qrc",
-    openScanner,
-    closeScanner,
+    openScannerQrc,
+    closeScannerQrc,
     nextQrc,
-    additionalFileTags,
+    additionalFileTagsQrc,
     NoScannerFlags
 };
 
-- 
cgit v1.2.3