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

Merged
SlavekB merged 1 commits from feat/rename_sip into master 6 months ago
  1. 66
      configure.py
  2. 6
      custom/custom.c
  3. 6
      custom/customw.c
  4. 12
      custom/mkcustom.py
  5. 18
      sip_tqt_distutils.py
  6. 72
      sipgen/gencode.c
  7. 8
      sipgen/heap.c
  8. 10
      sipgen/lexer.l
  9. 14
      sipgen/main.c
  10. 4
      sipgen/parser.y
  11. 22
      sipgen/sip.h
  12. 10
      sipgen/sipgen.sbf
  13. 10
      sipgen/transform.c
  14. 10
      siplib/apiversions.c
  15. 8
      siplib/bool.cpp
  16. 14
      siplib/descriptors.c
  17. 10
      siplib/objmap.c
  18. 48
      siplib/sip-tqt.h
  19. 14
      siplib/sipint.h
  20. 110
      siplib/siplib.c
  21. 12
      siplib/siplib.sbf
  22. 12
      siplib/threads.c
  23. 14
      siplib/tqtlib.c
  24. 28
      siplib/voidptr.c
  25. 36
      siputils.py
  26. 81
      specs/freebsd-clang

66
configure.py

@ -1,17 +1,17 @@
# This script handles the SIP configuration and generates the Makefiles.
# This script handles the SIP-TQt configuration and generates the Makefiles.
#
# 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.
@ -129,7 +129,7 @@ def set_defaults():
"cygwin": "cygwin-g++",
"darwin": "macx-g++",
"dgux": "dgux-g++",
"freebsd": "freebsd-g++",
"freebsd": "freebsd-clang",
"gnu": "hurd-g++",
"hp-ux": "hpux-acc",
"irix": "irix-cc",
@ -165,7 +165,7 @@ def set_defaults():
break
default_sipbindir = plat_bin_dir
default_sipmoddir = os.path.join(plat_py_site_dir, 'sip4_tqt')
default_sipmoddir = plat_py_site_dir
default_sipincdir = plat_py_inc_dir
default_sipsipdir = plat_sip_dir
@ -173,9 +173,9 @@ def set_defaults():
def inform_user():
"""Tell the user the option values that are going to be used.
"""
siputils.inform("The SIP code generator will be installed in %s." % opts.sipbindir)
siputils.inform("The SIP module will be installed in %s." % opts.sipmoddir)
siputils.inform("The SIP header file will be installed in %s." % opts.sipincdir)
siputils.inform("The SIP-TQt code generator will be installed in %s." % opts.sipbindir)
siputils.inform("The SIP-TQt module will be installed in %s." % opts.sipmoddir)
siputils.inform("The SIP-TQt header file will be installed in %s." % opts.sipincdir)
siputils.inform("The default directory to install .sip files in is %s." % opts.sipsipdir)
siputils.inform("The platform/compiler configuration is %s." % opts.platform)
@ -201,17 +201,17 @@ def set_platform_directories():
if sys.platform == "win32":
plat_py_lib_dir = sys.prefix + "\\libs"
plat_bin_dir = sys.exec_prefix
plat_sip_dir = sys.prefix + "\\sip"
plat_sip_dir = sys.prefix + "\\sip-tqt"
else:
lib_dir = sysconfig.get_python_lib(plat_specific=1, standard_lib=1)
plat_py_lib_dir = lib_dir + "/config"
plat_bin_dir = sys.exec_prefix + "/bin"
plat_sip_dir = sys.prefix + "/share/sip"
plat_sip_dir = sys.prefix + "/share/sip-tqt"
def create_config(module, template, macros):
"""Create the SIP configuration module so that it can be imported by build
"""Create the SIP-TQt configuration module so that it can be imported by build
scripts.
module is the module file name.
@ -225,7 +225,7 @@ def create_config(module, template, macros):
"sip_version": sip_version,
"sip_version_str": sip_version_str,
"platform": opts.platform,
"sip_bin": os.path.join(opts.sipbindir, "sip"),
"sip_bin": os.path.join(opts.sipbindir, "sip-tqt"),
"sip_inc_dir": opts.sipincdir,
"sip_mod_dir": opts.sipmoddir,
"default_bin_dir": plat_bin_dir,
@ -249,26 +249,24 @@ def create_makefiles(macros, extra_lib_dir=None, extra_libs=None):
"""
# Bootstrap. Make sure we get the right one.
sys.path.insert(0, os.path.curdir)
import sipconfig
import sip_tqt_config
cfg = sipconfig.Configuration()
cfg = sip_tqt_config.Configuration()
cfg.set_build_macros(macros)
sipconfig.inform("Creating top level Makefile...")
sip_tqt_config.inform("Creating top level Makefile...")
open('__init__.py', 'a').close()
sipconfig.ParentMakefile(
sip_tqt_config.ParentMakefile(
configuration=cfg,
subdirs=["sipgen", "siplib"],
installs=(["__init__.py", "sipconfig.py", os.path.join(src_dir, "sipdistutils.py")],
installs=(["sip_tqt_config.py", os.path.join(src_dir, "sip_tqt_distutils.py")],
cfg.sip_mod_dir)
).generate()
sipconfig.inform("Creating sip code generator Makefile...")
sip_tqt_config.inform("Creating sip-tqt code generator Makefile...")
sipconfig.ProgramMakefile(
sip_tqt_config.ProgramMakefile(
configuration=cfg,
build_file=os.path.join(src_dir, "sipgen", "sipgen.sbf"),
dir="sipgen",
@ -279,14 +277,14 @@ def create_makefiles(macros, extra_lib_dir=None, extra_libs=None):
arch=opts.arch
).generate()
sipconfig.inform("Creating sip module Makefile...")
sip_tqt_config.inform("Creating sip-tqt module Makefile...")
makefile = sipconfig.ModuleMakefile(
makefile = sip_tqt_config.ModuleMakefile(
configuration=cfg,
build_file=os.path.join(src_dir, "siplib", "siplib.sbf"),
dir="siplib",
install_dir=cfg.sip_mod_dir,
installs=([os.path.join(src_dir, "siplib", "sip.h")], cfg.sip_inc_dir),
installs=([os.path.join(src_dir, "siplib", "sip-tqt.h")], cfg.sip_inc_dir),
console=1,
warnings=0,
static=opts.static,
@ -315,7 +313,7 @@ def create_optparser():
# Note: we don't use %default to be compatible with Python 2.3.
p.add_option("-k", "--static", action="store_true", default=False,
dest="static", help="build the SIP module as a static library")
dest="static", help="build the SIP-TQt module as a static library")
p.add_option("-p", "--platform", action="store",
default=default_platform, type="string", metavar="PLATFORM",
dest="platform", help="the platform/compiler configuration "
@ -342,7 +340,7 @@ def create_optparser():
help="build for architecture ARCH")
g.add_option("-n", "--universal", action="store_true", default=False,
dest="universal",
help="build the SIP code generator and module as universal "
help="build the SIP-TQt code generator and module as universal "
"binaries")
g.add_option("-s", "--sdk", action="store", default=default_sdk,
type="string", metavar="SDK", dest="sdk",
@ -364,16 +362,16 @@ def create_optparser():
g = optparse.OptionGroup(p, title="Installation")
g.add_option("-b", "--bindir", action="callback",
default=default_sipbindir, type="string", metavar="DIR",
dest="sipbindir", callback=store_abspath, help="where the SIP "
dest="sipbindir", callback=store_abspath, help="where the SIP-TQt "
"code generator will be installed [default: %s]" %
default_sipbindir)
g.add_option("-d", "--destdir", action="callback",
default=default_sipmoddir, type="string", metavar="DIR",
dest="sipmoddir", callback=store_abspath, help="where the SIP "
dest="sipmoddir", callback=store_abspath, help="where the SIP-TQt "
"module will be installed [default: %s]" % default_sipmoddir)
g.add_option("-e", "--incdir", action="callback",
default=default_sipincdir, type="string", metavar="DIR",
dest="sipincdir", callback=store_abspath, help="where the SIP "
dest="sipincdir", callback=store_abspath, help="where the SIP-TQt "
"header file will be installed [default: %s]" % default_sipincdir)
g.add_option("-v", "--sipdir", action="callback",
default=default_sipsipdir, type="string", metavar="DIR",
@ -389,10 +387,10 @@ def main(argv):
argv is the list of command line arguments.
"""
siputils.inform("This is SIP %s for Python %s on %s." % (sip_version_str, sys.version.split()[0], sys.platform))
siputils.inform("This is SIP-TQt %s for Python %s on %s platform." % (sip_version_str, sys.version.split()[0], sys.platform))
if py_version < 0x020300:
siputils.error("This version of SIP requires Python v2.3 or later.")
siputils.error("This version of SIP-TQt requires Python v2.3 or later.")
global extra_lib_dir
@ -467,7 +465,7 @@ def main(argv):
inform_user()
# Install the configuration module.
create_config("sipconfig.py", os.path.join(src_dir, "siputils.py"),
create_config("sip_tqt_config.py", os.path.join(src_dir, "siputils.py"),
macros)
# Create the Makefiles.

6
custom/custom.c

@ -14,11 +14,11 @@ int main(int argc, char **argv)
* to be a builtin in the custom interpreter. The name of the function
* will be the name of the module with "init" prepended. The modules
* must be built as static libraries (using the -k flag to configure.py
* for SIP and PyTQt).
* for SIP-TQt and PyTQt).
*/
/* The sip module will be builtin. */
extern void initsip(void);
extern void initsip_tqt(void);
/*
* Uncomment these (and in the structure below) to include the PyTQt
@ -40,7 +40,7 @@ int main(int argc, char **argv)
* the builtin modules.
*/
struct _inittab builtin_modules[] = {
{"sip", initsip},
{"sip_tqt", initsip_tqt},
/* {"qt", initqt},*/
/* {"qtaxcontainer", initqtaxcontainer},*/
/* {"qtcanvas", initqtcanvas},*/

6
custom/customw.c

@ -18,11 +18,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
* to be a builtin in the custom interpreter. The name of the function
* will be the name of the module with "init" prepended. The modules
* must be built as static libraries (using the -k flag to configure.py
* for SIP and PyTQt).
* for SIP-TQt and PyTQt).
*/
/* The sip module will be builtin. */
extern void initsip(void);
extern void initsip_tqt(void);
/*
* Uncomment these (and in the structure below) to include the PyTQt
@ -44,7 +44,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
* the builtin modules.
*/
struct _inittab builtin_modules[] = {
{"sip", initsip},
{"sip_tqt", initsip_tqt},
/* {"qt", initqt},*/
/* {"qtaxcontainer", initqtaxcontainer},*/
/* {"qtcanvas", initqtcanvas},*/

12
custom/mkcustom.py

@ -1,4 +1,4 @@
"""This Python script uses the SIP build system to create a Makefile for
"""This Python script uses the SIP-TQt build system to create a Makefile for
building a custom Python interpreter. The script doesn't take any command line
flags - just edit it to suit your needs. You will also need to edit custom.c
or customw.c.
@ -6,11 +6,11 @@ or customw.c.
import sys
import sipconfig
import sip_tqt_config
# Get the SIP configuration.
cfg = sipconfig.Configuration()
# Get the SIP-TQt configuration.
cfg = sip_tqt_config.Configuration()
# This is the name of the interpreter executable (excluding any platform
@ -50,7 +50,7 @@ if sys.platform == "linux2":
# Create a dictionary describing the target and source files to be passed to
# the SIP build system.
# the SIP-TQt build system.
build = {}
if sys.platform == "win32" and WindowsInterpreter:
@ -66,7 +66,7 @@ else:
qt = (cfg.qt_version > 0)
# Create the Makefile instance.
mf = sipconfig.ProgramMakefile(cfg, build, python=True, console=console, qt=qt)
mf = sip_tqt_config.ProgramMakefile(cfg, build, python=True, console=console, qt=qt)
# Modify the Makefile according to the values set above.
mf.extra_lib_dirs.extend(ExtraLibraryDirectories)

18
sipdistutils.py → sip_tqt_distutils.py

@ -1,5 +1,5 @@
# Subclasses disutils.command.build_ext,
# replacing it with a SIP version that compiles .sip -> .cpp
# replacing it with a SIP-TQt version that compiles .sip -> .cpp
# before calling the original build_ext command.
# Written by Giovanni Bajo <rasky at develer dot com>
# Based on Pyrex.Distutils, written by Graham Fawcett and Darrel Gallion.
@ -17,7 +17,7 @@ def replace_suffix(path, new_suffix):
class build_ext (build_ext_base):
description = "Compiler SIP descriptions, then build C/C++ extensions (compile/link to build directory)"
description = "Compiler SIP-TQt descriptions, then build C/C++ extensions (compile/link to build directory)"
user_options = build_ext_base.user_options[:]
user_options = [opt for opt in user_options if not opt[0].startswith("swig")]
@ -53,21 +53,21 @@ class build_ext (build_ext_base):
raise RuntimeError("cannot parse SIP-generated '%s'" % sbf)
def _find_sip(self):
import sipconfig
cfg = sipconfig.Configuration()
import sip_tqt_config
cfg = sip_tqt_config.Configuration()
if os.name == "nt":
if not os.path.splitext(os.path.basename(cfg.sip_bin))[1]:
return cfg.sip_bin + ".exe"
return cfg.sip_bin
def _sip_inc_dir(self):
import sipconfig
cfg = sipconfig.Configuration()
import sip_tqt_config
cfg = sip_tqt_config.Configuration()
return cfg.sip_inc_dir
def _sip_sipfiles_dir(self):
import sipconfig
cfg = sipconfig.Configuration()
import sip_tqt_config
cfg = sip_tqt_config.Configuration()
return cfg.default_sip_dir
def _sip_calc_signature(self):
@ -100,7 +100,7 @@ class build_ext (build_ext_base):
if not self.extensions:
return
# Add the SIP include directory to the include path
# Add the SIP-TQt include directory to the include path
if extension is not None:
extension.include_dirs.append(self._sip_inc_dir())
depends = extension.depends

72
sipgen/gencode.c

@ -1,18 +1,18 @@
/*
* The code generator module for SIP.
* The code generator module for SIP-TQt.
*
* 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.
*/
@ -496,11 +496,11 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
"#define _%sAPI_H\n"
"\n"
"\n"
"#include <sip.h>\n"
"#include <sip-tqt.h>\n"
, mname
, mname);
if (pluginPyTQt4(pt))
if (pluginPyQt4(pt))
prcode(fp,
"\n"
"#include <TQMetaType>\n"
@ -787,7 +787,7 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
prcode(fp,
"\n"
"/* The SIP API, this module's API and the APIs of any imported modules. */\n"
"/* The SIP-TQt API, this module's API and the APIs of any imported modules. */\n"
"extern const sipAPIDef *sipAPI_%s;\n"
"extern sipExportedModuleDef sipModuleAPI_%s;\n"
, mname
@ -802,7 +802,7 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
, mname, mld->module->name);
}
if (pluginPyTQt4(pt))
if (pluginPyQt4(pt))
prcode(fp,
"\n"
"typedef const TQMetaObject *(*sip_qt_metaobject_func)(sipSimpleWrapper *,sipTypeDef *);\n"
@ -1817,7 +1817,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
"/* This defines this module. */\n"
"sipExportedModuleDef sipModuleAPI_%s = {\n"
" 0,\n"
" SIP_API_MINOR_NR,\n"
" SIP_TQT_API_MINOR_NR,\n"
" %n,\n"
" 0,\n"
" %d,\n"
@ -1880,7 +1880,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
prcode(fp,
"\n"
"\n"
"/* The SIP API and the APIs of any imported modules. */\n"
"/* The SIP-TQt API and the APIs of any imported modules. */\n"
"const sipAPIDef *sipAPI_%s;\n"
, mname);
@ -1889,7 +1889,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
"const sipExportedModuleDef *sipModuleAPI_%s_%s;\n"
, mname, mld->module->name);
if (pluginPyTQt4(pt))
if (pluginPyQt4(pt))
prcode(fp,
"\n"
"sip_qt_metaobject_func sip_%s_qt_metaobject;\n"
@ -2006,7 +2006,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
prcode(fp,
" /* Export the module and publish it's API. */\n"
" if (sipExportModule(&sipModuleAPI_%s,SIP_API_MAJOR_NR,SIP_API_MINOR_NR,0) < 0)\n"
" if (sipExportModule(&sipModuleAPI_%s,SIP_TQT_API_MAJOR_NR,SIP_TQT_API_MINOR_NR,0) < 0)\n"
" {\n"
"#if !defined(SIP_USE_PYCAPSULE)\n"
" Py_DECREF(sip_sipmod);\n"
@ -2016,7 +2016,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
" }\n"
, mname);
if (pluginPyTQt4(pt))
if (pluginPyQt4(pt))
{
/* Import the helpers. */
prcode(fp,
@ -2161,7 +2161,7 @@ static void generateTypesTable(sipSpec *pt, moduleDef *mod, FILE *fp)
argDef *ad;
const char *type_suffix;
type_suffix = (pluginPyTQt4(pt) || pluginPyTQt3(pt)) ? ".super" : "";
type_suffix = (pluginPyQt4(pt) || pluginPyTQt3(pt)) ? ".super" : "";
prcode(fp,
"\n"
@ -2214,18 +2214,18 @@ static void generateTypesTable(sipSpec *pt, moduleDef *mod, FILE *fp)
static void generateSipImport(moduleDef *mod, FILE *fp)
{
prcode(fp,
" /* Get the SIP module's API. */\n"
" /* Get the SIP-TQt module's API. */\n"
"#if defined(SIP_USE_PYCAPSULE)\n"
"\n"
);
if (generating_c)
prcode(fp,
" sipAPI_%s = (const sipAPIDef *)PyCapsule_Import(\"sip._C_API\", 0);\n"
" sipAPI_%s = (const sipAPIDef *)PyCapsule_Import(\"sip_tqt._C_API\", 0);\n"
, mod->name);
else
prcode(fp,
" sipAPI_%s = reinterpret_cast<const sipAPIDef *>(PyCapsule_Import(\"sip._C_API\", 0));\n"
" sipAPI_%s = reinterpret_cast<const sipAPIDef *>(PyCapsule_Import(\"sip_tqt._C_API\", 0));\n"
, mod->name);
prcode(fp,
@ -2239,17 +2239,17 @@ static void generateSipImport(moduleDef *mod, FILE *fp)
"#else\n"
"\n"
"#if PY_VERSION_HEX >= 0x02050000\n"
" sip_sipmod = PyImport_ImportModule(\"sip\");\n"
" sip_sipmod = PyImport_ImportModule(\"sip_tqt\");\n"
"#else\n"
, mod->name);
if (generating_c)
prcode(fp,
" sip_sipmod = PyImport_ImportModule((char *)\"sip\");\n"
" sip_sipmod = PyImport_ImportModule((char *)\"sip_tqt\");\n"
);
else
prcode(fp,
" sip_sipmod = PyImport_ImportModule(const_cast<char *>(\"sip\"));\n"
" sip_sipmod = PyImport_ImportModule(const_cast<char *>(\"sip_tqt\"));\n"
);
prcode(fp,
@ -2911,7 +2911,7 @@ static int generateClasses(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
* code rather than through a static table. This is because C++ does
* not guarantee the order in which the table and the instance will be
* created. So far this has only been seen to be a problem when
* statically linking SIP generated modules on Windows.
* statically linking SIP-TQt generated modules on Windows.
*/
if (!generating_c && vd->accessfunc == NULL && vd->type.nrderefs == 0)
continue;
@ -3816,7 +3816,7 @@ static void generateTypeDefLink(sipSpec *pt, ifaceFileDef *iff, FILE *fp)
if (iff->next_alt->type == mappedtype_iface)
prcode(fp, ".mtd_base");
else if (pluginPyTQt3(pt) || pluginPyTQt4(pt))
else if (pluginPyTQt3(pt) || pluginPyQt4(pt))
prcode(fp, ".super.ctd_base");
else
prcode(fp, ".ctd_base");
@ -6066,9 +6066,9 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
}
/* The meta methods if required. */
if (pluginPyTQt4(pt) && isTQObjectSubClass(cd))
if (pluginPyQt4(pt) && isTQObjectSubClass(cd))
{
if (!noPyTQt4TQMetaObject(cd))
if (!noPyQt4TQMetaObject(cd))
prcode(fp,
"\n"
"const TQMetaObject *sip%C::metaObject() const\n"
@ -8022,7 +8022,7 @@ static void generateClassAPI(classDef *cd, sipSpec *pt, FILE *fp)
{
const char *type_prefix;
if (pluginPyTQt4(pt))
if (pluginPyQt4(pt))
type_prefix = "pyqt4";
else if (pluginPyTQt3(pt))
type_prefix = "pyqt3";
@ -8179,7 +8179,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
,(cd->vmembers != NULL ? "virtual " : ""),classFTQCName(cd),cd->dtorexceptions);
/* The metacall methods if required. */
if (pluginPyTQt4(pt) && isTQObjectSubClass(cd))
if (pluginPyQt4(pt) && isTQObjectSubClass(cd))
{
prcode(fp,
"\n"
@ -8187,7 +8187,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
" void *qt_metacast(const char *);\n"
);
if (!noPyTQt4TQMetaObject(cd))
if (!noPyQt4TQMetaObject(cd))
prcode(fp,
" const TQMetaObject *metaObject() const;\n"
);
@ -8986,10 +8986,10 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
nr_methods = generateClassMethodTable(pt, cd, fp);
nr_enums = generateEnumMemberTable(pt, mod, cd, NULL, fp);
/* Generate the PyTQt4 signals table. */
/* Generate the PyQt4 signals table. */
is_signals = FALSE;
if (pluginPyTQt4(pt) && isTQObjectSubClass(cd))
if (pluginPyQt4(pt) && isTQObjectSubClass(cd))
{
/* The signals must be grouped by name. */
for (md = cd->members; md != NULL; md = md->next)
@ -9025,7 +9025,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
prcode(fp,
"\n"
"\n"
"/* Define this type's PyTQt4 signals. */\n"
"/* Define this type's PyQt4 signals. */\n"
"static const pyqt4QtSignal pyqt4_signals_%C[] = {\n"
, classFTQCName(cd));
}
@ -9135,7 +9135,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
has_docstring = TRUE;
}
if (pluginPyTQt4(pt))
if (pluginPyQt4(pt))
{
type_prefix = "pyqt4";
embedded = TRUE;
@ -9540,9 +9540,9 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
);
}
if (pluginPyTQt4(pt))
if (pluginPyQt4(pt))
{
if (isTQObjectSubClass(cd) && !noPyTQt4TQMetaObject(cd))
if (isTQObjectSubClass(cd) && !noPyQt4TQMetaObject(cd))
prcode(fp,
" &%U::staticMetaObject,\n"
, cd);
@ -9572,7 +9572,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
/*
* Generate an entry in the PyTQt4 signal table.
* Generate an entry in the PyQt4 signal table.
*/
static void generateSignalTableEntry(sipSpec *pt, classDef *cd, overDef *sig,
memberDef *md, int membernr, FILE *fp)
@ -12697,7 +12697,7 @@ static FILE *createFile(moduleDef *mod, const char *fname,
"/*\n"
" * %s\n"
" *\n"
" * Generated by SIP %s on %s"
" * Generated by SIP-TQt %s on %s"
,description
,sipVersion,ctime(&now));

8
sipgen/heap.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.
*/

10
sipgen/lexer.l

@ -1,18 +1,18 @@
/*
* The SIP lexer.
* The SIP-TQt lexer.
*
* 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.
*/

14
sipgen/main.c

@ -1,18 +1,18 @@
/*
* The main module for SIP.
* The main module for SIP-TQt.
*
* 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.
*/
@ -27,7 +27,7 @@
#ifndef PACKAGE
#define PACKAGE "sip"
#define PACKAGE "sip-tqt"
#endif
#define VERSION "4.10.5"
@ -460,7 +460,7 @@ void fatal(char *fmt,...)
/*
* Display the SIP version number on stdout and exit with zero exit status.
* Display the SIP-TQt version number on stdout and exit with zero exit status.
*/
static void version(void)
{

4
sipgen/parser.y

@ -3266,7 +3266,7 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd,
cd->pyqt4_flags = flg->fvalue.ival;
if (findOptFlag(of, "PyQt4NoQMetaObject", bool_flag) != NULL)
setPyTQt4NoTQMetaObject(cd);
setPyQt4NoTQMetaObject(cd);
if (isOpaque(cd))
{
@ -6071,7 +6071,7 @@ int pluginPyTQt3(sipSpec *pt)
/*
* Return TRUE if the PyQt4 plugin was specified.
*/
int pluginPyTQt4(sipSpec *pt)
int pluginPyQt4(sipSpec *pt)
{
return stringFind(pt->plugins, "PyQt4");
}

22
sipgen/sip.h

@ -1,18 +1,18 @@
/*
* The main header file for SIP.
* The main header file for SIP-TQt.
*
* 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.
*/
@ -137,8 +137,8 @@
#define setIsHoldGILDtor(cd) ((cd)->classflags |= CLASS_DTOR_HOLD_GIL)
#define assignmentHelper(cd) ((cd)->classflags & CLASS_ASSIGN_HELPER)
#define setAssignmentHelper(cd) ((cd)->classflags |= CLASS_ASSIGN_HELPER)
#define noPyTQt4TQMetaObject(cd) ((cd)->classflags & CLASS_NO_TQMETAOBJECT)
#define setPyTQt4NoTQMetaObject(cd) ((cd)->classflags |= CLASS_NO_TQMETAOBJECT)
#define noPyQt4TQMetaObject(cd) ((cd)->classflags & CLASS_NO_TQMETAOBJECT)
#define setPyQt4NoTQMetaObject(cd) ((cd)->classflags |= CLASS_NO_TQMETAOBJECT)
#define isTemplateClass(cd) ((cd)->classflags & CLASS_IS_TEMPLATE)
#define setIsTemplateClass(cd) ((cd)->classflags |= CLASS_IS_TEMPLATE)
#define resetIsTemplateClass(cd) ((cd)->classflags &= ~CLASS_IS_TEMPLATE)
@ -989,7 +989,7 @@ typedef struct _mroDef {
typedef struct _classDef {
int classflags; /* The class flags. */
int pyqt4_flags; /* The PyTQt4 specific flags. */
int pyqt4_flags; /* The PyQt4 specific flags. */
nameDef *pyname; /* The Python name. */
ifaceFileDef *iff; /* The interface file. */
struct _classDef *ecd; /* The enclosing scope. */
@ -1085,8 +1085,8 @@ typedef struct _parserContext {
} parserContext;
extern char *sipVersion; /* The version of SIP. */
extern stringList *includeDirList; /* The include directory list for SIP files. */
extern char *sipVersion; /* The version of SIP-TQt. */
extern stringList *includeDirList; /* The include directory list for SIP-TQt files. */
void parse(sipSpec *, FILE *, char *, stringList *, stringList *, int, int);
@ -1140,7 +1140,7 @@ ifaceFileDef *findIfaceFile(sipSpec *pt, moduleDef *mod,
scopedNameDef *fqname, ifaceFileType iftype,
apiVersionRangeDef *api_range, argDef *ad);
int pluginPyTQt3(sipSpec *pt);
int pluginPyTQt4(sipSpec *pt);
int pluginPyQt4(sipSpec *pt);
void yywarning(char *);
nameDef *cacheName(sipSpec *pt, const char *name);
scopedNameDef *encodedTemplateName(templateDef *td);

10
sipgen/sipgen.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 = main.c transform.c gencode.c export.c heap.c parser.c lexer.c
headers = sip.h parser.h

10
sipgen/transform.c

@ -1,18 +1,18 @@
/*
* The parse tree transformation module for SIP.
* The parse tree transformation module for SIP-TQt.
*
* 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.
*/

10
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"

8
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.

14
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 */

10
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"

48
siplib/sip.h → 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;

14
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,
/*