Removed all visibility macros from ApiExtractor since it's now a static lib.

13 files changed, 68 insertions, 82 deletions

diff --git a/ApiExtractor/abstractmetabuilder.h b/ApiExtractor/abstractmetabuilder.h
index b4a2863ac..dd4586061 100644
--- a/ApiExtractor/abstractmetabuilder.h
+++ b/ApiExtractor/abstractmetabuilder.h
@@ -34,7 +34,7 @@
 
 class TypeDatabase;
 
-class APIEXTRACTOR_API AbstractMetaBuilder
+class AbstractMetaBuilder
 {
 public:
     enum RejectReason {
diff --git a/ApiExtractor/abstractmetalang.h b/ApiExtractor/abstractmetalang.h
index 2851d1c70..2658f8a80 100644
--- a/ApiExtractor/abstractmetalang.h
+++ b/ApiExtractor/abstractmetalang.h
@@ -43,7 +43,7 @@ class AbstractMetaEnumValue;
 class AbstractMetaEnum;
 class QPropertySpec;
 
-class APIEXTRACTOR_API Documentation
+class Documentation
 {
 public:
     enum Format {
@@ -81,7 +81,7 @@ private:
 typedef QList<AbstractMetaField *> AbstractMetaFieldList;
 typedef QList<AbstractMetaArgument *> AbstractMetaArgumentList;
 typedef QList<AbstractMetaFunction *> AbstractMetaFunctionList;
-class APIEXTRACTOR_API AbstractMetaClassList : public  QList<AbstractMetaClass *>
+class AbstractMetaClassList : public  QList<AbstractMetaClass *>
 {
 public:
     AbstractMetaClass *findClass(const QString &name) const;
@@ -91,7 +91,7 @@ public:
 
 };
 
-class APIEXTRACTOR_API AbstractMetaAttributes
+class AbstractMetaAttributes
 {
 public:
     AbstractMetaAttributes() : m_attributes(0), m_originalAttributes(0) {};
@@ -292,7 +292,7 @@ private:
 };
 
 typedef QList<AbstractMetaType*> AbstractMetaTypeList;
-class APIEXTRACTOR_API AbstractMetaType
+class AbstractMetaType
 {
 public:
 
@@ -615,7 +615,7 @@ private:
     Q_DISABLE_COPY(AbstractMetaType);
 };
 
-class APIEXTRACTOR_API AbstractMetaVariable
+class AbstractMetaVariable
 {
 public:
     AbstractMetaVariable() : m_type(0), m_hasName(false) {}
@@ -683,7 +683,7 @@ private:
 
 
 
-class APIEXTRACTOR_API AbstractMetaArgument : public AbstractMetaVariable
+class AbstractMetaArgument : public AbstractMetaVariable
 {
 public:
     AbstractMetaArgument() : m_argumentIndex(0) {};
@@ -731,7 +731,7 @@ private:
 };
 
 
-class APIEXTRACTOR_API AbstractMetaField : public AbstractMetaVariable, public AbstractMetaAttributes
+class AbstractMetaField : public AbstractMetaVariable, public AbstractMetaAttributes
 {
 public:
     AbstractMetaField();
@@ -764,7 +764,7 @@ private:
     const AbstractMetaClass *m_class;
 };
 
-class APIEXTRACTOR_API AbstractMetaFunction : public AbstractMetaAttributes
+class AbstractMetaFunction : public AbstractMetaAttributes
 {
 public:
     enum FunctionType {
@@ -1349,7 +1349,7 @@ private:
 
 typedef QList<AbstractMetaEnum *> AbstractMetaEnumList;
 
-class APIEXTRACTOR_API AbstractMetaClass : public AbstractMetaAttributes
+class AbstractMetaClass : public AbstractMetaAttributes
 {
 public:
     enum FunctionQueryOption {
diff --git a/ApiExtractor/apiextractor.h b/ApiExtractor/apiextractor.h
index 0a71f1a22..774f3f6ed 100644
--- a/ApiExtractor/apiextractor.h
+++ b/ApiExtractor/apiextractor.h
@@ -32,7 +32,7 @@
 class AbstractMetaBuilder;
 class QIODevice;
 
-class APIEXTRACTOR_API ApiExtractor
+class ApiExtractor
 {
 public:
     ApiExtractor();
diff --git a/ApiExtractor/apiextractormacros.h b/ApiExtractor/apiextractormacros.h
index 3364acf14..b2e303155 100644
--- a/ApiExtractor/apiextractormacros.h
+++ b/ApiExtractor/apiextractormacros.h
@@ -4,20 +4,10 @@
 
 // APIEXTRACTOR_API is used for the public API symbols.
 #if defined _WIN32
-    #if APIEXTRACTOR_EXPORTS
-        #define APIEXTRACTOR_API __declspec(dllexport)
-    #else
-        #define APIEXTRACTOR_API
-    #endif
     #define APIEXTRACTOR_DEPRECATED(func) __declspec(deprecated) func
 #elif __GNUC__ >= 4
-    #define APIEXTRACTOR_API __attribute__ ((visibility("default")))
     #define APIEXTRACTOR_DEPRECATED(func) func __attribute__ ((deprecated))
-#endif
-
-#ifndef APIEXTRACTOR_API
-    #define APIEXTRACTOR_API
+#else
     #define APIEXTRACTOR_DEPRECATED(func) func
 #endif
-
 #endif
diff --git a/ApiExtractor/docparser.h b/ApiExtractor/docparser.h
index 6764333be..08c107277 100644
--- a/ApiExtractor/docparser.h
+++ b/ApiExtractor/docparser.h
@@ -32,7 +32,7 @@ class QDomDocument;
 class QDomNode;
 class QXmlQuery;
 
-class APIEXTRACTOR_API DocParser
+class DocParser
 {
 public:
     DocParser();
diff --git a/ApiExtractor/doxygenparser.h b/ApiExtractor/doxygenparser.h
index 1150f7ff7..6eb4ce1c1 100644
--- a/ApiExtractor/doxygenparser.h
+++ b/ApiExtractor/doxygenparser.h
@@ -26,7 +26,7 @@
 
 #include "docparser.h"
 
-class APIEXTRACTOR_API DoxygenParser : public DocParser
+class DoxygenParser : public DocParser
 {
 public:
     DoxygenParser()  {}
diff --git a/ApiExtractor/fileout.h b/ApiExtractor/fileout.h
index 1429b3365..d5c9e29c5 100644
--- a/ApiExtractor/fileout.h
+++ b/ApiExtractor/fileout.h
@@ -27,9 +27,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
-#include "apiextractormacros.h"
 
-class APIEXTRACTOR_API FileOut : public QObject
+class FileOut : public QObject
 {
 private:
     QByteArray tmp;
diff --git a/ApiExtractor/graph.h b/ApiExtractor/graph.h
index d3a754e98..d8883c14f 100644
--- a/ApiExtractor/graph.h
+++ b/ApiExtractor/graph.h
@@ -27,10 +27,9 @@
 #include <QLinkedList>
 #include <QHash>
 #include <QString>
-#include "apiextractormacros.h"
 
 /// A graph that can have their nodes topologically sorted.
-class APIEXTRACTOR_API Graph
+class Graph
 {
 public:
     /// Create a new graph with \p numNodes nodes.
diff --git a/ApiExtractor/include.h b/ApiExtractor/include.h
index d5ba47999..9474ed080 100644
--- a/ApiExtractor/include.h
+++ b/ApiExtractor/include.h
@@ -24,13 +24,12 @@
 #ifndef INCLUDE_H
 #define INCLUDE_H
 
-#include "apiextractormacros.h"
 #include <QString>
 #include <QList>
 
 class QTextStream;
 
-class APIEXTRACTOR_API Include
+class Include
 {
 public:
     enum IncludeType {
@@ -69,14 +68,14 @@ public:
         return m_type == other.m_type && m_name == other.m_name;
     }
 
-    friend APIEXTRACTOR_API uint qHash(const Include&);
+    friend uint qHash(const Include&);
     private:
         IncludeType m_type;
         QString m_name;
 };
 
-APIEXTRACTOR_API uint qHash(const Include& inc);
-APIEXTRACTOR_API QTextStream& operator<<(QTextStream& out, const Include& include);
+uint qHash(const Include& inc);
+QTextStream& operator<<(QTextStream& out, const Include& include);
 
 typedef QList<Include> IncludeList;
 
diff --git a/ApiExtractor/qtdocparser.h b/ApiExtractor/qtdocparser.h
index e69d0650a..48f2c4758 100644
--- a/ApiExtractor/qtdocparser.h
+++ b/ApiExtractor/qtdocparser.h
@@ -26,7 +26,7 @@
 
 #include "docparser.h"
 
-class APIEXTRACTOR_API QtDocParser : public DocParser
+class QtDocParser : public DocParser
 {
 public:
     QtDocParser() {}
diff --git a/ApiExtractor/reporthandler.h b/ApiExtractor/reporthandler.h
index f1fae50ed..cc874e7af 100644
--- a/ApiExtractor/reporthandler.h
+++ b/ApiExtractor/reporthandler.h
@@ -25,9 +25,8 @@
 #define REPORTHANDLER_H
 
 class QString;
-#include "apiextractormacros.h"
 
-class APIEXTRACTOR_API ReportHandler
+class ReportHandler
 {
 public:
     enum DebugLevel { NoDebug, SparseDebug, MediumDebug, FullDebug };
diff --git a/ApiExtractor/typedatabase.h b/ApiExtractor/typedatabase.h
index 8c735c1c1..87b0cfe6a 100644
--- a/ApiExtractor/typedatabase.h
+++ b/ApiExtractor/typedatabase.h
@@ -26,15 +26,16 @@
 
 #include <QStringList>
 #include "typesystem.h"
+#include "apiextractormacros.h"
 
-APIEXTRACTOR_API void setTypeRevision(TypeEntry* typeEntry, int revision);
-APIEXTRACTOR_API int getTypeRevision(const TypeEntry* typeEntry);
-APIEXTRACTOR_API int getTypeIndex(const TypeEntry* typeEntry);
-APIEXTRACTOR_API int getMaxTypeIndex();
+void setTypeRevision(TypeEntry* typeEntry, int revision);
+int getTypeRevision(const TypeEntry* typeEntry);
+int getTypeIndex(const TypeEntry* typeEntry);
+int getMaxTypeIndex();
 
 class ContainerTypeEntry;
 class PrimitiveTypeEntry;
-class APIEXTRACTOR_API TypeDatabase
+class TypeDatabase
 {
     TypeDatabase();
     TypeDatabase(const TypeDatabase&);
diff --git a/ApiExtractor/typesystem.h b/ApiExtractor/typesystem.h
index c915cd424..632575f6d 100644
--- a/ApiExtractor/typesystem.h
+++ b/ApiExtractor/typesystem.h
@@ -29,7 +29,6 @@
 #include <QtCore/QStringList>
 #include <QtCore/QMap>
 #include <QtCore/QDebug>
-#include "apiextractormacros.h"
 #include "include.h"
 
 //Used to identify the conversion rule to avoid break API
@@ -82,7 +81,7 @@ enum Ownership {
 };
 };
 
-struct APIEXTRACTOR_API ReferenceCount
+struct ReferenceCount
 {
     ReferenceCount()  {}
     enum Action { // 0x01 - 0xff
@@ -102,7 +101,7 @@ struct APIEXTRACTOR_API ReferenceCount
     QString varName;
 };
 
-struct APIEXTRACTOR_API ArgumentOwner
+struct ArgumentOwner
 {
     enum Action {
         Invalid     = 0x00,
@@ -121,7 +120,7 @@ struct APIEXTRACTOR_API ArgumentOwner
     int index;
 };
 
-class APIEXTRACTOR_API CodeSnipFragment
+class CodeSnipFragment
 {
 private:
     QString m_code;
@@ -138,7 +137,7 @@ public:
     QString code() const;
 };
 
-class APIEXTRACTOR_API CodeSnipAbstract
+class CodeSnipAbstract
 {
 public:
     QString code() const;
@@ -156,7 +155,7 @@ public:
     QList<CodeSnipFragment> codeList;
 };
 
-class APIEXTRACTOR_API CustomFunction : public CodeSnipAbstract
+class CustomFunction : public CodeSnipAbstract
 {
 public:
     CustomFunction(const QString &n = QString()) : name(n) { }
@@ -165,7 +164,7 @@ public:
     QString paramName;
 };
 
-class APIEXTRACTOR_API TemplateEntry : public CodeSnipAbstract
+class TemplateEntry : public CodeSnipAbstract
 {
 public:
     TemplateEntry(const QString &name, double vr)
@@ -190,7 +189,7 @@ private:
 
 typedef QHash<QString, TemplateEntry *> TemplateEntryHash;
 
-class APIEXTRACTOR_API TemplateInstance
+class TemplateInstance
 {
 public:
     TemplateInstance(const QString &name, double vr)
@@ -220,7 +219,7 @@ private:
 };
 
 
-class APIEXTRACTOR_API CodeSnip : public CodeSnipAbstract
+class CodeSnip : public CodeSnipAbstract
 {
 public:
     enum Position {
@@ -245,7 +244,7 @@ public:
 };
 typedef QList<CodeSnip> CodeSnipList;
 
-struct APIEXTRACTOR_API ArgumentModification
+struct ArgumentModification
 {
     ArgumentModification(int idx, double vr)
             : removedDefaultExpression(false), removed(false),
@@ -293,7 +292,7 @@ struct APIEXTRACTOR_API ArgumentModification
     QString renamed_to;
 };
 
-struct APIEXTRACTOR_API Modification
+struct Modification
 {
     enum Modifiers {
         Private =               0x0001,
@@ -384,7 +383,7 @@ struct APIEXTRACTOR_API Modification
     TypeSystem::Language removal;
 };
 
-struct APIEXTRACTOR_API FunctionModification: public Modification
+struct FunctionModification: public Modification
 {
     FunctionModification(double vr) : m_thread(false), m_allowThread(false), m_version(vr) {}
 
@@ -436,7 +435,7 @@ private:
 };
 typedef QList<FunctionModification> FunctionModificationList;
 
-struct APIEXTRACTOR_API FieldModification: public Modification
+struct FieldModification: public Modification
 {
     bool isReadable() const
     {
@@ -458,7 +457,7 @@ typedef QList<FieldModification> FieldModificationList;
 *   This info will be used later to create a fake AbstractMetaFunction which
 *   will be inserted into the right AbstractMetaClass.
 */
-struct APIEXTRACTOR_API AddedFunction
+struct AddedFunction
 {
     /// Function access types.
     enum Access {
@@ -547,7 +546,7 @@ private:
 };
 typedef QList<AddedFunction> AddedFunctionList;
 
-struct APIEXTRACTOR_API ExpensePolicy
+struct ExpensePolicy
 {
     ExpensePolicy() : limit(-1) {}
     int limit;
@@ -561,7 +560,7 @@ struct APIEXTRACTOR_API ExpensePolicy
 class InterfaceTypeEntry;
 class ObjectTypeEntry;
 
-class APIEXTRACTOR_API DocModification
+class DocModification
 {
 public:
     enum Mode {
@@ -616,7 +615,7 @@ typedef QList<DocModification> DocModificationList;
 
 class CustomConversion;
 
-class APIEXTRACTOR_API TypeEntry
+class TypeEntry
 {
 public:
     enum Type {
@@ -988,7 +987,7 @@ typedef QHash<QString, QList<TypeEntry *> > TypeEntryHash;
 typedef QHash<QString, TypeEntry *> SingleTypeEntryHash;
 
 
-class APIEXTRACTOR_API TypeSystemTypeEntry : public TypeEntry
+class TypeSystemTypeEntry : public TypeEntry
 {
 public:
     TypeSystemTypeEntry(const QString &name, double vr)
@@ -997,19 +996,19 @@ public:
     };
 };
 
-class APIEXTRACTOR_API VoidTypeEntry : public TypeEntry
+class VoidTypeEntry : public TypeEntry
 {
 public:
     VoidTypeEntry() : TypeEntry("void", VoidType, 0) { }
 };
 
-class APIEXTRACTOR_API VarargsTypeEntry : public TypeEntry
+class VarargsTypeEntry : public TypeEntry
 {
 public:
     VarargsTypeEntry() : TypeEntry("...", VarargsType, 0) { }
 };
 
-class APIEXTRACTOR_API TemplateArgumentEntry : public TypeEntry
+class TemplateArgumentEntry : public TypeEntry
 {
 public:
     TemplateArgumentEntry(const QString &name, double vr)
@@ -1030,7 +1029,7 @@ private:
     int m_ordinal;
 };
 
-class APIEXTRACTOR_API ArrayTypeEntry : public TypeEntry
+class ArrayTypeEntry : public TypeEntry
 {
 public:
     ArrayTypeEntry(const TypeEntry *nested_type, double vr)
@@ -1065,7 +1064,7 @@ private:
 };
 
 
-class APIEXTRACTOR_API PrimitiveTypeEntry : public TypeEntry
+class PrimitiveTypeEntry : public TypeEntry
 {
 public:
     PrimitiveTypeEntry(const QString &name, double vr)
@@ -1163,7 +1162,7 @@ private:
 
 typedef QList<const PrimitiveTypeEntry*> PrimitiveTypeEntryList;
 
-struct APIEXTRACTOR_API EnumValueRedirection
+struct EnumValueRedirection
 {
     EnumValueRedirection(const QString &rej, const QString &us)
             : rejected(rej),
@@ -1174,7 +1173,7 @@ struct APIEXTRACTOR_API EnumValueRedirection
     QString used;
 };
 
-class APIEXTRACTOR_API EnumTypeEntry : public TypeEntry
+class EnumTypeEntry : public TypeEntry
 {
 public:
     EnumTypeEntry(const QString &nspace, const QString &enumName, double vr)
@@ -1325,7 +1324,7 @@ private:
     bool m_anonymous;
 };
 
-class APIEXTRACTOR_API EnumValueTypeEntry : public TypeEntry
+class EnumValueTypeEntry : public TypeEntry
 {
 public:
     EnumValueTypeEntry(const QString& name, const QString& value, const EnumTypeEntry* enclosingEnum, double vr)
@@ -1340,7 +1339,7 @@ private:
     const EnumTypeEntry* m_enclosingEnum;
 };
 
-class APIEXTRACTOR_API FlagsTypeEntry : public TypeEntry
+class FlagsTypeEntry : public TypeEntry
 {
 public:
     FlagsTypeEntry(const QString &name, double vr) : TypeEntry(name, FlagsType, vr), m_enum(0)
@@ -1402,7 +1401,7 @@ private:
 };
 
 
-class APIEXTRACTOR_API ComplexTypeEntry : public TypeEntry
+class ComplexTypeEntry : public TypeEntry
 {
 public:
     enum TypeFlag {
@@ -1669,7 +1668,7 @@ private:
     const ComplexTypeEntry* m_baseContainerType;
 };
 
-class APIEXTRACTOR_API ContainerTypeEntry : public ComplexTypeEntry
+class ContainerTypeEntry : public ComplexTypeEntry
 {
 public:
     enum Type {
@@ -1730,14 +1729,14 @@ private:
 
 typedef QList<const ContainerTypeEntry*> ContainerTypeEntryList;
 
-class APIEXTRACTOR_API NamespaceTypeEntry : public ComplexTypeEntry
+class NamespaceTypeEntry : public ComplexTypeEntry
 {
 public:
     NamespaceTypeEntry(const QString &name, double vr) : ComplexTypeEntry(name, NamespaceType, vr) { }
 };
 
 
-class APIEXTRACTOR_API ValueTypeEntry : public ComplexTypeEntry
+class ValueTypeEntry : public ComplexTypeEntry
 {
 public:
     ValueTypeEntry(const QString &name, double vr) : ComplexTypeEntry(name, BasicValueType, vr) { }
@@ -1757,7 +1756,7 @@ protected:
 };
 
 
-class APIEXTRACTOR_API StringTypeEntry : public ValueTypeEntry
+class StringTypeEntry : public ValueTypeEntry
 {
 public:
     StringTypeEntry(const QString &name, double vr)
@@ -1776,7 +1775,7 @@ public:
     }
 };
 
-class APIEXTRACTOR_API CharTypeEntry : public ValueTypeEntry
+class CharTypeEntry : public ValueTypeEntry
 {
 public:
     CharTypeEntry(const QString &name, double vr) : ValueTypeEntry(name, CharType, vr)
@@ -1797,7 +1796,7 @@ public:
     }
 };
 
-class APIEXTRACTOR_API VariantTypeEntry: public ValueTypeEntry
+class VariantTypeEntry: public ValueTypeEntry
 {
 public:
     VariantTypeEntry(const QString &name, double vr) : ValueTypeEntry(name, VariantType, vr) { }
@@ -1813,7 +1812,7 @@ public:
 };
 
 
-class APIEXTRACTOR_API InterfaceTypeEntry : public ComplexTypeEntry
+class InterfaceTypeEntry : public ComplexTypeEntry
 {
 public:
     InterfaceTypeEntry(const QString &name, double vr)
@@ -1847,7 +1846,7 @@ private:
 };
 
 
-class APIEXTRACTOR_API FunctionTypeEntry : public TypeEntry
+class FunctionTypeEntry : public TypeEntry
 {
 public:
     FunctionTypeEntry(const QString& name, const QString& signature, double vr)
@@ -1873,7 +1872,7 @@ private:
     QStringList m_signatures;
 };
 
-class APIEXTRACTOR_API ObjectTypeEntry : public ComplexTypeEntry
+class ObjectTypeEntry : public ComplexTypeEntry
 {
 public:
     ObjectTypeEntry(const QString &name, double vr)
@@ -1897,7 +1896,7 @@ private:
     InterfaceTypeEntry *m_interface;
 };
 
-struct APIEXTRACTOR_API TypeRejection
+struct TypeRejection
 {
     QString class_name;
     QString function_name;
@@ -1905,9 +1904,9 @@ struct APIEXTRACTOR_API TypeRejection
     QString enum_name;
 };
 
-APIEXTRACTOR_API QString fixCppTypeName(const QString &name);
+QString fixCppTypeName(const QString &name);
 
-class APIEXTRACTOR_API CustomConversion
+class CustomConversion
 {
 public:
     CustomConversion(TypeEntry* ownerType);
@@ -1917,7 +1916,7 @@ public:
     QString nativeToTargetConversion() const;
     void setNativeToTargetConversion(const QString& nativeToTargetConversion);
 
-    class APIEXTRACTOR_API TargetToNativeConversion
+    class TargetToNativeConversion
     {
     public:
         TargetToNativeConversion(const QString& sourceTypeName,