Do not export global variables used only in typesystem.cpp.

3 files changed, 60 insertions, 56 deletions

diff --git a/reporthandler.cpp b/reporthandler.cpp
index a311b53cd..fd41983c5 100644
--- a/reporthandler.cpp
+++ b/reporthandler.cpp
@@ -171,7 +171,7 @@ void ReportHandler::progress(const QString& str, ...)
     QString msg = QString("\033[1K\r" COLOR_WHITE "%1 (%2/%3) " COLOR_END).arg(m_anim.toString()).arg(m_anim.current()).arg(m_anim.max()) + str;
     std::va_list argp;
     va_start(argp, str);
-    std::vsnprintf(m_progressBuffer, sizeof(m_progressBuffer), msg.toLocal8Bit().constData(), argp);
+    vsnprintf(m_progressBuffer, sizeof(m_progressBuffer), msg.toLocal8Bit().constData(), argp);
     va_end(argp);
     printProgress();
 }
diff --git a/typesystem.cpp b/typesystem.cpp
index 9ffdf502c..b4bdc3ff7 100644
--- a/typesystem.cpp
+++ b/typesystem.cpp
@@ -25,13 +25,13 @@
 #include "reporthandler.h"
 #include <QtXml>
 
-QString strings_Object = QLatin1String("Object");
-QString strings_String = QLatin1String("String");
-QString strings_Thread = QLatin1String("Thread");
-QString strings_char = QLatin1String("char");
-QString stringsJavaLang = QLatin1String("java.lang");
-QString strings_jchar = QLatin1String("jchar");
-QString strings_jobject = QLatin1String("jobject");
+static QString strings_Object = QLatin1String("Object");
+static QString strings_String = QLatin1String("String");
+static QString strings_Thread = QLatin1String("Thread");
+static QString strings_char = QLatin1String("char");
+static QString stringsJavaLang = QLatin1String("java.lang");
+static QString strings_jchar = QLatin1String("jchar");
+static QString strings_jobject = QLatin1String("jobject");
 
 class StackElement
 {
@@ -2141,6 +2141,48 @@ AddedFunction::AddedFunction(QString signature, QString returnType) : m_access(P
     }
 }
 
+QString PrimitiveTypeEntry::javaObjectPackage() const
+{
+    return stringsJavaLang;
+}
+
+QString ComplexTypeEntry::targetLangApiName() const
+{
+    return strings_jobject;
+}
+QString StringTypeEntry::targetLangApiName() const
+{
+    return strings_jobject;
+}
+QString StringTypeEntry::targetLangName() const
+{
+    return strings_String;
+}
+QString StringTypeEntry::targetLangPackage() const
+{
+    return stringsJavaLang;
+}
+QString CharTypeEntry::targetLangApiName() const
+{
+    return strings_jchar;
+}
+QString CharTypeEntry::targetLangName() const
+{
+    return strings_char;
+}
+QString VariantTypeEntry::targetLangApiName() const
+{
+    return strings_jobject;
+}
+QString VariantTypeEntry::targetLangName() const
+{
+    return strings_Object;
+}
+QString VariantTypeEntry::targetLangPackage() const
+{
+    return stringsJavaLang;
+}
+
 /*
 static void injectCode(ComplexTypeEntry *e,
                        const char *signature,
diff --git a/typesystem.h b/typesystem.h
index dca3b298a..cb26c1dbd 100644
--- a/typesystem.h
+++ b/typesystem.h
@@ -39,14 +39,6 @@ class QTextStream;
 class EnumTypeEntry;
 class FlagsTypeEntry;
 
-extern QString strings_Object;
-extern QString strings_String;
-extern QString strings_Thread;
-extern QString strings_char;
-extern QString stringsJavaLang;
-extern QString strings_jchar;
-extern QString strings_jobject;
-
 struct APIEXTRACTOR_API Include
 {
     enum IncludeType {
@@ -1047,10 +1039,7 @@ public:
         return javaObjectPackage() + "." + javaObjectName();
     }
     QString javaObjectName() const;
-    QString javaObjectPackage() const
-    {
-        return stringsJavaLang;
-    }
+    QString javaObjectPackage() const;
 
     virtual bool preferredConversion() const
     {
@@ -1353,10 +1342,7 @@ public:
         return m_lookupName.isEmpty() ? targetLangName() : m_lookupName;
     }
 
-    QString targetLangApiName() const
-    {
-        return strings_jobject;
-    }
+    QString targetLangApiName() const;
 
     void setTypeFlags(TypeFlags flags)
     {
@@ -1641,18 +1627,9 @@ public:
         setCodeGeneration(GenerateNothing);
     }
 
-    QString targetLangApiName() const
-    {
-        return strings_jobject;
-    }
-    QString targetLangName() const
-    {
-        return strings_String;
-    }
-    QString targetLangPackage() const
-    {
-        return stringsJavaLang;
-    }
+    QString targetLangApiName() const;
+    QString targetLangName() const;
+    QString targetLangPackage() const;
 
     virtual bool isNativeIdBased() const
     {
@@ -1668,14 +1645,8 @@ public:
         setCodeGeneration(GenerateNothing);
     }
 
-    QString targetLangApiName() const
-    {
-        return strings_jchar;
-    }
-    QString targetLangName() const
-    {
-        return strings_char;
-    }
+    QString targetLangApiName() const;
+    QString targetLangName() const;
     QString targetLangPackage() const
     {
         return QString();
@@ -1692,18 +1663,9 @@ class VariantTypeEntry: public ValueTypeEntry
 public:
     VariantTypeEntry(const QString &name) : ValueTypeEntry(name, VariantType) { }
 
-    QString targetLangApiName() const
-    {
-        return strings_jobject;
-    }
-    QString targetLangName() const
-    {
-        return strings_Object;
-    }
-    QString targetLangPackage() const
-    {
-        return stringsJavaLang;
-    }
+    QString targetLangApiName() const;
+    QString targetLangName() const;
+    QString targetLangPackage() const;
 
     virtual bool isNativeIdBased() const
     {