# HG changeset patch
# User Max Samukha <maxter@spambox.com>
# Date 1274807644 -10800
# Node ID 12cec2d14e1c921ead2f52dd6c8de6ca63bd9161
# Parent  08c1ca7975abf2ecdb81fd6cda9562ab1c2364c1
a better name for qtd.Str

diff -r 08c1ca7975ab -r 12cec2d14e1c build/core.txt
--- a/build/core.txt	Tue May 25 17:23:11 2010 +0300
+++ b/build/core.txt	Tue May 25 20:14:04 2010 +0300
@@ -27,7 +27,7 @@
 set (d_qtd_files
     QtdObject
     Signal
-    Str
+    String
     Atomic
     Marshal
     MOC
diff -r 08c1ca7975ab -r 12cec2d14e1c d2/qt/QGlobal.d
--- a/d2/qt/QGlobal.d	Tue May 25 17:23:11 2010 +0300
+++ b/d2/qt/QGlobal.d	Tue May 25 20:14:04 2010 +0300
@@ -1,6 +1,6 @@
 module qt.QGlobal;
 
-public import qtd.Str;
+public import qtd.String;
 public import qt.QDefines;
 
 version (Tango)
diff -r 08c1ca7975ab -r 12cec2d14e1c d2/qtd/MOC.d
--- a/d2/qtd/MOC.d	Tue May 25 17:23:11 2010 +0300
+++ b/d2/qtd/MOC.d	Tue May 25 20:14:04 2010 +0300
@@ -9,7 +9,7 @@
     qtd.Signal,
     qtd.Marshal,
     qtd.Array,
-    qtd.Str,
+    qtd.String,
     qtd.meta.Compiletime,
     qtd.ctfe.Format;
 
diff -r 08c1ca7975ab -r 12cec2d14e1c d2/qtd/Str.d
--- a/d2/qtd/Str.d	Tue May 25 17:23:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/**
- *
- *  Copyright: Copyright QtD Team, 2008-2009
- *  License: <a href="http://www.boost.org/LICENSE_1_0.txt>Boost License 1.0</a>
- *
- *  Copyright QtD Team, 2008-2009
- *  Distributed under the Boost Software License, Version 1.0.
- *  (See accompanying file boost-license-1.0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
-module qtd.Str;
-
-import core.stdc.string;
-import std.utf : toUTF8;
-
-alias immutable(char)* stringz;
-alias const(char)* cstringz;
-
-/**
- */
-static char** toStringzArray(string[] args)
-{
-    if ( args is null )
-    {
-        return null;
-    }
-    char** argv = (new char*[args.length]).ptr;
-    int argc = 0;
-    foreach (string p; args)
-    {
-        argv[argc++] = cast(char*)(p.dup~'\0');
-    }
-    argv[argc] = null;
-
-    return argv;
-}
-
-/**
- */
-bool isDigit(char s)
-{
-    return (s >= '0' && s <= '9');
-}
-
-/**
- */
-bool isOctalChar(char s)
-{
-    return (s >= '0' && s <= '7');
-}
-
-/**
- */
-bool isHexChar(char s)
-{
-    return ((s >= 'a' && s <= 'f')
-            || (s >= 'A' && s <= 'F')
-            || (s >= '0' && s <= '9')
-       );
-}
-
-/**
- */
-string fromStringz(const (char) *s)
-{
-    return s ? s[0 .. strlen(s)].idup : cast(string)null;
-}
-
-extern(C) void qtd_toUtf8(wchar* arr, uint size, string* str)
-{
-    *str = toUTF8(arr[0..size]);
-}
-
-
-
diff -r 08c1ca7975ab -r 12cec2d14e1c d2/qtd/String.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/d2/qtd/String.d	Tue May 25 20:14:04 2010 +0300
@@ -0,0 +1,76 @@
+/**
+ *
+ *  Copyright: Copyright QtD Team, 2008-2009
+ *  License: <a href="http://www.boost.org/LICENSE_1_0.txt>Boost License 1.0</a>
+ *
+ *  Copyright QtD Team, 2008-2009
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file boost-license-1.0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+module qtd.String;
+
+import core.stdc.string;
+import std.utf : toUTF8;
+
+alias immutable(char)* stringz;
+alias const(char)* cstringz;
+
+/**
+ */
+static char** toStringzArray(string[] args)
+{
+    if ( args is null )
+    {
+        return null;
+    }
+    char** argv = (new char*[args.length]).ptr;
+    int argc = 0;
+    foreach (string p; args)
+    {
+        argv[argc++] = cast(char*)(p.dup~'\0');
+    }
+    argv[argc] = null;
+
+    return argv;
+}
+
+/**
+ */
+bool isDigit(char s)
+{
+    return (s >= '0' && s <= '9');
+}
+
+/**
+ */
+bool isOctalChar(char s)
+{
+    return (s >= '0' && s <= '7');
+}
+
+/**
+ */
+bool isHexChar(char s)
+{
+    return ((s >= 'a' && s <= 'f')
+            || (s >= 'A' && s <= 'F')
+            || (s >= '0' && s <= '9')
+       );
+}
+
+/**
+ */
+string fromStringz(const (char) *s)
+{
+    return s ? s[0 .. strlen(s)].idup : cast(string)null;
+}
+
+extern(C) void qtd_toUtf8(wchar* arr, uint size, string* str)
+{
+    *str = toUTF8(arr[0..size]);
+}
+
+
+
diff -r 08c1ca7975ab -r 12cec2d14e1c generator/typesystem_core.xml
--- a/generator/typesystem_core.xml	Tue May 25 17:23:11 2010 +0300
+++ b/generator/typesystem_core.xml	Tue May 25 20:14:04 2010 +0300
@@ -2378,26 +2378,6 @@
     return (void*)((QObject*)nativeId)->metaObject();
 }
 
-<!--
-extern "C" DLL_PUBLIC void qtd_connect(void* nativeId, char* signal, int id, bool dynamicEntity)
-{   
-    QObject *sender = (QObject*)nativeId;
-    QObject *receiver = dynamicEntity ? dynamic_cast&lt;QObject*&gt;(QObject::getQObjectEntity(sender)) : sender;
-    const QMetaObject *mo = sender->metaObject();
-    int nativeSigId = mo-&gt;indexOfSignal(signal);
-    QMetaObject::connect(sender, nativeSigId, receiver, receiver-&gt;metaObject()-&gt;methodCount() + id);
-}
-
-extern "C" DLL_PUBLIC void qtd_disconnect(void* nativeId, char* signal, int id, bool dynamicEntity)
-{
-    QObject *sender = (QObject*)nativeId;
-    QObject *receiver = dynamicEntity ? dynamic_cast&lt;QObject*&gt;(QtD_QObjectEntity::getQObjectEntity(sender)) : sender;
-    const QMetaObject *mo = sender->metaObject();    
-    int nativeSigId = mo-&gt;indexOfSignal(signal);
-    QMetaObject::disconnect(sender, nativeSigId, receiver, receiver-&gt;metaObject()-&gt;methodCount() + id);
-}
--->
-
  	</inject-code>
 
 	<inject-code class="java-free">
@@ -2484,7 +2464,7 @@
     </extra-includes>
 
     <extra-includes>
-        <include file-name="qtd.Str" location="java"/>
+        <include file-name="qtd.String" location="java"/>
     </extra-includes>
 
     <modify-function signature="argv()" remove="all"/> <!-- Obsolete -->
diff -r 08c1ca7975ab -r 12cec2d14e1c generator/typesystem_gui-java.java
--- a/generator/typesystem_gui-java.java	Tue May 25 17:23:11 2010 +0300
+++ b/generator/typesystem_gui-java.java	Tue May 25 20:14:04 2010 +0300
@@ -291,7 +291,7 @@
 }// class
 
 class QImage___ extends QImage {
-    private import qtd.Str;
+    private import qtd.String;
 
     public this(string[] xpm) {
         this(toStringzArray(xpm));
@@ -477,7 +477,7 @@
 
 class QPixmap___ extends QPixmap {
 
-        private import qtd.Str;
+        private import qtd.String;
 
     public this(string[] xpm) {
 		this(toStringzArray(xpm));
diff -r 08c1ca7975ab -r 12cec2d14e1c generator/typesystem_gui.xml
--- a/generator/typesystem_gui.xml	Tue May 25 17:23:11 2010 +0300
+++ b/generator/typesystem_gui.xml	Tue May 25 20:14:04 2010 +0300
@@ -7523,7 +7523,7 @@
       <include file-name="QIcon" location="global"/>
       <include file-name="QLocale" location="global"/>
 
-      <include file-name="qtd.Str" location="java"/>
+      <include file-name="qtd.String" location="java"/>
     </extra-includes>
 
     <modify-function signature="QApplication(int &amp;, char  **, int)">