remove redundant QT_MANGLE_NAMESPACE() and Q_INIT_RESOURCE_EXTERN() macros

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/global/qglobal.h b/src/core/global/qglobal.h
index 9148d82..bdfc368 100644 (file)
--- a/src/core/global/qglobal.h
+++ b/src/core/global/qglobal.h
@@ -134,7 +134,6 @@
 
 # define QT_NAMESPACE Katie
 # define QT_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name
-# define QT_MANGLE_NAMESPACE(x) x
 # define QT_USE_NAMESPACE using namespace ::QT_NAMESPACE;
 
 # define QT_BEGIN_NAMESPACE namespace QT_NAMESPACE {
@@ -152,7 +151,6 @@ QT_USE_NAMESPACE
 
 # define QT_NAMESPACE
 # define QT_PREPEND_NAMESPACE(name) ::name
-# define QT_MANGLE_NAMESPACE(x) x
 # define QT_USE_NAMESPACE
 
 # define QT_BEGIN_NAMESPACE
@@ -285,7 +283,7 @@ QT_USE_NAMESPACE
 #define Q_DECL_CONSTEXPR constexpr
 
 #define Q_CONSTRUCTOR_FUNCTION0(AFUNC) \
-   static const int AFUNC ## __init_variable__ = AFUNC();
+    static const int AFUNC ## __init_variable__ = AFUNC();
 #define Q_CONSTRUCTOR_FUNCTION(AFUNC) Q_CONSTRUCTOR_FUNCTION0(AFUNC)
 
 #define Q_DESTRUCTOR_FUNCTION0(AFUNC) \
@@ -318,15 +316,12 @@ typedef unsigned long long quint64; /* 64 bit unsigned */
 typedef qint64 qlonglong;
 typedef quint64 qulonglong;
 
-#define Q_INIT_RESOURCE_EXTERN(name) \
-    extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) ();
-
 #define Q_INIT_RESOURCE(name) \
-    do { extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) ();       \
-        QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); } while (0)
+    extern int qInitResources_ ## name (); \
+    qInitResources_ ## name ();
 #define Q_CLEANUP_RESOURCE(name) \
-    do { extern int QT_MANGLE_NAMESPACE(qCleanupResources_ ## name) ();    \
-        QT_MANGLE_NAMESPACE(qCleanupResources_ ## name) (); } while (0)
+    extern int qCleanupResources_ ## name (); \
+    qCleanupResources_ ## name ();
 
 /*
    Useful type definitions for Qt
@@ -394,12 +389,9 @@ QT_END_INCLUDE_NAMESPACE
 #  define QT_FASTCALL
 #endif
 
+// This logic must match the one in qmetatype.h
 #if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A)
 #  define QT_NO_FPU
-#endif
-
-// This logic must match the one in qmetatype.h
-#if defined(QT_NO_FPU)
 typedef float qreal;
 #else
 typedef double qreal;
@@ -461,9 +453,6 @@ inline void qt_noop(void) {}
 */
 #if !defined(QT_NO_EXCEPTIONS) && !defined(Q_COMPILER_EXCEPTIONS) && !defined(Q_MOC_RUN)
 #  define QT_NO_EXCEPTIONS
-#endif
-
-#ifdef QT_NO_EXCEPTIONS
 #  define QT_TRY if (true)
 #  define QT_CATCH(A) else if (false)
 #  define QT_THROW(A) qt_noop()

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index a901aa7..6bb9fcc 100644 (file)
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -89,12 +89,9 @@
 
 static void initResources()
 {
-    Q_INIT_RESOURCE_EXTERN(qstyle)
     Q_INIT_RESOURCE(qstyle);
-    Q_INIT_RESOURCE_EXTERN(qmessagebox)
     Q_INIT_RESOURCE(qmessagebox);
 #if !defined(QT_NO_PRINTDIALOG)
-    Q_INIT_RESOURCE_EXTERN(qprintdialog)
     Q_INIT_RESOURCE(qprintdialog);
 #endif
 }

diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 65bf419..f6faf69 100644 (file)
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -878,17 +878,6 @@ bool RCCResourceLibrary::writeDataStructure()
     return true;
 }
 
-void RCCResourceLibrary::writeMangleNamespaceFunction(const QByteArray &name)
-{
-    if (m_useNameSpace) {
-        writeString("QT_MANGLE_NAMESPACE(");
-        writeByteArray(name);
-        writeChar(')');
-    } else {
-        writeByteArray(name);
-    }
-}
-
 void RCCResourceLibrary::writeAddNamespaceFunction(const QByteArray &name)
 {
     if (m_useNameSpace) {
@@ -923,7 +912,7 @@ bool RCCResourceLibrary::writeInitializer()
             writeString("QT_END_NAMESPACE\n\n\n");
         QString initResources = QLatin1String("qInitResources") + m_initName;
         writeString("int ");
-        writeMangleNamespaceFunction(initResources.toLatin1());
+        writeByteArray(initResources.toLatin1());
         writeString("()\n{\n");
 
         if (m_root) {
@@ -934,13 +923,13 @@ bool RCCResourceLibrary::writeInitializer()
         writeString("    return 1;\n");
         writeString("}\n\n");
         writeString("Q_CONSTRUCTOR_FUNCTION(");
-        writeMangleNamespaceFunction(initResources.toLatin1());
+        writeByteArray(initResources.toLatin1());
         writeString(")\n\n");
 
         //cleanup
         QString cleanResources = QLatin1String("qCleanupResources") + m_initName;
         writeString("int ");
-        writeMangleNamespaceFunction(cleanResources.toLatin1());
+        writeByteArray(cleanResources.toLatin1());
         writeString("()\n{\n");
         if (m_root) {
             writeString("    ");
@@ -950,7 +939,7 @@ bool RCCResourceLibrary::writeInitializer()
         writeString("    return 1;\n");
         writeString("}\n\n");
         writeString("Q_DESTRUCTOR_FUNCTION(");
-        writeMangleNamespaceFunction(cleanResources.toLatin1());
+        writeByteArray(cleanResources.toLatin1());
         writeString(")\n\n");
     } else if (m_format == Binary) {
         int i = 4;

diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h
index e2fd48c..4df3be3 100644 (file)
--- a/src/tools/rcc/rcc.h
+++ b/src/tools/rcc/rcc.h
@@ -102,7 +102,6 @@ private:
     bool writeDataNames();
     bool writeDataStructure();
     bool writeInitializer();
-    void writeMangleNamespaceFunction(const QByteArray &name);
     void writeAddNamespaceFunction(const QByteArray &name);
     void writeHex(quint8 number);
     void writeNumber2(quint16 number);