0
@@ -1,35 +1,35 @@
0
-RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.7.4
0
+RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.7.5
0
 
0
 1. This LICENSE AGREEMENT is between Riverbank Computing Limited
0
 ("Riverbank"), and the Individual or Organization ("Licensee") accessing
0
-and otherwise using SIP 4.7.4 software in source or binary form and its
0
+and otherwise using SIP 4.7.5 software in source or binary form and its
0
 associated documentation.
0
 
0
 2. Subject to the terms and conditions of this License Agreement, Riverbank
0
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
0
 to reproduce, analyze, test, perform and/or display publicly, prepare
0
-derivative works, distribute, and otherwise use SIP 4.7.4 alone or in
0
+derivative works, distribute, and otherwise use SIP 4.7.5 alone or in
0
 any derivative version, provided, however, that Riverbank's License
0
-Agreement and Riverbank's notice of copyright, i.e., "Copyright (c) 2004
0
+Agreement and Riverbank's notice of copyright, e.g., "Copyright (c) 2008
0
 Riverbank Computing Limited; All Rights Reserved" are retained in
0
-SIP 4.7.4 alone or in any derivative version prepared by Licensee.
0
+SIP 4.7.5 alone or in any derivative version prepared by Licensee.
0
 
0
 3. In the event Licensee prepares a derivative work that is based on
0
-or incorporates SIP 4.7.4 or any part thereof, and wants to make
0
+or incorporates SIP 4.7.5 or any part thereof, and wants to make
0
 the derivative work available to others as provided herein, then
0
 Licensee hereby agrees to include in any such work a brief summary of
0
-the changes made to SIP 4.7.4.
0
+the changes made to SIP 4.7.5.
0
 
0
-4. Riverbank is making SIP 4.7.4 available to Licensee on an "AS IS"
0
+4. Riverbank is making SIP 4.7.5 available to Licensee on an "AS IS"
0
 basis.  RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
0
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND
0
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
0
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.7.4 WILL NOT
0
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.7.5 WILL NOT
0
 INFRINGE ANY THIRD PARTY RIGHTS.
0
 
0
 5. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
0
-SIP 4.7.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
0
-AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.7.4,
0
+SIP 4.7.5 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
0
+AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.7.5,
0
 OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
0
 
0
 6. This License Agreement will automatically terminate upon a material
0
@@ -41,5 +41,5 @@ and Licensee.  This License Agreement does not grant permission to use
0
 Riverbank trademarks or trade name in a trademark sense to endorse or
0
 promote products or services of Licensee, or any third party.
0
 
0
-8. By copying, installing or otherwise using SIP 4.7.4, Licensee
0
+8. By copying, installing or otherwise using SIP 4.7.5, Licensee
0
 agrees to be bound by the terms and conditions of this License Agreement.

0
@@ -36,16 +36,23 @@ extend sipParseArgs() to take an options dictionary and list of keywords.
0
 
0
 25.  Add support for specifying docstrings for generated methods.
0
 
0
-26.	Fully implement QObject.disconnect().
0
-
0
-27.	Look at adding QObject.Q_OBJECT() that will create the moc generated
0
-methods dynamically (maybe just the tr() functions).
0
-
0
 28.  Consider creating a copy of a const reference when wrapping it in order
0
 to enforce const in Python.  Or add a flag to the wrapper which says it is a
0
 const instance.  I think the only to way to implement it is to have a "const"
0
 Python type - an instance of which will point to the underlying Python object.
0
 This will enable const_cast to be implemented.
0
 
0
-30.	Add support for specifying the reverse arithmetic operators.  (Or just
0
-document that you should use the normal ones as global operators?)
0
+31.	Allow (some) handwritten code to be implemented in Python.
0
+
0
+32.	Consider support for Python properties. Something like...
0
+
0
+		const char *GetTitle() const /PropertyGetter=Title/;
0
+		void SetTitle(const char *title) /PropertySetter=Title/;
0
+
0
+	...which would define the getter and setter for a property "Title".
0
+	Would the getter and setter also be exposed as separate functions?
0
+	Would that be an option?  You could infer the property name (by
0
+	removing the optional leading [Gg]et and [Ss]set...
0
+
0
+		const char *GetTitle() const /Property/;
0
+		void SetTitle(const char *title) /Property/;

0
@@ -1,7 +1,6 @@
0
 # This script handles the SIP configuration and generates the Makefiles.
0
 #
0
-# Copyright (c) 2008
0
-# 	Phil Thompson <phil@river-bank.demon.co.uk>
0
+# Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
0
 # 
0
 # This file is part of SIP.
0
 # 
0
@@ -23,8 +22,8 @@ import siputils
0
 
0
 
0
 # Initialise the globals.
0
-sip_version = 0x040704
0
-sip_version_str = "4.7.4"
0
+sip_version = 0x040705
0
+sip_version_str = "4.7.5-snapshot-20080424"
0
 py_version = sys.hexversion >> 8
0
 plat_py_site_dir = None
0
 plat_py_inc_dir = None
0
@@ -212,7 +211,7 @@ def set_platform_directories():
0
     global plat_bin_dir, plat_py_lib_dir, plat_sip_dir
0
 
0
     # We trust distutils for some stuff.
0
-    plat_py_site_dir = sysconfig.get_python_lib()
0
+    plat_py_site_dir = sysconfig.get_python_lib(plat_specific=1)
0
     plat_py_inc_dir = sysconfig.get_python_inc()
0
     plat_py_conf_inc_dir = os.path.dirname(sysconfig.get_config_h_filename())
0
 
0
@@ -221,17 +220,7 @@ def set_platform_directories():
0
         plat_bin_dir = sys.exec_prefix
0
         plat_sip_dir = sys.prefix + "\\sip"
0
     else:
0
-        vers = "%d.%d" % ((py_version >> 16) & 0xff, (py_version >> 8) & 0xff)
0
-
0
-        # Some 64 bit Linux distros (Mandriva, SuSE) seem to add sys.lib as a
0
-        # non-standard extension presumably to allow 32 and 64 bit versions to
0
-        # be installed side by side.  Use it if it seems to be available.
0
-        try:
0
-            lib_dir = sys.lib
0
-        except AttributeError:
0
-            lib_dir = "lib"
0
-
0
-        lib_dir = sys.prefix + "/" + lib_dir + "/python" + vers
0
+        lib_dir = sysconfig.get_python_lib(plat_specific=1, standard_lib=1)
0
 
0
         plat_py_lib_dir = lib_dir + "/config"
0
         plat_bin_dir = sys.exec_prefix + "/bin"

0
@@ -1,8 +1,7 @@
0
 /*
0
  * The XML and API file generator module for SIP.
0
  *
0
- * Copyright (c) 2008
0
- * 	Phil Thompson <phil@river-bank.demon.co.uk>
0
+ * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
0
  * 
0
  * This file is part of SIP.
0
  * 

0
@@ -1,8 +1,7 @@
0
 /*
0
  * The code generator module for SIP.
0
  *
0
- * Copyright (c) 2008
0
- * 	Phil Thompson <phil@river-bank.demon.co.uk>
0
+ * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
0
  * 
0
  * This file is part of SIP.
0
  * 
0
@@ -32,9 +31,8 @@
0
 #define TYPE_FLAGS_MASK         0x0f00
0
 
0
 
0
-/* Control what generateSingleArg() actually generates. */
0
+/* Control what generateCalledArgs() actually generates. */
0
 typedef enum {
0
-    Call,
0
     Declaration,
0
     Definition
0
 } funcArgType;
0
@@ -106,10 +104,11 @@ static void generateShadowClassDeclaration(sipSpec *, classDef *, FILE *);
0
 static int hasConvertToCode(argDef *ad);
0
 static void deleteTemps(signatureDef *sd, FILE *fp);
0
 static void gc_ellipsis(signatureDef *sd, FILE *fp);
0
-static void generateArgs(classDef *, signatureDef *, funcArgType, FILE *);
0
+static void generateCallArgs(classDef *, signatureDef *, signatureDef *,
0
+        FILE *);
0
+static void generateCalledArgs(classDef *, signatureDef *, funcArgType, FILE *);
0
 static void generateVariable(classDef *, argDef *, int, FILE *);
0
 static void generateNamedValueType(classDef *, argDef *, char *, FILE *);
0
-static void generateSingleArg(classDef *, argDef *, int, funcArgType, FILE *);
0
 static void generateBaseType(classDef *, argDef *, FILE *);
0
 static void generateNamedBaseType(classDef *, argDef *, char *, FILE *);
0
 static void generateTupleBuilder(signatureDef *, FILE *);
0
@@ -125,7 +124,7 @@ static void generateProtectedDeclarations(classDef *, FILE *);
0
 static void generateProtectedDefinitions(classDef *, FILE *);
0
 static void generateProtectedCallArgs(overDef *od, FILE *fp);
0
 static void generateConstructorCall(classDef *, ctorDef *, int, FILE *);
0
-static void generateHandleResult(overDef *, int, char *, FILE *);
0
+static void generateHandleResult(overDef *, int, int, char *, FILE *);
0
 static void generateOrdinaryFunction(moduleDef *mod, classDef *cd,
0
         memberDef *md, FILE *fp);
0
 static void generateSimpleFunctionCall(fcallDef *, FILE *);
0
@@ -603,6 +602,16 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
0
 "#define sipString_AsChar            sipAPI_%s->api_string_as_char\n"
0
 "#define sipUnicode_AsWChar          sipAPI_%s->api_unicode_as_wchar\n"
0
 "#define sipUnicode_AsWString        sipAPI_%s->api_unicode_as_wstring\n"
0
+"#define sipConvertFromConstVoidPtr  sipAPI_%s->api_convert_from_const_void_ptr\n"
0
+"#define sipConvertFromVoidPtrAndSize    sipAPI_%s->api_convert_from_void_ptr_and_size\n"
0
+"#define sipConvertFromConstVoidPtrAndSize   sipAPI_%s->api_convert_from_const_void_ptr_and_size\n"
0
+"#define sipInvokeSlot               sipAPI_%s->api_invoke_slot\n"
0
+"#define sipParseType                sipAPI_%s->api_parse_type\n"
0
+        ,mname
0
+        ,mname
0
+        ,mname
0
+        ,mname
0
+        ,mname
0
         ,mname
0
         ,mname
0
         ,mname
0
@@ -1820,9 +1829,14 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
0
 
0
     for (md = mod->othfuncs; md != NULL; md = md->next)
0
         if (md->slot == no_slot)
0
-            prcode(fp,
0
+            if (noArgParser(md))
0
+                prcode(fp,
0
+"        {%N, (PyCFunction)func_%s, METH_KEYWORDS, NULL},\n"
0
+                    , md->pyname, md->pyname->text);
0
+            else
0
+                prcode(fp,
0
 "        {%N, func_%s, METH_VARARGS, NULL},\n"
0
-                , md->pyname, md->pyname->text);
0
+                    , md->pyname, md->pyname->text);
0
 
0
     prcode(fp,
0
 "        {0, 0, 0, 0}\n"
0
@@ -2138,12 +2152,13 @@ static void generateEncodedClass(moduleDef *mod, classDef *cd, int last,
0
 
0
 
0
 /*
0
- * Generate an ordinary function (ie. not a class method).
0
+ * Generate an ordinary function.
0
  */
0
 static void generateOrdinaryFunction(moduleDef *mod, classDef *cd,
0
         memberDef *md, FILE *fp)
0
 {
0
     overDef *od;
0
+    int need_intro;
0
 
0
     prcode(fp,
0
 "\n"
0
@@ -2165,39 +2180,73 @@ static void generateOrdinaryFunction(moduleDef *mod, classDef *cd,
0
     }
0
     else
0
     {
0
+        const char *self = (generating_c ? "sipSelf" : "");
0
+
0
         if (!generating_c)
0
-            prcode(fp,
0
+            if (noArgParser(md))
0
+                prcode(fp,
0
+"extern \"C\" {static PyObject *func_%s(PyObject *,PyObject *,PyObject *);}\n"
0
+                    , md->pyname->text);
0
+            else
0
+                prcode(fp,
0
 "extern \"C\" {static PyObject *func_%s(PyObject *,PyObject *);}\n"
0
-                , md->pyname->text);
0
+                    , md->pyname->text);
0
 
0
-        prcode(fp,
0
+        if (noArgParser(md))
0
+            prcode(fp,
0
+"static PyObject *func_%s(PyObject *%s,PyObject *sipArgs,PyObject *sipKwds)\n"
0
+                , md->pyname->text, self);
0
+        else
0
+            prcode(fp,
0
 "static PyObject *func_%s(PyObject *%s,PyObject *sipArgs)\n"
0
-            ,md->pyname->text,(generating_c ? "sipSelf" : ""));
0
+                , md->pyname->text, self);
0
 
0
         od = mod->overs;
0
     }
0
 
0
     prcode(fp,
0
 "{\n"
0
-"    int sipArgsParsed = 0;\n"
0
         );
0
 
0
+    need_intro = TRUE;
0
+
0
     while (od != NULL)
0
     {
0
         if (od->common == md)
0
+        {
0
+            if (noArgParser(md))
0
+            {