Rename sip into sip-tqt in order to be conflict free with upstream.

This relates to bug 2699.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

11 files changed, 140 insertions, 140 deletions

diff --git a/siplib/apiversions.c b/siplib/apiversions.c
index 7d86c76..f278c6b 100644
--- a/siplib/apiversions.c
+++ b/siplib/apiversions.c
@@ -3,16 +3,16 @@
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include "sip.h"
+#include "sip-tqt.h"
 #include "sipint.h"
 
 
diff --git a/siplib/bool.cpp b/siplib/bool.cpp
index 8936287..42238de 100644
--- a/siplib/bool.cpp
+++ b/siplib/bool.cpp
@@ -2,16 +2,16 @@
 //
 // Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
 //
-// This file is part of SIP.
+// This file is part of SIP-TQt.
 //
-// This copy of SIP is licensed for use under the terms of the SIP License
+// This copy of SIP-TQt is licensed for use under the terms of the SIP License
 // Agreement.  See the file LICENSE for more details.
 //
-// This copy of SIP may also used under the terms of the GNU General Public
+// This copy of SIP-TQt may also used under the terms of the GNU General Public
 // License v2 or v3 as published by the Free Software Foundation which can be
 // found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
 //
-// SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+// SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
diff --git a/siplib/descriptors.c b/siplib/descriptors.c
index 29277c5..009a03e 100644
--- a/siplib/descriptors.c
+++ b/siplib/descriptors.c
@@ -3,23 +3,23 @@
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 
 #include <Python.h>
 
-#include "sip.h"
+#include "sip-tqt.h"
 #include "sipint.h"
 
 
@@ -51,7 +51,7 @@ typedef struct _sipMethodDescr {
  */
 PyTypeObject sipMethodDescr_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "sip.methoddescriptor", /* tp_name */
+    "sip_tqt.methoddescriptor", /* tp_name */
     sizeof (sipMethodDescr),    /* tp_basicsize */
     0,                      /* tp_itemsize */
     0,                      /* tp_dealloc */
@@ -168,7 +168,7 @@ typedef struct _sipVariableDescr {
  */
 PyTypeObject sipVariableDescr_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "sip.variabledescriptor",   /* tp_name */
+    "sip_tqt.variabledescriptor",   /* tp_name */
     sizeof (sipVariableDescr),  /* tp_basicsize */
     0,                      /* tp_itemsize */
     0,                      /* tp_dealloc */
diff --git a/siplib/objmap.c b/siplib/objmap.c
index f9c196d..3376a99 100644
--- a/siplib/objmap.c
+++ b/siplib/objmap.c
@@ -4,23 +4,23 @@
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 
 #include <string.h>
 
-#include "sip.h"
+#include "sip-tqt.h"
 #include "sipint.h"
 
 
diff --git a/siplib/sip.h b/siplib/sip-tqt.h
index 3e9a3c6..845ed6d 100644
--- a/siplib/sip.h
+++ b/siplib/sip-tqt.h
@@ -1,24 +1,24 @@
 /*
- * The SIP module interface.
+ * The SIP-TQt module interface.
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 
-#ifndef _SIP_H
-#define _SIP_H
+#ifndef _SIP_TQT_H
+#define _SIP_TQT_H
 
 
 /*
@@ -47,19 +47,19 @@ extern "C" {
 
 /* Sanity check on the Python version. */
 #if PY_VERSION_HEX < 0x02030000
-#error "This version of SIP requires Python v2.3 or later"
+#error "This version of SIP-TQt requires Python v2.3 or later"
 #endif
 
 
 /*
- * Define the SIP version number.
+ * Define the SIP-TQt version number.
  */
-#define SIP_VERSION         0x040a05
-#define SIP_VERSION_STR     "4.10.5"
+#define SIP_TQT_VERSION         0x040a05
+#define SIP_TQT_VERSION_STR     "4.10.5"
 
 
 /*
- * Define the current API version number.  SIP must handle modules with the
+ * Define the current API version number.  SIP-TQt must handle modules with the
  * same major number and with the same or earlier minor number.  Whenever data
  * structure elements are added they must be appended and the minor number
  * incremented.  Whenever data structure elements are removed or the order
@@ -168,11 +168,11 @@ extern "C" {
  *
  * 0.0  Original version.
  */
-#define SIP_API_MAJOR_NR    7
-#define SIP_API_MINOR_NR    1
+#define SIP_TQT_API_MAJOR_NR    7
+#define SIP_TQT_API_MINOR_NR    1
 
 
-/* Some compatibility stuff to help with handwritten code for SIP v3. */
+/* Some compatibility stuff to help with handwritten code for SIP-TQt v3. */
 #if !defined(ANY)
 #define ANY     void
 #endif
@@ -909,7 +909,7 @@ typedef struct _sipExportedModuleDef {
     /* The next in the list. */
     struct _sipExportedModuleDef *em_next;
 
-    /* The SIP API minor version number. */
+    /* The SIP-TQt API minor version number. */
     unsigned em_api_minor;
 
     /* The module name. */
@@ -1217,7 +1217,7 @@ typedef struct _sipSlot {
 
 
 /*
- * The API exported by the SIP module, ie. pointers to all the data and
+ * The API exported by the SIP-TQt module, ie. pointers to all the data and
  * functions that can be used by generated code.
  */
 typedef struct _sipAPIDef {
@@ -1495,7 +1495,7 @@ typedef struct _sipTQtAPI {
 
 
 /*
- * The following are PyTQt3-specific extensions.  In SIP v5 they will be pushed
+ * The following are PyTQt3-specific extensions.  In SIP-TQt v5 they will be pushed
  * out to a plugin supplied by PyTQt3.
  */
 
@@ -1530,12 +1530,12 @@ typedef struct _pyqt3ClassTypeDef {
 
 
 /*
- * The following are PyTQt4-specific extensions.  In SIP v5 they will be pushed
- * out to a plugin supplied by PyTQt4.
+ * The following are PyQt4-specific extensions.  In SIP-TQt v5 they will be pushed
+ * out to a plugin supplied by PyQt4.
  */
 
 /*
- * The description of a TQt signal for PyTQt4.
+ * The description of a TQt signal for PyQt4.
  */
 typedef struct _pyqt4QtSignal {
     /* The C++ name and signature of the signal. */
@@ -1553,7 +1553,7 @@ typedef struct _pyqt4QtSignal {
 
 
 /*
- * This is the PyTQt4-specific extension to the generated class type structure.
+ * This is the PyQt4-specific extension to the generated class type structure.
  */
 typedef struct _pyqt4ClassTypeDef {
     /*
@@ -1562,12 +1562,12 @@ typedef struct _pyqt4ClassTypeDef {
      */
     sipClassTypeDef super;
 
-    /* A pointer to the TQObject sub-class's staticMetaObject class variable. */
+    /* A pointer to the QObject sub-class's staticMetaObject class variable. */
     const void *qt4_static_metaobject;
 
     /*
      * A set of flags.  At the moment only bit 0 is used to say if the type is
-     * derived from TQFlags.
+     * derived from QFlags.
      */
     unsigned qt4_flags;
 
diff --git a/siplib/sipint.h b/siplib/sipint.h
index 3758b36..f229fbe 100644
--- a/siplib/sipint.h
+++ b/siplib/sipint.h
@@ -1,18 +1,18 @@
 /*
- * This file defines the SIP library internal interfaces.
+ * This file defines the SIP-TQt library internal interfaces.
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
@@ -102,7 +102,7 @@ PyObject *sip_api_disconnect_rx(PyObject *txObj, const char *sig,
 
 
 /*
- * These are part of the SIP API but are also used within the SIP module.
+ * These are part of the SIP-TQt API but are also used within the SIP-TQt module.
  */
 void *sip_api_malloc(size_t nbytes);
 void sip_api_free(void *mem);
@@ -121,7 +121,7 @@ int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot);
 
 
 /*
- * These are not part of the SIP API but are used within the SIP module.
+ * These are not part of the SIP-TQt API but are used within the SIP-TQt module.
  */
 void sipSaveMethod(sipPyMethod *pm,PyObject *meth);
 void *sipGetPending(sipWrapper **op, int *fp);
diff --git a/siplib/siplib.c b/siplib/siplib.c
index d43f121..e799280 100644
--- a/siplib/siplib.c
+++ b/siplib/siplib.c
@@ -1,18 +1,18 @@
 /*
- * SIP library code.
+ * SIP-TQt library code.
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
@@ -25,7 +25,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "sip.h"
+#include "sip-tqt.h"
 #include "sipint.h"
 
 
@@ -51,7 +51,7 @@ static int sipWrapperType_setattro(PyObject *self, PyObject *name,
 
 static PyTypeObject sipWrapperType_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "sip.wrappertype",      /* tp_name */
+    "sip_tqt.wrappertype",      /* tp_name */
     sizeof (sipWrapperType),    /* tp_basicsize */
     0,                      /* tp_itemsize */
     0,                      /* tp_dealloc */
@@ -107,7 +107,7 @@ static sipWrapperType sipWrapper_Type = {
 #endif
         {
             PyVarObject_HEAD_INIT(&sipWrapperType_Type, 0)
-            "sip.wrapper",  /* tp_name */
+            "sip_tqt.wrapper",  /* tp_name */
             sizeof (sipWrapper),    /* tp_basicsize */
             0,              /* tp_itemsize */
             (destructor)sipWrapper_dealloc, /* tp_dealloc */
@@ -254,7 +254,7 @@ static void sip_api_add_exception(sipErrorState es, PyObject **parseErrp);
 
 
 /*
- * The data structure that represents the SIP API.
+ * The data structure that represents the SIP-TQt API.
  */
 static const sipAPIDef sip_api = {
     /* This must be first. */
@@ -453,7 +453,7 @@ static PyObject *sipEnumType_alloc(PyTypeObject *self, SIP_SSIZE_T nitems);
  */
 static PyTypeObject sipEnumType_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "sip.enumtype",         /* tp_name */
+    "sip_tqt.enumtype",         /* tp_name */
     sizeof (sipEnumTypeObject), /* tp_basicsize */
     0,                      /* tp_itemsize */
     0,                      /* tp_dealloc */
@@ -654,13 +654,13 @@ static PyObject *bad_type_str(int arg_nr, PyObject *arg);
  * The Python module initialisation function.
  */
 #if PY_MAJOR_VERSION >= 3
-#define SIP_MODULE_ENTRY        PyInit_sip
+#define SIP_MODULE_ENTRY        PyInit_sip_tqt
 #define SIP_MODULE_TYPE         PyObject *
 #define SIP_MODULE_DISCARD(m)   Py_DECREF(m)
 #define SIP_FATAL(s)            return NULL
 #define SIP_MODULE_RETURN(m)    return (m)
 #else
-#define SIP_MODULE_ENTRY        initsip
+#define SIP_MODULE_ENTRY        initsip_tqt
 #define SIP_MODULE_TYPE         void
 #define SIP_MODULE_DISCARD(m)
 #define SIP_FATAL(s)            Py_FatalError(s)
@@ -695,7 +695,7 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
 #if PY_MAJOR_VERSION >= 3
     static PyModuleDef module_def = {
         PyModuleDef_HEAD_INIT,
-        "sip",                  /* m_name */
+        "sip_tqt",              /* m_name */
         NULL,                   /* m_doc */
         -1,                     /* m_size */
         methods,                /* m_methods */
@@ -717,13 +717,13 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
     sipWrapperType_Type.tp_base = &PyType_Type;
 
     if (PyType_Ready(&sipWrapperType_Type) < 0)
-        SIP_FATAL("sip: Failed to initialise sip.wrappertype type");
+        SIP_FATAL("sip-tqt: Failed to initialise sip_tqt.wrappertype type");
 
     if (PyType_Ready((PyTypeObject *)&sipSimpleWrapper_Type) < 0)
-        SIP_FATAL("sip: Failed to initialise sip.simplewrapper type");
+        SIP_FATAL("sip-tqt: Failed to initialise sip_tqt.simplewrapper type");
 
     if (sip_api_register_py_type((PyTypeObject *)&sipSimpleWrapper_Type) < 0)
-        SIP_FATAL("sip: Failed to register sip.simplewrapper type");
+        SIP_FATAL("sip-tqt: Failed to register sip_tqt.simplewrapper type");
 
 #if defined(STACKLESS)
     sipWrapper_Type.super.tp_base = (PyTypeObject *)&sipSimpleWrapper_Type;
@@ -734,30 +734,30 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
 #endif
 
     if (PyType_Ready((PyTypeObject *)&sipWrapper_Type) < 0)
-        SIP_FATAL("sip: Failed to initialise sip.wrapper type");
+        SIP_FATAL("sip-tqt: Failed to initialise sip_tqt.wrapper type");
 
     if (PyType_Ready(&sipMethodDescr_Type) < 0)
-        SIP_FATAL("sip: Failed to initialise sip.methoddescriptor type");
+        SIP_FATAL("sip-tqt: Failed to initialise sip_tqt.methoddescriptor type");
 
     if (PyType_Ready(&sipVariableDescr_Type) < 0)
-        SIP_FATAL("sip: Failed to initialise sip.variabledescriptor type");
+        SIP_FATAL("sip-tqt: Failed to initialise sip_tqt.variabledescriptor type");
 
     sipEnumType_Type.tp_base = &PyType_Type;
 
     if (PyType_Ready(&sipEnumType_Type) < 0)
-        SIP_FATAL("sip: Failed to initialise sip.enumtype type");
+        SIP_FATAL("sip-tqt: Failed to initialise sip_tqt.enumtype type");
 
     if (PyType_Ready(&sipVoidPtr_Type) < 0)
-        SIP_FATAL("sip: Failed to initialise sip.voidptr type");
+        SIP_FATAL("sip-tqt: Failed to initialise sip_tqt.voidptr type");
 
 #if PY_MAJOR_VERSION >= 3
     mod = PyModule_Create(&module_def);
 #else
-    mod = Py_InitModule("sip", methods);
+    mod = Py_InitModule("sip_tqt", methods);
 #endif
 
     if (mod == NULL)
-        SIP_FATAL("sip: Failed to intialise sip module");
+        SIP_FATAL("sip-tqt: Failed to intialise sip_tqt module");
 
     mod_dict = PyModule_GetDict(mod);
 
@@ -768,12 +768,12 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
     if (type_unpickler == NULL || enum_unpickler == NULL)
     {
         SIP_MODULE_DISCARD(mod);
-        SIP_FATAL("sip: Failed to get pickle helpers");
+        SIP_FATAL("sip-tqt: Failed to get pickle helpers");
     }
 
-    /* Publish the SIP API. */
+    /* Publish the SIP-TQt API. */
 #if defined(SIP_USE_PYCAPSULE)
-    obj = PyCapsule_New((void *)&sip_api, "sip._C_API", NULL);
+    obj = PyCapsule_New((void *)&sip_api, "sip_tqt._C_API", NULL);
 #else
     obj = PyCObject_FromVoidPtr((void *)&sip_api, NULL);
 #endif
@@ -781,7 +781,7 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
     if (obj == NULL)
     {
         SIP_MODULE_DISCARD(mod);
-        SIP_FATAL("sip: Failed to create _C_API object");
+        SIP_FATAL("sip-tqt: Failed to create _C_API object");
     }
 
     rc = PyDict_SetItemString(mod_dict, "_C_API", obj);
@@ -790,31 +790,31 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
     if (rc < 0)
     {
         SIP_MODULE_DISCARD(mod);
-        SIP_FATAL("sip: Failed to add _C_API object to module dictionary");
+        SIP_FATAL("sip-tqt: Failed to add _C_API object to module dictionary");
     }
 
-    /* Add the SIP version number, but don't worry about errors. */
+    /* Add the SIP-TQt version number, but don't worry about errors. */
 #if PY_MAJOR_VERSION >= 3
-    obj = PyLong_FromLong(SIP_VERSION);
+    obj = PyLong_FromLong(SIP_TQT_VERSION);
 #else
-    obj = PyInt_FromLong(SIP_VERSION);
+    obj = PyInt_FromLong(SIP_TQT_VERSION);
 #endif
 
     if (obj != NULL)
     {
-        PyDict_SetItemString(mod_dict, "SIP_VERSION", obj);
+        PyDict_SetItemString(mod_dict, "SIP_TQT_VERSION", obj);
         Py_DECREF(obj);
     }
 
 #if PY_MAJOR_VERSION >= 3
-    obj = PyUnicode_FromString(SIP_VERSION_STR);
+    obj = PyUnicode_FromString(SIP_TQT_VERSION_STR);
 #else
-    obj = PyString_FromString(SIP_VERSION_STR);
+    obj = PyString_FromString(SIP_TQT_VERSION_STR);
 #endif
 
     if (obj != NULL)
     {
-        PyDict_SetItemString(mod_dict, "SIP_VERSION_STR", obj);
+        PyDict_SetItemString(mod_dict, "SIP_TQT_VERSION_STR", obj);
         Py_DECREF(obj);
     }
 
@@ -1009,7 +1009,7 @@ static PyObject *cast(PyObject *self, PyObject *args)
         td = wt->type;
     else
     {
-        PyErr_SetString(PyExc_TypeError, "argument 1 of sip.cast() must be an instance of a sub or super-type of argument 2");
+        PyErr_SetString(PyExc_TypeError, "argument 1 of sip_tqt.cast() must be an instance of a sub or super-type of argument 2");
         return NULL;
     }
 
@@ -1175,17 +1175,17 @@ static int sip_api_export_module(sipExportedModuleDef *client,
 
     /* Check that we can support it. */
 
-    if (api_major != SIP_API_MAJOR_NR || api_minor > SIP_API_MINOR_NR)
+    if (api_major != SIP_TQT_API_MAJOR_NR || api_minor > SIP_TQT_API_MINOR_NR)
     {
-#if SIP_API_MINOR_NR > 0
+#if SIP_TQT_API_MINOR_NR > 0
         PyErr_Format(PyExc_RuntimeError,
-                "the sip module implements API v%d.0 to v%d.%d but the %s module requires API v%d.%d",
-                SIP_API_MAJOR_NR, SIP_API_MAJOR_NR, SIP_API_MINOR_NR,
+                "the sip_tqt module implements API v%d.0 to v%d.%d but the %s module requires API v%d.%d",
+                SIP_TQT_API_MAJOR_NR, SIP_TQT_API_MAJOR_NR, SIP_TQT_API_MINOR_NR,
                 full_name, api_major, api_minor);
 #else
         PyErr_Format(PyExc_RuntimeError,
-                "the sip module implements API v%d.0 but the %s module requires API v%d.%d",
-                SIP_API_MAJOR_NR, full_name, api_major, api_minor);
+                "the sip_tqt module implements API v%d.0 but the %s module requires API v%d.%d",
+                SIP_TQT_API_MAJOR_NR, full_name, api_major, api_minor);
 #endif
 
         return -1;
@@ -1210,7 +1210,7 @@ static int sip_api_export_module(sipExportedModuleDef *client,
             if (em == NULL)
             {
                 PyErr_Format(PyExc_RuntimeError,
-                        "the %s module failed to register with the sip module",
+                        "the %s module failed to register with the sip_tqt module",
                         im->im_name);
 
                 return -1;
@@ -1237,11 +1237,11 @@ static int sip_api_export_module(sipExportedModuleDef *client,
 
     for (em = moduleList; em != NULL; em = em->em_next)
     {
-        /* SIP clients must have unique names. */
+        /* SIP-TQt clients must have unique names. */
         if (strcmp(sipNameOfModule(em), full_name) == 0)
         {
             PyErr_Format(PyExc_RuntimeError,
-                    "the sip module has already registered a module called %s",
+                    "the sip_tqt module has already registered a module called %s",
                     full_name);
 
             return -1;
@@ -1753,7 +1753,7 @@ static PyObject *sip_api_build_result(int *isErr, const char *fmt, ...)
         badfmt = TRUE;
 
     if (badfmt)
-        PyErr_Format(PyExc_SystemError,"sipBuildResult(): invalid format string \"%s\"",fmt);
+        PyErr_Format(PyExc_SystemError,"sipTQtBuildResult(): invalid format string \"%s\"",fmt);
     else if (tupsz < 0 || (res = PyTuple_New(tupsz)) != NULL)
         res = buildObject(res,fmt,va);
 
@@ -2127,7 +2127,7 @@ static int sip_api_parse_result(int *isErr, PyObject *method, PyObject *res,
         {
             if (ch == '\0')
             {
-                PyErr_Format(PyExc_SystemError, "sipParseResult(): invalid format string \"%s\"", fmt - 1);
+                PyErr_Format(PyExc_SystemError, "sipTQtParseResult(): invalid format string \"%s\"", fmt - 1);
                 rc = -1;
 
                 break;
@@ -2667,7 +2667,7 @@ static int sip_api_parse_result(int *isErr, PyObject *method, PyObject *res,
                 break;
 
             default:
-                PyErr_Format(PyExc_SystemError,"sipParseResult(): invalid format character '%c'",ch);
+                PyErr_Format(PyExc_SystemError,"sipTQtParseResult(): invalid format character '%c'",ch);
                 rc = -1;
             }
 
@@ -6589,7 +6589,7 @@ static void sip_api_bad_catcher_result(PyObject *method)
         PyMethod_GET_SELF(method) == NULL)
     {
         PyErr_Format(PyExc_TypeError,
-                "invalid argument to sipBadCatcherResult()");
+                "invalid argument to sipTQtBadCatcherResult()");
         return;
     }
 
@@ -6655,7 +6655,7 @@ static void sip_api_transfer_to(PyObject *self, PyObject *owner)
 {
     /*
      * There is a legitimate case where we try to transfer a PyObject that
-     * may not be a SIP generated class.  The virtual handler code calls
+     * may not be a SIP-TQt generated class.  The virtual handler code calls
      * this function to keep the C/C++ instance alive when it gets rid of
      * the Python object returned by the Python method.  A class may have
      * handwritten code that converts a regular Python type - so we can't
@@ -8526,7 +8526,7 @@ static PyObject *sipSimpleWrapper_new(sipWrapperType *wt, PyObject *args,
         /*
          * See if it cannot be instantiated or sub-classed from Python, eg.
          * it's an opaque class.  Some restrictions might be overcome with
-         * better SIP support.
+         * better SIP-TQt support.
          */
         if (((sipClassTypeDef *)td)->ctd_init == NULL)
         {
@@ -8573,12 +8573,12 @@ static int sipSimpleWrapper_init(sipSimpleWrapper *self, PyObject *args,
     static int (*kw_handler)(PyObject *, void *, PyObject *);
 
     /*
-     * Get any keyword handler if necessary.  In SIP v5 this will be
+     * Get any keyword handler if necessary.  In SIP-TQt v5 this will be
      * generalised and not PyTQt specific.
      */
     if (!got_kw_handler)
     {
-        kw_handler = sip_api_import_symbol("pyqt_kw_handler");
+        kw_handler = sip_api_import_symbol("pytqt_kw_handler");
         got_kw_handler = TRUE;
     }
 
@@ -9131,7 +9131,7 @@ sipWrapperType sipSimpleWrapper_Type = {
 #endif
         {
             PyVarObject_HEAD_INIT(&sipWrapperType_Type, 0)
-            "sip.simplewrapper",    /* tp_name */
+            "sip_tqt.simplewrapper",    /* tp_name */
             sizeof (sipSimpleWrapper),  /* tp_basicsize */
             0,              /* tp_itemsize */
             (destructor)sipSimpleWrapper_dealloc,   /* tp_dealloc */
@@ -10461,7 +10461,7 @@ static int *sip_api_unicode_as_wstring(PyObject *obj)
  */
 static void raiseNoWChar()
 {
-    PyErr_SetString(PyExc_SystemError, "sip built without wchar_t support");
+    PyErr_SetString(PyExc_SystemError, "sip-tqt built without wchar_t support");
 }
 
 #endif
diff --git a/siplib/siplib.sbf b/siplib/siplib.sbf
index 2e17ba5..27bee7c 100644
--- a/siplib/siplib.sbf
+++ b/siplib/siplib.sbf
@@ -2,18 +2,18 @@
 #
 # Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
 #
-# This file is part of SIP.
+# This file is part of SIP-TQt.
 #
-# This copy of SIP is licensed for use under the terms of the SIP License
+# This copy of SIP-TQt is licensed for use under the terms of the SIP License
 # Agreement.  See the file LICENSE for more details.
 #
-# This copy of SIP may also used under the terms of the GNU General Public
+# This copy of SIP-TQt may also used under the terms of the GNU General Public
 # License v2 or v3 as published by the Free Software Foundation which can be
 # found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
 #
-# SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+# SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-target = sip
+target = sip_tqt
 sources = siplib.c apiversions.c descriptors.c tqtlib.c threads.c objmap.c voidptr.c bool.cpp
-headers = sip.h sipint.h
+headers = sip-tqt.h sipint.h
diff --git a/siplib/threads.c b/siplib/threads.c
index 0854a0a..1ece9d4 100644
--- a/siplib/threads.c
+++ b/siplib/threads.c
@@ -1,25 +1,25 @@
 /*
- * Thread support for the SIP library.  This module provides the hooks for
+ * Thread support for the SIP-TQt library.  This module provides the hooks for
  * C++ classes that provide a thread interface to interact properly with the
  * Python threading infrastructure.
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 
-#include "sip.h"
+#include "sip-tqt.h"
 #include "sipint.h"
 
 
diff --git a/siplib/tqtlib.c b/siplib/tqtlib.c
index 9bf065a..83e4add 100644
--- a/siplib/tqtlib.c
+++ b/siplib/tqtlib.c
@@ -1,19 +1,19 @@
 /*
- * The SIP library code that implements the interface to the optional module
+ * The SIP-TQt library code that implements the interface to the optional module
  * supplied TQt support.
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "sip.h"
+#include "sip-tqt.h"
 #include "sipint.h"
 
 
@@ -171,7 +171,7 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs)
         if ((sfunc = PyObject_GetAttrString(self, mname)) == NULL || !PyCFunction_Check(sfunc))
         {
             /*
-             * Note that in earlier versions of SIP this error would be
+             * Note that in earlier versions of SIP-TQt this error would be
              * detected when the slot was connected.
              */
             PyErr_Format(PyExc_NameError,"Invalid slot %s",mname);
diff --git a/siplib/voidptr.c b/siplib/voidptr.c
index fc26046..65d4fe9 100644
--- a/siplib/voidptr.c
+++ b/siplib/voidptr.c
@@ -1,18 +1,18 @@
 /*
- * SIP library code.
+ * SIP-TQt library code.
  *
  * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
- * This file is part of SIP.
+ * This file is part of SIP-TQt.
  *
- * This copy of SIP is licensed for use under the terms of the SIP License
+ * This copy of SIP-TQt is licensed for use under the terms of the SIP License
  * Agreement.  See the file LICENSE for more details.
  *
- * This copy of SIP may also used under the terms of the GNU General Public
+ * This copy of SIP-TQt may also used under the terms of the GNU General Public
  * License v2 or v3 as published by the Free Software Foundation which can be
  * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
  *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ * SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
@@ -21,7 +21,7 @@
 
 #include <stddef.h>
 
-#include "sip.h"
+#include "sip-tqt.h"
 #include "sipint.h"
 
 
@@ -134,7 +134,7 @@ static SIP_SSIZE_T sipVoidPtr_getwritebuffer(PyObject *self, SIP_SSIZE_T seg,
     if (((sipVoidPtrObject *)self)->rw)
         return sipVoidPtr_getbuffer(self, seg, ptr);
 
-    PyErr_SetString(PyExc_TypeError, "the sip.voidptr is not writeable");
+    PyErr_SetString(PyExc_TypeError, "the sip_tqt.voidptr is not writeable");
     return -1;
 }
 #endif
@@ -230,7 +230,7 @@ static PyObject *sipVoidPtr_asstring(sipVoidPtrObject *v, PyObject *args,
     if (size < 0)
     {
         PyErr_SetString(PyExc_ValueError,
-                "a size must be given or the sip.voidptr must have a size");
+                "a size must be given or the sip_tqt.voidptr must have a size");
         return NULL;
     }
 
@@ -395,7 +395,7 @@ static PyBufferProcs sipVoidPtr_BufferProcs = {
 /* The type data structure. */
 PyTypeObject sipVoidPtr_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "sip.voidptr",          /* tp_name */
+    "sip_tqt.voidptr",          /* tp_name */
     sizeof (sipVoidPtrObject),  /* tp_basicsize */
     0,                      /* tp_itemsize */
     0,                      /* tp_dealloc */
@@ -442,7 +442,7 @@ void *sip_api_convert_to_void_ptr(PyObject *obj)
 {
     if (obj == NULL)
     {
-        PyErr_SetString(PyExc_TypeError, "sip.voidptr is NULL");
+        PyErr_SetString(PyExc_TypeError, "sip_tqt.voidptr is NULL");
         return NULL;
     }
 
@@ -469,7 +469,7 @@ void *sip_api_convert_to_void_ptr(PyObject *obj)
 
 
 /*
- * Convert a C/C++ void pointer to a sip.voidptr object.
+ * Convert a C/C++ void pointer to a sip_tqt.voidptr object.
  */
 PyObject *sip_api_convert_from_void_ptr(void *val)
 {
@@ -478,7 +478,7 @@ PyObject *sip_api_convert_from_void_ptr(void *val)
 
 
 /*
- * Convert a C/C++ void pointer to a sip.voidptr object.
+ * Convert a C/C++ void pointer to a sip_tqt.voidptr object.
  */
 PyObject *sip_api_convert_from_const_void_ptr(const void *val)
 {
@@ -487,7 +487,7 @@ PyObject *sip_api_convert_from_const_void_ptr(const void *val)
 
 
 /*
- * Convert a sized C/C++ void pointer to a sip.voidptr object.
+ * Convert a sized C/C++ void pointer to a sip_tqt.voidptr object.
  */
 PyObject *sip_api_convert_from_void_ptr_and_size(void *val, SIP_SSIZE_T size)
 {
@@ -496,7 +496,7 @@ PyObject *sip_api_convert_from_void_ptr_and_size(void *val, SIP_SSIZE_T size)
 
 
 /*
- * Convert a sized C/C++ const void pointer to a sip.voidptr object.
+ * Convert a sized C/C++ const void pointer to a sip_tqt.voidptr object.
  */
 PyObject *sip_api_convert_from_const_void_ptr_and_size(const void *val,
         SIP_SSIZE_T size)