diff tools/drcc/rcc.cpp @ 372:a032df77b6ab

Simple debug helper. Unittests. Meta-object for polymorphic non-QObjects
author Max Samukha <maxter@spambox.com>
date Thu, 08 Jul 2010 17:19:05 +0300
parents 39337877e05c
children
line wrap: on
line diff
--- a/tools/drcc/rcc.cpp	Sun Jul 04 14:17:49 2010 +0100
+++ b/tools/drcc/rcc.cpp	Thu Jul 08 17:19:05 2010 +0300
@@ -733,7 +733,7 @@
 {
     Q_ASSERT(m_errorDevice);
     if (m_format == C_Code)
-        writeString("static const ubyte[] qt_resource_data = [\n");
+        writeString("static immutable ubyte[] qt_resource_data = [\n");
     else if (m_format == Binary)
         m_dataOffset = m_out.size();
     QStack<RCCFileInfo*> pending;
@@ -766,7 +766,7 @@
 bool RCCResourceLibrary::writeDataNames()
 {
     if (m_format == C_Code)
-        writeString("static const ubyte[] qt_resource_name = [\n");
+        writeString("static immutable ubyte[] qt_resource_name = [\n");
     else if (m_format == Binary)
         m_namesOffset = m_out.size();
 
@@ -806,7 +806,7 @@
 bool RCCResourceLibrary::writeDataStructure()
 {
     if (m_format == C_Code)
-        writeString("static const ubyte[] qt_resource_struct = [\n");
+        writeString("static immutable ubyte[] qt_resource_struct = [\n");
     else if (m_format == Binary)
         m_treeOffset = m_out.size();
     QStack<RCCFileInfo*> pending;
@@ -894,8 +894,8 @@
         if (m_useNameSpace)
             writeString("// QT_BEGIN_NAMESPACE\n\n");
         if (m_root) {
-            writeString("extern(C) bool qtd_register_resource_data(int version_, in ubyte *tree, in ubyte *name, in ubyte *data);\n\n");
-            writeString("extern(C) bool qtd_unregister_resource_data(int version_, in ubyte *tree, in ubyte *name, in ubyte *data);\n\n");
+            writeString("extern(C) bool qtd_qRegisterResourceData(int version_, in ubyte *tree, in ubyte *name, in ubyte *data);\n\n");
+            writeString("extern(C) bool qtd_qUnregisterResourceData(int version_, in ubyte *tree, in ubyte *name, in ubyte *data);\n\n");
         }
         if (m_useNameSpace)
             writeString("// QT_END_NAMESPACE\n\n\n");
@@ -907,7 +907,7 @@
 
         if (m_root) {
             writeString("    ");
-            writeString("qtd_register_resource_data(0x01, qt_resource_struct.ptr, "
+            writeString("qtd_qRegisterResourceData(0x01, qt_resource_struct.ptr, "
                        "qt_resource_name.ptr, qt_resource_data.ptr);\n");
         }
         writeString("    return 1;\n");
@@ -921,12 +921,12 @@
         writeString("()\n{\n");
         if (m_root) {
             writeString("    ");
-            writeString("qtd_unregister_resource_data(0x01, qt_resource_struct.ptr, "
+            writeString("qtd_qUnregisterResourceData(0x01, qt_resource_struct.ptr, "
                       "qt_resource_name.ptr, qt_resource_data.ptr);\n");
         }
         writeString("    return 1;\n");
         writeString("}\n\n");
-	
+        
         if(staticInitialize())
         {
             writeString("static this() \n{\n    ");