From 9bb27ca6cc76a848d9c4a1d7757abf5ffc3943e6 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 31 Jul 2018 12:36:47 -0700
Subject: Make local symbols of some leaked names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unnamed namespaces and static are great tools. Use them.

Change-Id: Ie01831ddac5446fdbdeefffd15468b3acb3ced79
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/gui/opengl/qopenglprogrambinarycache.cpp | 2 ++
 src/gui/util/qtexturefiledata.cpp            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gui')

diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
index d16173df83..f2d093ebed 100644
--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
@@ -62,6 +62,7 @@ const quint32 BINSHADER_MAGIC = 0x5174;
 const quint32 BINSHADER_VERSION = 0x2;
 const quint32 BINSHADER_QTVERSION = QT_VERSION;
 
+namespace {
 struct GLEnvInfo
 {
     GLEnvInfo();
@@ -70,6 +71,7 @@ struct GLEnvInfo
     QByteArray glrenderer;
     QByteArray glversion;
 };
+}
 
 GLEnvInfo::GLEnvInfo()
 {
diff --git a/src/gui/util/qtexturefiledata.cpp b/src/gui/util/qtexturefiledata.cpp
index f9129e86c2..ae230800c0 100644
--- a/src/gui/util/qtexturefiledata.cpp
+++ b/src/gui/util/qtexturefiledata.cpp
@@ -244,7 +244,7 @@ void QTextureFileData::setLogName(const QByteArray &name)
         d->logName = name;
 }
 
-QByteArray glFormatName(quint32 fmt)
+static QByteArray glFormatName(quint32 fmt)
 {
     const char *id = 0;
 #if QT_CONFIG(opengl)
-- 
cgit v1.2.3