Browse Source

Update various qt function definitions and static methods for tqt3

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
e87fff3247
25 changed files with 92 additions and 92 deletions
  1. +5
    -5
      ChangeLog
  2. +6
    -6
      NEWS
  3. +1
    -1
      build.py
  4. +4
    -4
      configure.py
  5. +1
    -1
      examples3/biff.py
  6. +1
    -1
      pylupdate3/main.cpp
  7. +1
    -1
      pylupdate3/numberh.cpp
  8. +1
    -1
      pyuic2/uic.cpp
  9. +1
    -1
      pyuic2/uic.h
  10. +2
    -2
      pyuic2/widgetdatabase.cpp
  11. +4
    -4
      pyuic3/embed.cpp
  12. +5
    -5
      pyuic3/form.cpp
  13. +3
    -3
      pyuic3/main.cpp
  14. +5
    -5
      pyuic3/uic.cpp
  15. +2
    -2
      pyuic3/uic.h
  16. +2
    -2
      sip/qt/qbytearray.sip
  17. +5
    -5
      sip/qt/qevent.sip
  18. +2
    -2
      sip/qt/qglobal.sip
  19. +31
    -31
      sip/qt/qobject.sip
  20. +1
    -1
      sip/qt/qstring.sip
  21. +4
    -4
      sip/qt/qtmod.sip
  22. +2
    -2
      sip/qt/qwindowdefs.sip
  23. +1
    -1
      sip/qtcanvas/qcanvas.sip
  24. +1
    -1
      sip/qtnetwork/qsocket.sip
  25. +1
    -1
      sip/qttable/qtable.sip

+ 5
- 5
ChangeLog View File

@@ -1765,8 +1765,8 @@ Fixed Python 1.5.2 problems in the build system.
Updated the menu.py example for TQt3 (thanks to Selim Tuvi).
Fixed a bug in pyuic3 related to pixmaps in TQListViewItems.
Fixed a bug in the canvas.py example.
PYQT_VERSION is now the version encoded as a hexadecimal value.
Added PYQT_VERSION_STR as the ASCII version (unless it is a snapshot).
PYTQT_VERSION is now the version encoded as a hexadecimal value.
Added PYTQT_VERSION_STR as the ASCII version (unless it is a snapshot).


2003/01/25 15:39:58 phil
@@ -1940,7 +1940,7 @@ TQIMComposeEvent, TQMutexLocker and TQSyntaxHighlighter TQt 3.1.0 classes.
TQListView.sort() is now virtual for TQt3.
Fixed a bug in the widgets.py example for both TQt2 and TQt3.
Updated pyuic from TQt 3.1.0.
Added the qCompress and qUncompress TQt 3.1.0 functions.
Added the qCompress and tqUncompress TQt 3.1.0 functions.


2002/11/06 23:56:57 phil
@@ -2505,12 +2505,12 @@ Added missing /Transfer/ to TQTable.setCellWidget() and TQTable.setItem().

2002/04/18 23:17:07 phil
Disabled TQFont.dirty(), TQClipboard.ownsClipboard(), TQClipboard.ownsSelection()
and qAppName() for MacOS.
and tqAppName() for MacOS.


2002/04/18 12:10:42 phil
Updated the NEWS file regarding MacOS X support.
qt.py now defines PYQT_VERSION as the PyTQt release as a string.
qt.py now defines PYTQT_VERSION as the PyTQt release as a string.
configure no longer fails if X11 couldn't be found (for MacOS X).



+ 6
- 6
NEWS View File

@@ -174,8 +174,8 @@ v3.6 26th April 2003
examples from Oleksandr Yakovlyev.
- Added the qtui module (thanks to Hans-Peter Jansen).
- Support for TQt v3.1.2 added.
- PYQT_VERSION is now the version encoded as a hexadecimal value.
- Added PYQT_VERSION_STR.
- PYTQT_VERSION is now the version encoded as a hexadecimal value.
- Added PYTQT_VERSION_STR.

v3.5 11th December 2002
- Added the qtext module containing the bindings for TQScintilla.
@@ -185,7 +185,7 @@ v3.5 11th December 2002
- Support for TQt v3.0.6, v3.1.0 and v3.1.1 added.
- Added the TQt v3.1.x TQAssistantClient, TQEventLoop, TQIconFactory,
- TQIMComposeEvent, TQMutexLocker and TQSyntaxHighlighter classes, and
qCompress() and qUncompress functions.
qCompress() and tqUncompress functions.
- Removed eric from the distribution as it is now packaged separately.
- The SQL examples now support PostgreSQL as well as MySQL.
- Added the TQtopia v1.5.0 AppLnk, AppLnkSet, Config, DateFormat, DocLnk,
@@ -244,7 +244,7 @@ v3.2 5th May 2002
class.
- Added the missing TQToolTip.setEnabled() and TQToolTip.enabled().
- Added support for MacOS X.
- Added PYQT_VERSION as the PyTQt release number as a string.
- Added PYTQT_VERSION as the PyTQt release number as a string.
- Added the semaphore.py example.
- Any Python object can now be passed as the data element of a TQCustomEvent.
- configure now searches for TQt v3.0.4.
@@ -459,7 +459,7 @@ v0.10.1 21st January 2000

v0.10 19th December 1999
The .pyc files are now created by the installation process. Added
qAppName(), TQCursor.handle(), TQFont.handle(), TQPaintDevice.handle(),
tqAppName(), TQCursor.handle(), TQFont.handle(), TQPaintDevice.handle(),
TQPainter.handle(). Added most of the typedefs. Changed
examples/application.py so as not to use the obsolete (and
unimplemented) TQMessageBox.message(). Fixed bug in TQPixmap ctor.
@@ -507,7 +507,7 @@ v0.7.1 3rd May 1999

v0.7 16th April 1999
Build with -fno-exceptions if supported. Converted the documentation
to SGML. Replaced QT_VERSION and KDE_VERSION with the proper TQt and
to SGML. Replaced TQT_VERSION and KDE_VERSION with the proper TQt and
KDE version constants. Fixed a bad bug converting from TQStrings to
Python strings. The "connect" convenience function has been removed.
Added the class variables for all supported classes. Removed SLOT()

+ 1
- 1
build.py View File

@@ -327,7 +327,7 @@ int main(int argc,char **argv)
fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
#endif

#if (defined(Q_OS_WIN32) || defined(Q_OS_WIN64)) && QT_VERSION >= 0x030000
#if (defined(Q_OS_WIN32) || defined(Q_OS_WIN64)) && TQT_VERSION >= 0x030000
if (qWinVersion() != TQt::WV_XP)
fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
#endif

+ 4
- 4
configure.py View File

@@ -315,7 +315,7 @@ class ConfigurePyTQt3(ConfigureBase):
makefile.extra_defines.append("QT_INTERNAL_XML")

if prof or "qtxml" not in pyqt_modules:
makefile.extra_defines.append("QT_MODULE_XML")
makefile.extra_defines.append("TQT_MODULE_XML")

if qt_version < 0x030100:
makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
@@ -346,7 +346,7 @@ class ConfigurePyTQt3(ConfigureBase):
makefile.extra_defines.append("QT_INTERNAL_XML")

if prof or "qtxml" not in pyqt_modules:
makefile.extra_defines.append("QT_MODULE_XML")
makefile.extra_defines.append("TQT_MODULE_XML")

makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3"))

@@ -709,7 +709,7 @@ int main(int argc,char **argv)
fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
#endif

#if !defined(Q_WS_WIN) || QT_VERSION < 0x030000 || defined(QT_NO_STYLE_WINDOWSXP)
#if !defined(Q_WS_WIN) || TQT_VERSION < 0x030000 || defined(QT_NO_STYLE_WINDOWSXP)
fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
#endif

@@ -1119,7 +1119,7 @@ def check_qt_installation(macros):
# Get the TQt version number.
global qt_version

qt_version, ignore = sipconfig.read_version(qglobal, "TQt", "QT_VERSION")
qt_version, ignore = sipconfig.read_version(qglobal, "TQt", "TQT_VERSION")

# Early versions of TQt for the Mac didn't include everything. Rather than
# maintain these in the future we just mandate a later version.

+ 1
- 1
examples3/biff.py View File

@@ -4,7 +4,7 @@ import os, sys, string
from qt import *


if QT_VERSION < 0x030100:
if TQT_VERSION < 0x030100:
print "This example requires TQt v3.1.0 or later."
sys.exit(1)


+ 1
- 1
pylupdate3/main.cpp View File

@@ -80,7 +80,7 @@ int main( int argc, char **argv )
verbose = TRUE;
continue;
} else if ( qstrcmp(argv[i], "-version") == 0 ) {
qWarning( "pylupdate version %s", QT_VERSION_STR );
qWarning( "pylupdate version %s", TQT_VERSION_STR );
return 0;
}


+ 1
- 1
pylupdate3/numberh.cpp View File

@@ -80,7 +80,7 @@ static TQString translationAttempt( const TQString& oldTranslation,
const char *newSource )
{
int p = zeroKey( oldSource ).contains( '0' );
int oldSourceLen = qstrlen( oldSource );
int oldSourceLen = tqstrlen( oldSource );
TQString attempt;
TQStringList oldNumbers;
TQStringList newNumbers;

+ 1
- 1
pyuic2/uic.cpp View File

@@ -1572,7 +1572,7 @@ int main( int argc, char * argv[] )
out << "# Form implementation generated from reading ui file '" << fileName << "'" << endl;
out << "#" << endl;
out << "# Created: " << TQDateTime::currentDateTime().toString() << endl;
out << "# by: The Python User Interface Compiler (pyuic) " << PYQT_VERSION << endl;
out << "# by: The Python User Interface Compiler (pyuic) " << PYTQT_VERSION << endl;
out << "#" << endl;
out << "# WARNING! All changes made in this file will be lost!" << endl;
out << endl;

+ 1
- 1
pyuic2/uic.h View File

@@ -28,7 +28,7 @@
#include <tqcolor.h>


#define PYQT_VERSION "3.18.1"
#define PYTQT_VERSION "3.18.1"


class Uic : public TQt

+ 2
- 2
pyuic2/widgetdatabase.cpp View File

@@ -191,7 +191,7 @@ void WidgetDatabase::setupDataBase()

append( r );

#if defined(QT_MODULE_ICONVIEW) || defined(UIC)
#if defined(TQT_MODULE_ICONVIEW) || defined(UIC)
r = new WidgetDatabaseRecord;
r->iconSet = "iconview.xpm";
r->name = "TQIconView";
@@ -201,7 +201,7 @@ void WidgetDatabase::setupDataBase()
append( r );
#endif

#if defined(QT_MODULE_TABLE)
#if defined(TQT_MODULE_TABLE)
r = new WidgetDatabaseRecord;
r->iconSet = "table.xpm";
r->name = "TQTable";

+ 4
- 4
pyuic3/embed.cpp View File

@@ -32,7 +32,7 @@
// on embedded, we do not compress image data. Rationale: by mapping
// the ready-only data directly into memory we are both faster and
// more memory efficient
#if (QT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(QT_NO_IMAGE_COLLECTION_COMPRESSION)
#if (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(QT_NO_IMAGE_COLLECTION_COMPRESSION)
#define QT_NO_IMAGE_COLLECTION_COMPRESSION
#endif

@@ -129,7 +129,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
out << "# " << *it << "\n";
out << "#\n";
out << "# Created: " << TQDateTime::currentDateTime().toString() << "\n";
out << "# by: The PyTQt User Interface Compiler (pyuic) " << PYQT_VERSION << "\n";
out << "# by: The PyTQt User Interface Compiler (pyuic) " << PYTQT_VERSION << "\n";
out << "#\n";
out << "# WARNING! All changes made in this file will be lost!\n";

@@ -137,7 +137,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
out << "\n";
out << "from qt import TQImage, TQMimeSourceFactory";
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
out << ", qUncompress";
out << ", tqUncompress";
#endif
out << "\n";
out << "\n";
@@ -228,7 +228,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
++indent;
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
// Keep the data object alive until we have a deep copy of the image.
out << indent << "data = qUncompress(data).data()\n";
out << indent << "data = tqUncompress(data).data()\n";
#endif
out << indent << "img = TQImage(data,w,h,depth,colTab,nrCol,TQImage.BigEndian).copy()\n";
out << "\n";

+ 5
- 5
pyuic3/form.cpp View File

@@ -30,13 +30,13 @@
#define NO_STATIC_COLORS
#include <globaldefs.h>

#if QT_VERSION < 0x030100
#if TQT_VERSION < 0x030100
#include <zlib.h>
#endif

static TQByteArray unzipXPM( TQString data, ulong& length )
{
#if QT_VERSION >= 0x030100
#if TQT_VERSION >= 0x030100
const int lengthOffset = 4;
int baSize = data.length() / 2 + lengthOffset;
uchar *ba = new uchar[ baSize ];
@@ -55,13 +55,13 @@ static TQByteArray unzipXPM( TQString data, ulong& length )
r += l - 'a' + 10;
ba[ i ] = r;
}
// qUncompress() expects the first 4 bytes to be the expected length of the
// tqUncompress() expects the first 4 bytes to be the expected length of the
// uncompressed data
ba[0] = ( length & 0xff000000 ) >> 24;
ba[1] = ( length & 0x00ff0000 ) >> 16;
ba[2] = ( length & 0x0000ff00 ) >> 8;
ba[3] = ( length & 0x000000ff );
TQByteArray baunzip = qUncompress( ba, baSize );
TQByteArray baunzip = tqUncompress( ba, baSize );
delete[] ba;
return baunzip;
#else
@@ -395,7 +395,7 @@ void Uic::createFormImpl( const TQDomElement &e )
}
out << endl;
} else if ( externPixmaps ) {
#if QT_VERSION >= 0x030100
#if TQT_VERSION >= 0x030100
pixmapLoaderFunction = "TQPixmap.fromMimeSource";
#else
out << indent << "def uic_load_pixmap_" << objName << "(name):" << endl;

+ 3
- 3
pyuic3/main.cpp View File

@@ -92,7 +92,7 @@ int main( int argc, char * argv[] )
} else if ( opt == "version" ) {
fprintf( stderr,
"Python User Interface Compiler %s for TQt version %s\n",
PYQT_VERSION, QT_VERSION_STR );
PYTQT_VERSION, TQT_VERSION_STR );
return 1;
} else if ( opt == "help" ) {
break;
@@ -193,7 +193,7 @@ int main( int argc, char * argv[] )
TQDomElement e = doc.firstChild().toElement();
if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) {
qWarning( TQString("pyuic: File generated with too recent version of TQt Designer (%s vs. %s)"),
e.attribute("version").latin1(), QT_VERSION_STR );
e.attribute("version").latin1(), TQT_VERSION_STR );
return 1;
}

@@ -210,7 +210,7 @@ int main( int argc, char * argv[] )
out << "# Form implementation generated from reading ui file '" << fileName << "'" << endl;
out << "#" << endl;
out << "# Created: " << TQDateTime::currentDateTime().toString() << endl;
out << "# by: The PyTQt User Interface Compiler (pyuic) " << PYQT_VERSION << endl;
out << "# by: The PyTQt User Interface Compiler (pyuic) " << PYTQT_VERSION << endl;
out << "#" << endl;
out << "# WARNING! All changes made in this file will be lost!" << endl;
out << endl;

+ 5
- 5
pyuic3/uic.cpp View File

@@ -80,7 +80,7 @@ bool Uic::toBool( const TQString& s )

TQString Uic::fixString( const TQString &str, bool encode )
{
#if QT_VERSION >= 0x030100
#if TQT_VERSION >= 0x030100
TQString s;
if ( !encode ) {
s = str;
@@ -182,7 +182,7 @@ Uic::Uic( const TQString &fn, const char *outputFn, TQTextStream &outStream,
pixmapLoaderFunction = getPixmapLoaderFunction( doc.firstChild().toElement() );
nameOfClass = getFormClassName( doc.firstChild().toElement() );

#if QT_VERSION >= 0x030300
#if TQT_VERSION >= 0x030300
uiFileVersion = doc.firstChild().toElement().attribute("version");
#endif
stdsetdef = toBool( doc.firstChild().toElement().attribute("stdsetdef") );
@@ -402,7 +402,7 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
else
continue;
bool subActionsDone = FALSE;
#if QT_VERSION >= 0x030300
#if TQT_VERSION >= 0x030300
bool hasMenuText = FALSE;
TQString actionText;
#endif
@@ -424,7 +424,7 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
else
call += "setProperty(\"" + prop + "\",TQVariant(" + value + "))";

#if QT_VERSION >= 0x030300
#if TQT_VERSION >= 0x030300
if (prop == "menuText")
hasMenuText = TRUE;
else if (prop == "text")
@@ -441,7 +441,7 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
subActionsDone = TRUE;
}
}
#if QT_VERSION >= 0x030300
#if TQT_VERSION >= 0x030300
// workaround for loading pre-3.3 files expecting bogus TQAction behavior
if (!hasMenuText && !actionText.isEmpty() && uiFileVersion < "3.3")
trout << indent << "self." << objName << ".setMenuText(" << actionText << ")" << endl;

+ 2
- 2
pyuic3/uic.h View File

@@ -30,7 +30,7 @@
#include <tqvariant.h>


#define PYQT_VERSION "3.18.1"
#define PYTQT_VERSION "3.18.1"


class PyIndent
@@ -143,7 +143,7 @@ private:
uint stdsetdef : 1;
uint externPixmaps : 1;

#if QT_VERSION >= 0x030300
#if TQT_VERSION >= 0x030300
TQString uiFileVersion;
#endif
TQString nameOfClass;

+ 2
- 2
sip/qt/qbytearray.sip View File

@@ -198,6 +198,6 @@ public:
%If (TQt_3_1_0 -)
TQByteArray qCompress(const uchar * /Array/,int /ArraySize/);
TQByteArray qCompress(const TQByteArray &);
TQByteArray qUncompress(const uchar * /Array/,int /ArraySize/);
TQByteArray qUncompress(const TQByteArray &);
TQByteArray tqUncompress(const uchar * /Array/,int /ArraySize/);
TQByteArray tqUncompress(const TQByteArray &);
%End

+ 5
- 5
sip/qt/qevent.sip View File

@@ -462,7 +462,7 @@ public:
break;

case TQEvent::Accel:
#if QT_VERSION >= 220
#if TQT_VERSION >= 220
case TQEvent::AccelOverride:
#endif
case TQEvent::KeyPress:
@@ -491,7 +491,7 @@ public:
sipClass = sipClass_TQCloseEvent;
break;

#if QT_VERSION >= 0x030300
#if TQT_VERSION >= 0x030300
case TQEvent::IconDrag:
sipClass = sipClass_TQIconDragEvent;
break;
@@ -532,7 +532,7 @@ public:
sipClass = sipClass_TQChildEvent;
break;

#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
case TQEvent::ContextMenu:
sipClass = sipClass_TQContextMenuEvent;
break;
@@ -543,7 +543,7 @@ public:
break;
#endif

#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100
#if TQT_VERSION >= 0x030000 && TQT_VERSION < 0x030100
case TQEvent::IMCompose:
sipClass = sipClass_TQIMEvent;
break;
@@ -553,7 +553,7 @@ public:
break;
#endif

#if QT_VERSION >= 0x030100
#if TQT_VERSION >= 0x030100
case TQEvent::IMCompose:
sipClass = sipClass_TQIMComposeEvent;
break;

+ 2
- 2
sip/qt/qglobal.sip View File

@@ -25,8 +25,8 @@
%End


const int QT_VERSION;
const char *QT_VERSION_STR;
const int TQT_VERSION;
const char *TQT_VERSION_STR;

typedef unsigned char uchar;
typedef unsigned short ushort;

+ 31
- 31
sip/qt/qobject.sip View File

@@ -77,14 +77,14 @@ public:
int yes, no;
} graph[] = {
{sipName_TQWidget, &sipClass_TQWidget, 25, 1},
#if QT_VERSION >= 0x030100 && defined(SIP_FEATURE_TQt_ASSISTANTCLIENT)
#if TQT_VERSION >= 0x030100 && defined(SIP_FEATURE_TQt_ASSISTANTCLIENT)
{sipName_TQAssistantClient, &sipClass_TQAssistantClient, -1, 2},
#else
{NULL, NULL, -1, 2},
#endif
{sipName_TQSessionManager, &sipClass_TQSessionManager, -1, 3},
{sipName_TQTranslator, &sipClass_TQTranslator, -1, 4},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQProcess, &sipClass_TQProcess, -1, 5},
#else
{NULL, NULL, -1, 5},
@@ -95,42 +95,42 @@ public:
#else
{NULL, NULL, -1, 7},
#endif
#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
{sipName_TQAction, &sipClass_TQAction, 89, 8},
#else
{NULL, NULL, -1, 8},
#endif
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQObjectCleanupHandler, &sipClass_TQObjectCleanupHandler, -1, 9},
#else
{NULL, NULL, -1, 9},
#endif
{sipName_TQTimer, &sipClass_TQTimer, -1, 10},
{sipName_TQLayout, &sipClass_TQLayout, 90, 11},
#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
{sipName_TQUrlOperator, &sipClass_TQUrlOperator, -1, 12},
#else
{NULL, NULL, -1, 12},
#endif
{sipName_TQStyleSheet, &sipClass_TQStyleSheet, -1, 13},
{sipName_TQValidator, &sipClass_TQValidator, 94, 14},
#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
{sipName_TQNetworkOperation, &sipClass_TQNetworkOperation, -1, 15},
#else
{NULL, NULL, -1, 15},
#endif
{sipName_TQAccel, &sipClass_TQAccel, -1, 16},
#if QT_VERSION >= 0x030100
#if TQT_VERSION >= 0x030100
{sipName_TQEventLoop, &sipClass_TQEventLoop, -1, 17},
#else
{NULL, NULL, -1, 17},
#endif
#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
{sipName_TQNetworkProtocol, &sipClass_TQNetworkProtocol, -1, 18},
#else
{NULL, NULL, -1, 18},
#endif
#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_SOUND)
#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_SOUND)
{sipName_TQSound, &sipClass_TQSound, -1, 19},
#else
{NULL, NULL, -1, 19},
@@ -152,25 +152,25 @@ public:
{NULL, NULL, -1, 27},
#endif
{sipName_TQTabWidget, &sipClass_TQTabWidget, -1, 28},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQDateEdit, &sipClass_TQDateEdit, -1, 29},
#else
{NULL, NULL, -1, 29},
#endif
{sipName_TQMainWindow, &sipClass_TQMainWindow, -1, 30},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQDateTimeEdit, &sipClass_TQDateTimeEdit, -1, 31},
#else
{NULL, NULL, -1, 31},
#endif
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQTimeEdit, &sipClass_TQTimeEdit, -1, 32},
#else
{NULL, NULL, -1, 32},
#endif
{sipName_TQFrame, &sipClass_TQFrame, 46, 33},
{sipName_TQScrollBar, &sipClass_TQScrollBar, -1, 34},
#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_DIAL)
#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_DIAL)
{sipName_TQDial, &sipClass_TQDial, -1, 35},
#else
{NULL, NULL, -1, 35},
@@ -180,37 +180,37 @@ public:
{sipName_TQDialog, &sipClass_TQDialog, 79, 38},
{sipName_TQComboBox, &sipClass_TQComboBox, -1, 39},
{sipName_TQHeader, &sipClass_TQHeader, -1, 40},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQDockArea, &sipClass_TQDockArea, -1, 41},
#else
{NULL, NULL, -1, 41},
#endif
#if QT_VERSION >= 0x030200
#if TQT_VERSION >= 0x030200
{sipName_TQSplashScreen, &sipClass_TQSplashScreen, -1, 42},
#else
{NULL, NULL, -1, 42},
#endif
{sipName_TQSlider, &sipClass_TQSlider, -1, 43},
{sipName_TQSpinBox, &sipClass_TQSpinBox, -1, 44},
#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_WORKSPACE)
#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_WORKSPACE)
{sipName_TQWorkspace, &sipClass_TQWorkspace, -1, 45},
#else
{NULL, NULL, -1, 45},
#endif
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQDesktopWidget, &sipClass_TQDesktopWidget, -1, -1},
#else
{NULL, NULL, -1, -1},
#endif
{sipName_TQGrid, &sipClass_TQGrid, -1, 47},
{sipName_TQLineEdit, &sipClass_TQLineEdit, -1, 48},
#if QT_VERSION >= 0x030200
#if TQT_VERSION >= 0x030200
{sipName_TQToolBox, &sipClass_TQToolBox, -1, 49},
#else
{NULL, NULL, -1, 49},
#endif
{sipName_TQWidgetStack, &sipClass_TQWidgetStack, -1, 50},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQDockWindow, &sipClass_TQDockWindow, 60, 51},
#else
{NULL, NULL, -1, 51},
@@ -234,19 +234,19 @@ public:
{sipName_TQVGroupBox, &sipClass_TQVGroupBox, -1, -1},
{sipName_TQVButtonGroup, &sipClass_TQVButtonGroup, -1, 65},
{sipName_TQHButtonGroup, &sipClass_TQHButtonGroup, -1, -1},
#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW)
#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW)
{sipName_TQIconView, &sipClass_TQIconView, -1, 67},
#else
{NULL, NULL, -1, 67},
#endif
{sipName_TQListView, &sipClass_TQListView, -1, 68},
{sipName_TQListBox, &sipClass_TQListBox, -1, 69},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQGridView, &sipClass_TQGridView, -1, 70},
#else
{NULL, NULL, -1, 70},
#endif
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQTextEdit, &sipClass_TQTextEdit, 71, -1},
#else
{NULL, NULL, -1, -1},
@@ -264,12 +264,12 @@ public:
#else
{NULL, NULL, -1, 80},
#endif
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQErrorMessage, &sipClass_TQErrorMessage, -1, 81},
#else
{NULL, NULL, -1, 81},
#endif
#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_INPUTDIALOG)
#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_INPUTDIALOG)
{sipName_TQInputDialog, &sipClass_TQInputDialog, -1, 82},
#else
{NULL, NULL, -1, 82},
@@ -309,7 +309,7 @@ public:
#else
{NULL, NULL, -1, -1},
#endif
#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
{sipName_TQActionGroup, &sipClass_TQActionGroup, -1, -1},
#else
{NULL, NULL, -1, -1},
@@ -320,20 +320,20 @@ public:
{sipName_TQVBoxLayout, &sipClass_TQVBoxLayout, -1, -1},
{sipName_TQDoubleValidator, &sipClass_TQDoubleValidator, -1, 95},
{sipName_TQIntValidator, &sipClass_TQIntValidator, -1, 96},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQRegExpValidator, &sipClass_TQRegExpValidator, -1, -1},
#else
{NULL, NULL, -1, -1},
#endif
{sipName_TQTextDrag, &sipClass_TQTextDrag, -1, 98},
{sipName_TQStoredDrag, &sipClass_TQStoredDrag, 101, 99},
#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP)
#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP)
{sipName_TQIconDrag, &sipClass_TQIconDrag, -1, 100},
#else
{NULL, NULL, -1, 100},
#endif
{sipName_TQImageDrag, &sipClass_TQImageDrag, -1, -1},
#if QT_VERSION >= 210
#if TQT_VERSION >= 210
{sipName_TQColorDrag, &sipClass_TQColorDrag, -1, 102},
#else
{NULL, NULL, -1, 102},
@@ -360,12 +360,12 @@ public:
#else
{NULL, NULL, -1, 108},
#endif
#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS)
#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS)
{sipName_TQMotifPlusStyle, &sipClass_TQMotifPlusStyle, -1, 109},
#else
{NULL, NULL, -1, 109},
#endif
#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_SGI)
#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_SGI)
{sipName_TQSGIStyle, &sipClass_TQSGIStyle, -1, -1},
#else
{NULL, NULL, -1, -1},
@@ -1421,7 +1421,7 @@ static PyObject *py_sender = 0;

TQMetaObject *UniversalSlot::metaObj = 0;

#if QT_VERSION >= 0x030100
#if TQT_VERSION >= 0x030100
static TQMetaObjectCleanUp cleanUp_UniversalSlot("UniversalSlot", &UniversalSlot::staticMetaObject);
#else
static TQMetaObjectCleanUp cleanUp_UniversalSlot;

+ 1
- 1
sip/qt/qstring.sip View File

@@ -957,7 +957,7 @@ static TQString *PyUnicodeStringToTQString(PyObject *py)
const char *asc = sipCpp->ascii();

*sipPtrPtr = (void *)asc;
sipRes = qstrlen(asc);
sipRes = tqstrlen(asc);
}
}
%End

+ 4
- 4
sip/qt/qtmod.sip View File

@@ -28,12 +28,12 @@
%Include copying.sip


unsigned PYQT_VERSION;
const char *PYQT_VERSION_STR;
unsigned PYTQT_VERSION;
const char *PYTQT_VERSION_STR;

%ModuleCode
static unsigned PYQT_VERSION = 0x031201;
static const char *PYQT_VERSION_STR = "3.18.1";
static unsigned PYTQT_VERSION = 0x031201;
static const char *PYTQT_VERSION_STR = "3.18.1";
%End



+ 2
- 2
sip/qt/qwindowdefs.sip View File

@@ -58,10 +58,10 @@ const TQCOORD TQCOORD_MAX;
typedef unsigned TQRgb;

%If (- TQt_3_0_0)
char *qAppName();
char *tqAppName();
%End
%If (TQt_3_0_0 -)
const char *qAppName();
const char *tqAppName();
%End



+ 1
- 1
sip/qtcanvas/qcanvas.sip View File

@@ -229,7 +229,7 @@ public:
sipClass = sipClass_TQCanvasLine;
break;

#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
case 8:
sipClass = sipClass_TQCanvasSpline;
break;

+ 1
- 1
sip/qtnetwork/qsocket.sip View File

@@ -98,7 +98,7 @@ public:
{sipName_TQSocket, &sipClass_TQSocket, -1, 2},
{sipName_TQFtp, &sipClass_TQFtp, -1, 3},
{sipName_TQLocalFs, &sipClass_TQLocalFs, -1, 4},
#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
{sipName_TQHttp, &sipClass_TQHttp, -1, 5},
#else
{NULL, NULL, -1, 5},

+ 1
- 1
sip/qttable/qtable.sip View File

@@ -115,7 +115,7 @@ public:
%ConvertToSubClassCode
Py_BEGIN_ALLOW_THREADS

#if QT_VERSION >= 0x030000
#if TQT_VERSION >= 0x030000
int rtti = sipCpp -> rtti();

if (rtti == TQCheckTableItem::RTTI)

Loading…
Cancel
Save