TDE
/
pytqt
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt
0
0
Fork 0
Code Issues Releases Wiki Activity

temporary commit to show changes

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/13/head
Slávek Banko 2 years ago
parent 16434e5519
commit 4feca443fb
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
27 changed files with 120 additions and 125 deletions
Show Stats Download Patch File Download Diff File

26
README.SunOS
Unescape View File

@ -1,22 +1,22 @@
o Compiler Error: CC -DHAVE_CONFIG_H -I. -I. -I..
-I/users/toollib/include/python2.0 -I/users/pyqt/install/sip-3.2.1/include
-I/users/pyqt/install/qt-x11-commercial-3.0.4/include -I/usr/openwin/include
-c qtcmodule.cpp -KPIC -DPIC -o qtcmodule.o
"sipqtProxyqt.h", line 113: Error: Multiple declaration for
sipProxyqt::proxySlot(int).
"qtcmodule.cpp", line 5393: Error: sipProxyqt::proxySlot(int) already had a
-I/users/toollib/include/python3.10 -I/users/pytqt/install/sip-tqt/include
-I/users/pytqt/install/tqt3/include -I/usr/openwin/include
-c tqtcmodule.cpp -KPIC -DPIC -o tqtcmodule.o
"siptqtProxytqt.h", line 113: Error: Multiple declaration for
sipProxytqt::proxySlot(int).
"tqtcmodule.cpp", line 5393: Error: sipProxytqt::proxySlot(int) already had a
body defined.
This occurs because the Sun Workshop C++ 4.2 compiler (and the Sun Forte
C++ 6.x compiler with -compat) can not distinguish between 'bool' and 'int'
types in overloaded method signatures and issues a compiler error.
In this case bool is declared in qt/include/qglobal.h as
In this case bool is declared in tqt/include/tqglobal.h as
'typedef int bool;'. To workaround this '#if 0' out the the declaration
and body of 'proxySlot(bool)' in PyTQt/qt/sipqtProxyqt.h and
PyTQt/qt/qtcmodule.cpp. This resolves the compiler error but breaks
and body of 'proxySlot(bool)' in PyTQt/tqt/siptqtProxytqt.h and
PyTQt/tqt/tqtcmodule.cpp. This resolves the compiler error but breaks
any 'sig(bool)' type signals. To workaround this, save the
PyTQt/qt/sipqtProxyqt.moc generated after fixing the compiler error and
PyTQt/tqt/siptqtProxytqt.moc generated after fixing the compiler error and
add the following bits of code:
...
@ -29,13 +29,13 @@
{ "proxySlot(bool)", &slot_42, TQMetaData::Public }
};
metaObj = TQMetaObject::new_metaobject(
"sipProxyqt", parentObject,
"sipProxytqt", parentObject,
slot_tbl, 43,
...
case 42: proxySlot(static_QUType_bool.get(_o+1)); break;
You will need to comment out the line in PyTQt/qt/Makefile that re-generates
PyTQt/qt/sipqtProxyqt.moc with moc to avoid the above changes from being
You will need to comment out the line in PyTQt/tqt/Makefile that re-generates
PyTQt/tqt/siptqtProxytqt.moc with moc to avoid the above changes from being
overwritten.
In order to test that everything has been done correctly, create a

6
build.py
Unescape View File

@ -123,7 +123,7 @@ LIBS += @TEST_TQUI_LIB@ @TEST_TQSCINTILLA_LIB@
config.patches["@TEST_TQSCINTILLA_INC@"] = ""
config.patches["@TEST_TQSCINTILLA_LIB@"] = ""
# Create a dummy source file to suppress a qmake warning.
# Create a dummy source file to suppress a tqmake warning.
sip_tqt_config.copy_to_file("tqttest.cpp", "")
config.create_makefile("tqttest.pro")
@ -573,7 +573,7 @@ def main(argv):
config.patches["@PYTQT_RBPROF@"] = rbprof
# Link in the qassistantclient library for TQt v3.1+.
# Link in the tqassistantclient library for TQt v3.1+.
tqaclib = ""
if config.tqt_version >= 0x030100:
@ -582,7 +582,7 @@ def main(argv):
else:
tqaclib = "-ltqassistantclient"
config.patches["@PYTQT_QASSISTANTCLIENT_LIB@"] = tqaclib
config.patches["@PYTQT_TQASSISTANTCLIENT_LIB@"] = tqaclib
# Check for TQScintilla.
if config.tqt_version >= 0x030000:

15
configure.py
Unescape View File

@ -1048,7 +1048,7 @@ def get_build_macros(overrides):
overrides is a list of macros overrides from the user.
"""
# Get the name of the qmake configuration file to take the macros from.
# Get the name of the tqmake configuration file to take the macros from.
if "QMAKESPEC" in list(os.environ.keys()):
fname = os.path.join(tqt_dir, "mkspecs", os.environ["QMAKESPEC"], "qmake.conf")
else:
@ -1098,19 +1098,14 @@ def check_tqt_installation(macros):
tqt_libdir = os.path.join(tqt_dir, "lib")
macros["LIBDIR_TQT"] = tqt_libdir
# Check the TQt header files have been installed. Quietly check for TQt v4.
tqt4_d = os.path.join(tqt_incdir, "TQtCore")
tqglobal = os.path.join(tqt4_d, "tqglobal.h")
# Check the TQt header files have been installed.
tqglobal = os.path.join(tqt_incdir, "tqglobal.h")
if not os.access(tqglobal, os.F_OK):
tqglobal = os.path.join(tqt_incdir, "tqglobal.h")
tqglobal = os.path.join(tqt_incdir, "ntqglobal.h")
if not os.access(tqglobal, os.F_OK):
tqglobal = os.path.join(tqt_incdir, "ntqglobal.h")
if not os.access(tqglobal, os.F_OK):
sip_tqt_config.error("tqglobal.h or ntqglobal.h could not be found in %s." % tqt_incdir)
sip_tqt_config.error("tqglobal.h or ntqglobal.h could not be found in %s." % tqt_incdir)
# Get the TQt version number.
global tqt_version

6
examples/SQL/README
Unescape View File

@ -25,12 +25,12 @@ sqltable4.py:
sqlsubclass5.py:
Similar to the former, and even more deviated from its qt ancestor,
Similar to the former, and even more deviated from its TQt ancestor,
because the sense escaped me. This could be related to the different
database layout needed for MySQL (Trolltech used PostgreSQL sequences,
while we're using the simpler, but less powerful auto_increment here).
If you enter and invalid date (e.g. day: 0) in the Paid column, it is
shown as "not yet", but produces some qt warnings.
shown as "not yet", but produces some TQt warnings.
runsqlex.py, sqlex.ui, sqlex.ui.h, connect.ui, connect.ui.h:
@ -63,7 +63,7 @@ DB_USERNAME = "name"
DB_PASSWORD = "pass"
The dbconnect.py script is generated from dbconnect.ui, which was created
with qt's designer. You can find it also in Boudewijn Rempt's book
with TQt's designer. You can find it also in Boudewijn Rempt's book
"GUI Programming with Python, using the TQt Toolkit". Although you won't find
the SQL widgets discussed there, for the simple reason of the book being
written before they appeared, it is a valuable source for anybody new in

2
examples/SQL/connect.ui.h
Unescape View File

@ -10,7 +10,7 @@
void ConnectDialog::init()
{
from PyTQt.tqtsql import TQSqlDatabase
#qDebug("ConnectDialog init")
#tqDebug("ConnectDialog init")
self.comboDriver.clear()
self.comboDriver.insertStringList(TQSqlDatabase.drivers())
}

2
examples/tqdir.py
Unescape View File

@ -248,7 +248,7 @@ if __name__ == '__main__':
if msg:
print(msg, file=sys.stderr)
print("""\
usage: qdir [--any | --dir | --custom] [--preview] [--default f] {--filter f} [caption ...]
usage: tqdir [--any | --dir | --custom] [--preview] [--default f] {--filter f} [caption ...]
--any Get any filename, need not exist.
--dir Return a directory rather than a file.
--custom Opens a customized TQFileDialog with

10
examples/tqmag.py
Unescape View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
#****************************************************************************
#** $Id: qmag.py,v 1.1 2002/06/20 18:52:31 phil Exp $
#** $Id: tqmag.py,v 1.1 2002/06/20 18:52:31 phil Exp $
#**
#** Copyright (C) 1992-1998 Troll Tech AS. All rights reserved.
#**
@ -27,7 +27,7 @@ timer = (0, 20, 250, 333, 500, 1000, 2000, 3000, 5000, 10000)
class MagWidget(TQWidget):
def __init__(self, tqApp, parent = None, name = None):
self.qApp = tqApp
self.tqApp = tqApp
TQWidget.__init__(self, parent, name)
self.pm = TQPixmap() # pixmap magnified
self.p = TQPixmap() # pixmap
@ -70,7 +70,7 @@ class MagWidget(TQWidget):
10 + self.saveButton.fontMetrics().width("Save"), h)
self.quitButton = TQPushButton(self)
self.connect(self.quitButton, SIGNAL("clicked()"), self.qApp, SLOT("quit()"))
self.connect(self.quitButton, SIGNAL("clicked()"), self.tqApp, SLOT("quit()"))
self.quitButton.setText("Quit")
self.quitButton.setGeometry(self.saveButton.geometry().right() + 2, 2,
10 + self.quitButton.fontMetrics().width("Quit"), h)
@ -87,8 +87,8 @@ class MagWidget(TQWidget):
self.resize(w, w)
self.setMouseTracking(TRUE)
self.grabx = self.qApp.desktop().width() / 2
self.graby = self.qApp.desktop().height() / 2
self.grabx = self.tqApp.desktop().width() / 2
self.graby = self.tqApp.desktop().height() / 2
self.grabAround(TQPoint(self.grabx, self.graby))
#self.zoom.setCurrentItem(1) # grabAround sets zoom factor

2
examples/tut10.py
Unescape View File

@ -135,7 +135,7 @@ class MyWidget(tqt.TQWidget):
self.angle.setFocus()
qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
a = tqt.TQApplication(sys.argv)
w = MyWidget()

2
examples/tut11.py
Unescape View File

@ -203,7 +203,7 @@ class MyWidget(tqt.TQWidget):
self.angle.setFocus()
qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
a = tqt.TQApplication(sys.argv)
w = MyWidget()

2
examples/tut12.py
Unescape View File

@ -243,7 +243,7 @@ class MyWidget(tqt.TQWidget):
self.angle.setFocus()
qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
a = tqt.TQApplication(sys.argv)
w = MyWidget()

2
examples/tut13.py
Unescape View File

@ -320,7 +320,7 @@ class GameBoard(tqt.TQWidget):
self.cannonField.newTarget()
qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
a = tqt.TQApplication(sys.argv)
gb = GameBoard()

2
examples/tut14.py
Unescape View File

@ -368,7 +368,7 @@ class GameBoard(tqt.TQWidget):
self.cannonField.newTarget()
qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
a = tqt.TQApplication(sys.argv)
gb = GameBoard()

2
examples/tut2.py
Unescape View File

@ -12,7 +12,7 @@ quit = tqt.TQPushButton("Quit", None)
quit.resize(75, 30)
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
qt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
tqt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
a.setMainWidget(quit)
quit.show()

2
examples/tut3.py
Unescape View File

@ -14,7 +14,7 @@ box.resize(200, 120)
quit = tqt.TQPushButton("Quit", box)
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
qt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
tqt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
a.setMainWidget(box)
box.show()

2
examples/tut9.py
Unescape View File

@ -94,7 +94,7 @@ class MyWidget(tqt.TQWidget):
self.angle.setFocus()
qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
a = tqt.TQApplication(sys.argv)
w = MyWidget()

2
examples/webbrowser/mainwindow.ui
Unescape View File

@ -405,6 +405,6 @@
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">qaxwidget.h</include>
<include location="global" impldecl="in implementation">tqaxwidget.h</include>
</includes>
</UI>

10
pytquic3/uic.cpp
Unescape View File

@ -828,11 +828,11 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla
TQString objClass, objName;
objClass = e.tagName();
TQString qlayout = "TQVBoxLayout";
TQString tqlayout = "TQVBoxLayout";
if ( objClass == "hbox" )
qlayout = "TQHBoxLayout";
tqlayout = "TQHBoxLayout";
else if ( objClass == "grid" )
qlayout = "TQGridLayout";
tqlayout = "TQGridLayout";
bool isGrid = e.tagName() == "grid" ;
objName = registerObject( getLayoutName( e ) );
@ -850,10 +850,10 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla
out << indent << parent << ".setColumnLayout(0,TQt.Vertical)" << endl;
out << indent << parent << ".layout().setSpacing(" << spacing << ")" << endl;
out << indent << parent << ".layout().setMargin(" << margin << ")" << endl;
out << indent << objName << " = " << qlayout << "(" << parent << ".layout())" << endl;
out << indent << objName << " = " << tqlayout << "(" << parent << ".layout())" << endl;
out << indent << objName << ".setAlignment(TQt.AlignTop)" << endl;
} else {
out << indent << objName << " = " << qlayout << "(";
out << indent << objName << " = " << tqlayout << "(";
if ( layout.isEmpty() )
out << parent;
else {

12
sip/tqt/tqdir.sip
Unescape View File

@ -89,27 +89,27 @@ the return type of a function or the type of an argument, a Python list of
return 1;
}
TQFileInfoList *qfil = new TQFileInfoList;
TQFileInfoList *tqfil = new TQFileInfoList;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
TQFileInfo *qfi;
TQFileInfo *tqfi;
// We apply the transfer to the list itself, not the elements.
// Note that any temporary element will never be destroyed.
// There is nothing that can be done about this.
qfi = reinterpret_cast<TQFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQFileInfo,0,0,0,sipIsErr));
tqfi = reinterpret_cast<TQFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQFileInfo,0,0,0,sipIsErr));
if (*sipIsErr)
{
delete qfil;
delete tqfil;
return 0;
}
qfil -> append(qfi);
tqfil -> append(tqfi);
}
*sipCppPtr = qfil;
*sipCppPtr = tqfil;
return sipGetState(sipTransferObj);
%End

20
sip/tqt/tqmemarray.sip
Unescape View File

@ -64,24 +64,24 @@ converted to and from Python lists of the type.
if (sipIsErr == NULL)
return PyList_Check(sipPy);
TQMemArray<int> *qma = new TQMemArray<int>(PyList_GET_SIZE(sipPy));
TQMemArray<int> *tqma = new TQMemArray<int>(PyList_GET_SIZE(sipPy));
PyErr_Clear();
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
(*qma)[i] = (int)PyLong_AsLong(PyList_GET_ITEM(sipPy,i));
(*tqma)[i] = (int)PyLong_AsLong(PyList_GET_ITEM(sipPy,i));
if (PyErr_Occurred() != NULL)
{
delete qma;
delete tqma;
*sipIsErr = 1;
return 0;
}
}
*sipCppPtr = qma;
*sipCppPtr = tqma;
return sipGetState(sipTransferObj);
%End
@ -135,7 +135,7 @@ template<TYPE>
return 1;
}
TQMemArray<TYPE> *ql = new TQMemArray<TYPE>;
TQMemArray<TYPE> *tql = new TQMemArray<TYPE>;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
@ -146,18 +146,18 @@ template<TYPE>
{
sipReleaseInstance(t, sipClass_TYPE, state);
delete ql;
delete tql;
return 0;
}
uint idx = ql->size();
ql->resize(idx + 1);
ql->at(idx) = *t;
uint idx = tql->size();
tql->resize(idx + 1);
tql->at(idx) = *t;
sipReleaseInstance(t, sipClass_TYPE, state);
}
*sipCppPtr = ql;
*sipCppPtr = tql;
return sipGetState(sipTransferObj);
%End

66
sip/tqt/tqobject.sip
Unescape View File

@ -1050,8 +1050,8 @@ enum pytqt3SigArgType {
classp_sat,
mtype_sat,
mtypep_sat,
qvariant_sat,
qvariantp_sat,
tqvariant_sat,
tqvariantp_sat,
pyobject_sat,
schar_sat,
sstring_sat,
@ -1223,14 +1223,14 @@ TQMetaObject *UniversalSlot::staticMetaObject()
}
bool UniversalSlot::tqt_invoke(int id, TQUObject *qargs)
bool UniversalSlot::tqt_invoke(int id, TQUObject *tqargs)
{
if (id - staticMetaObject()->slotOffset() != 0)
return TQObject::tqt_invoke(id, qargs);
return TQObject::tqt_invoke(id, tqargs);
bool ok = TRUE;
const pytqt3Signature *psig = conn.sc_signature;
TQVariant *qv;
TQVariant *tqv;
// Save in case it is asked for later.
lastSender = const_cast<TQObject *>(sender());
@ -1239,9 +1239,9 @@ bool UniversalSlot::tqt_invoke(int id, TQUObject *qargs)
// in a TQVariant instance. At the moment we handle int argument as
// that is all that is needed by PyTQt (and PyKDE).
if (lastSender->inherits("TQSignal"))
qv = &static_QUType_TQVariant.get(qargs + 1);
tqv = &static_QUType_TQVariant.get(tqargs + 1);
else
qv = 0;
tqv = 0;
#ifdef WITH_THREAD
PyGILState_STATE state = PyGILState_Ensure();
@ -1257,94 +1257,94 @@ bool UniversalSlot::tqt_invoke(int id, TQUObject *qargs)
{
PyObject *arg;
++qargs;
++tqargs;
switch (psig->sg_args[a].atype)
{
case char_sat:
case schar_sat:
case uchar_sat:
arg = PyBytes_FromStringAndSize((char *)static_QUType_ptr.get(qargs), 1);
arg = PyBytes_FromStringAndSize((char *)static_QUType_ptr.get(tqargs), 1);
break;
case string_sat:
case sstring_sat:
case ustring_sat:
arg = PyBytes_FromString((char *)static_QUType_ptr.get(qargs));
arg = PyBytes_FromString((char *)static_QUType_ptr.get(tqargs));
break;
case short_sat:
arg = PyLong_FromLong(*(short *)static_QUType_ptr.get(qargs));
arg = PyLong_FromLong(*(short *)static_QUType_ptr.get(tqargs));
break;
case ushort_sat:
arg = PyLong_FromUnsignedLong(*(unsigned short *)static_QUType_ptr.get(qargs));
arg = PyLong_FromUnsignedLong(*(unsigned short *)static_QUType_ptr.get(tqargs));
break;
case int_sat:
if (qv)
arg = PyLong_FromLong(qv -> asInt());
if (tqv)
arg = PyLong_FromLong(tqv -> asInt());
else
arg = PyLong_FromLong(static_QUType_int.get(qargs));
arg = PyLong_FromLong(static_QUType_int.get(tqargs));
break;
case uint_sat:
arg = PyLong_FromUnsignedLong(*(unsigned *)static_QUType_ptr.get(qargs));
arg = PyLong_FromUnsignedLong(*(unsigned *)static_QUType_ptr.get(tqargs));
break;
case long_sat:
arg = PyLong_FromLong(*(long *)static_QUType_ptr.get(qargs));
arg = PyLong_FromLong(*(long *)static_QUType_ptr.get(tqargs));
break;
case ulong_sat:
arg = PyLong_FromUnsignedLong(*(unsigned long *)static_QUType_ptr.get(qargs));
arg = PyLong_FromUnsignedLong(*(unsigned long *)static_QUType_ptr.get(tqargs));
break;
case longlong_sat:
arg = PyLong_FromLongLong(*(PY_LONG_LONG *)static_QUType_ptr.get(qargs));
arg = PyLong_FromLongLong(*(PY_LONG_LONG *)static_QUType_ptr.get(tqargs));
break;
case ulonglong_sat:
arg = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)static_QUType_ptr.get(qargs));
arg = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)static_QUType_ptr.get(tqargs));
break;
case float_sat:
arg = PyFloat_FromDouble(*(float *)static_QUType_ptr.get(qargs));
arg = PyFloat_FromDouble(*(float *)static_QUType_ptr.get(tqargs));
break;
case double_sat:
arg = PyFloat_FromDouble(static_QUType_double.get(qargs));
arg = PyFloat_FromDouble(static_QUType_double.get(tqargs));
break;
case enum_sat:
arg = sipConvertFromNamedEnum(*(int *)static_QUType_ptr.get(qargs), psig->sg_args[a].u.et);
arg = sipConvertFromNamedEnum(*(int *)static_QUType_ptr.get(tqargs), psig->sg_args[a].u.et);
break;
case bool_sat:
arg = PyLong_FromLong(static_QUType_bool.get(qargs));
arg = PyLong_FromLong(static_QUType_bool.get(tqargs));
break;
case void_sat:
arg = sipConvertFromVoidPtr((void *)static_QUType_ptr.get(qargs));
arg = sipConvertFromVoidPtr((void *)static_QUType_ptr.get(tqargs));
break;
case class_sat:
case classp_sat:
arg = sipConvertFromInstance((void *)static_QUType_ptr.get(qargs),psig->sg_args[a].u.wt,0);
arg = sipConvertFromInstance((void *)static_QUType_ptr.get(tqargs),psig->sg_args[a].u.wt,0);
break;
case mtype_sat:
case mtypep_sat:
arg = sipConvertFromMappedType((void *)static_QUType_ptr.get(qargs),psig->sg_args[a].u.mt,0);
arg = sipConvertFromMappedType((void *)static_QUType_ptr.get(tqargs),psig->sg_args[a].u.mt,0);
break;
case qvariant_sat:
case qvariantp_sat:
arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(qargs),sipClass_TQVariant,0);
case tqvariant_sat:
case tqvariantp_sat:
arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(tqargs),sipClass_TQVariant,0);
break;
case pyobject_sat:
arg = (PyObject *)static_QUType_ptr.get(qargs);
arg = (PyObject *)static_QUType_ptr.get(tqargs);
break;
default:
@ -1665,12 +1665,12 @@ static void parseType(const char *type, pytqt3SigArg *arg)
{
if (indir == 0)
{
sat = qvariant_sat;
sat = tqvariant_sat;
unsup = FALSE;
}
else if (indir == 1)
{
sat = qvariantp_sat;
sat = tqvariantp_sat;
unsup = FALSE;
}
}

8
sip/tqt/tqptrlist.sip
Unescape View File

@ -83,24 +83,24 @@ template<Type>
return 1;
}
TQPtrList<Type> *qpl = new TQPtrList<Type>;
TQPtrList<Type> *tqpl = new TQPtrList<Type>;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
// We apply the transfer to the list itself, not the elements.
// Note that any temporary element will never be destroyed.
// There is nothing that can be done about this.
qpl -> append(reinterpret_cast<Type *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_Type,0,0,0,sipIsErr)));
tqpl -> append(reinterpret_cast<Type *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_Type,0,0,0,sipIsErr)));
if (*sipIsErr)
{
delete qpl;
delete tqpl;
return 0;
}
}
*sipCppPtr = qpl;
*sipCppPtr = tqpl;
return sipGetState(sipTransferObj);
%End

4
sip/tqt/tqtextstream.sip
Unescape View File

@ -152,12 +152,12 @@ public:
int precision() const;
int precision(int);
// These are defined in qmainwindow.h as global operators so we have
// These are defined in tqmainwindow.h as global operators so we have
// to implement them here and pretend they are class operators.
TQTextStream &operator<<(const TQMainWindow &);
TQTextStream &operator>>(TQMainWindow &);
// These are defined in qdockarea.h as global operators so we have
// These are defined in tqdockarea.h as global operators so we have
// to implement them here and pretend they are class operators.
TQTextStream &operator<<(const TQDockArea &);
TQTextStream &operator>>(TQDockArea &);

2
sip/tqt/tqtmod.sip
Unescape View File

@ -270,7 +270,7 @@ DESTDIR = @PYTQT_MODDIR@
CONFIG += @BLX_CONFIG_LIB@ @PYTQT_WARN@
INCLUDEPATH = @BLX_INCLUDEPATH@
DEFINES = @BLX_DEFINES@
LIBS += @PYTQT_QASSISTANTCLIENT_LIB@ @BLX_LIBS@
LIBS += @PYTQT_TQASSISTANTCLIENT_LIB@ @BLX_LIBS@
macx:QMAKE_LFLAGS += -framework Python
SOURCES = $B

16
sip/tqt/tqvaluelist.sip
Unescape View File

@ -83,7 +83,7 @@ template<Type>
return 1;
}
TQValueList<Type> *qvl = new TQValueList<Type>;
TQValueList<Type> *tqvl = new TQValueList<Type>;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
@ -97,17 +97,17 @@ template<Type>
sipReleaseInstance(itm,sipClass_Type,state);
*sipIsErr = 1;
delete qvl;
delete tqvl;
return 0;
}
qvl -> append(*itm);
tqvl -> append(*itm);
sipReleaseInstance(itm,sipClass_Type,state);
}
*sipCppPtr = qvl;
*sipCppPtr = tqvl;
return sipGetState(sipTransferObj);
%End
@ -149,24 +149,24 @@ template<Type>
if (sipIsErr == NULL)
return PyList_Check(sipPy);
TQValueList<int> *qvl = new TQValueList<int>;
TQValueList<int> *tqvl = new TQValueList<int>;
PyErr_Clear();
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
qvl -> append(PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
tqvl -> append(PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
if (PyErr_Occurred() != NULL)
{
delete qvl;
delete tqvl;
*sipIsErr = 1;
return 0;
}
}
*sipCppPtr = qvl;
*sipCppPtr = tqvl;
return 1;
%End

12
sip/tqt/tqwidgetlist.sip
Unescape View File

@ -80,27 +80,27 @@ instances is used instead.
return 1;
}
TQWidgetList *qwl = new TQWidgetList;
TQWidgetList *tqwl = new TQWidgetList;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
TQWidget *qw;
TQWidget *tqw;
// We apply the transfer to the list itself, not the elements.
// Note that any temporary element will never be destroyed.
// There is nothing that can be done about this.
qw = reinterpret_cast<TQWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQWidget,0,0,0,sipIsErr));
tqw = reinterpret_cast<TQWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQWidget,0,0,0,sipIsErr));
if (*sipIsErr)
{
delete qwl;
delete tqwl;
return 0;
}
qwl -> append(qw);
tqwl -> append(tqw);
}
*sipCppPtr = qwl;
*sipCppPtr = tqwl;
return sipGetState(sipTransferObj);
%End

2
sip/tqtpe/tqpeapplication.sip
Unescape View File

@ -97,7 +97,7 @@ public:
sizeof (map)/sizeof (map[0]));
%End
static TQString qpeDir();
static TQString tqpeDir();
static TQString documentDir();
void applyStyle();
static int defaultRotation();

8
sip/tqtsql/tqsqlrecord.sip
Unescape View File

@ -140,7 +140,7 @@ public:
return 1;
}
TQSqlRecordInfo *qri = new TQSqlRecordInfo;
TQSqlRecordInfo *tqri = new TQSqlRecordInfo;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
@ -154,17 +154,17 @@ public:
sipReleaseInstance(itm,sipClass_TQSqlFieldInfo,state);
*sipIsErr = 1;
delete qri;
delete tqri;
return 0;
}
qri -> append(*itm);
tqri -> append(*itm);
sipReleaseInstance(itm,sipClass_TQSqlFieldInfo,state);
}
*sipCppPtr = qri;
*sipCppPtr = tqri;
return sipGetState(sipTransferObj);
%End

Write Preview
Loading…
Cancel
Save