diff generator/abstractmetalang.cpp @ 357:9784459f0750

An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables Q_CLASSINFO implementation Now Qtd can be built on Windows
author Max Samukha <maxter@spambox.com>
date Wed, 02 Jun 2010 19:38:05 +0300
parents 18bd68f586c6
children 7341c47790d4
line wrap: on
line diff
--- a/generator/abstractmetalang.cpp	Tue May 25 20:14:04 2010 +0300
+++ b/generator/abstractmetalang.cpp	Wed Jun 02 19:38:05 2010 +0300
@@ -206,13 +206,16 @@
     return false;
 }
 
-QString AbstractMetaFunction::marshalledName(bool classIsOwner) const
+QString AbstractMetaFunction::marshalledName(Options options) const
 {
-    QString returned = "qtd_";
-    if(classIsOwner)
+    QString returned;
+    if (!(options & NoExternNamespace))
+        returned += "qtd_";
+
+    if(options & DeclaringClass)
+        returned += declaringClass()->name();
+    else
         returned += ownerClass()->name();
-    else
-        returned += declaringClass()->name();
 
     returned += "_" + name();
     AbstractMetaArgumentList arguments = this->arguments();