Mercurial > projects > qtd

diff generator/typesystem.cpp @ 335:1e9092e20a67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge signals branch into default
author eldar1@eldar1-laptop
date Sun, 07 Feb 2010 16:04:36 +0000
parents 04b52676b45f
children 4920ef9206fe
line wrap: on
line diff
--- a/generator/typesystem.cpp	Sat Dec 19 18:43:32 2009 +0300
+++ b/generator/typesystem.cpp	Sun Feb 07 16:04:36 2010 +0000
@@ -96,6 +96,7 @@
         // qtd stuff
         AddClass                    = 0x1100,
         PackageDepend               = 0x1200,
+        PrivateCopyConstructor      = 0x1300,
 
         // Code snip tags (0x1000, 0x2000, ... , 0xf000)
         InjectCode =           0x1000,
@@ -163,6 +164,7 @@
         tagNames["rename"] = StackElement::Rename;
         tagNames["typesystem"] = StackElement::Root;
         tagNames["custom-constructor"] = StackElement::CustomMetaConstructor;
+        tagNames["private-copy-constructor"] = StackElement::PrivateCopyConstructor;
         tagNames["custom-destructor"] = StackElement::CustomMetaDestructor;
         tagNames["argument-map"] = StackElement::ArgumentMap;
         tagNames["suppress-warning"] = StackElement::SuppressedWarning;
@@ -299,6 +301,11 @@
             delete current->value.customFunction;
         }
         break;
+    case StackElement::PrivateCopyConstructor:
+        {
+            current->entry->setHasPrivateCopyConstructor(true);
+        }
+        break;
     case StackElement::CustomMetaDestructor:
         {
             current->entry->setCustomDestructor(*current->value.customFunction);
@@ -1677,19 +1684,17 @@
 
 QString ContainerTypeEntry::javaPackage() const
 {
-    if (m_type == PairContainer)
-        return "qt";
-    return "java.util";
+    return "qt.core";
 }
 
 QString ContainerTypeEntry::targetLangName() const
 {
 
     switch (m_type) {
-    case StringListContainer: return "List";
-    case ListContainer: return "List";
-    case LinkedListContainer: return "LinkedList";
-    case VectorContainer: return "List";
+    case StringListContainer: return "QList";
+    case ListContainer: return "QList";
+    case LinkedListContainer: return "QLinkedList";
+    case VectorContainer: return "QVector";
     case StackContainer: return "Stack";
     case QueueContainer: return "Queue";
     case SetContainer: return "Set";