TDE
/
pytqt
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QT_NO_* -> TQT_NO_* renaming.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 2638efc545
commit 79113dda15
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
build.py
Unescape View File

@ -336,7 +336,7 @@ int main(int argc,char **argv)
for feat in flist: for feat in flist:
f.write( f.write(
""" """
#if defined(QT_NO_%s) #if defined(TQT_NO_%s)
fprintf(fp,"-x TQt_%s\\n"); fprintf(fp,"-x TQt_%s\\n");
#endif #endif
""" % (feat, feat)) """ % (feat, feat))

4
configure.py
Unescape View File

@ -716,7 +716,7 @@ int main(int argc,char **argv)
fprintf(fp,"-x TQt_THREAD_SUPPORT\\n"); fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
#endif #endif
#if !defined(Q_WS_WIN) || TQT_VERSION < 0x030000 || defined(QT_NO_STYLE_WINDOWSXP) #if !defined(Q_WS_WIN) || TQT_VERSION < 0x030000 || defined(TQT_NO_STYLE_WINDOWSXP)
fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n"); fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
#endif #endif
@ -728,7 +728,7 @@ int main(int argc,char **argv)
for feat in flist: for feat in flist:
f.write( f.write(
""" """
#if defined(QT_NO_%s) #if defined(TQT_NO_%s)
fprintf(fp,"-x TQt_%s\\n"); fprintf(fp,"-x TQt_%s\\n");
#endif #endif
""" % (feat, feat)) """ % (feat, feat))

6
examples3/canvas/canvas.py
Unescape View File

@ -518,7 +518,7 @@ class Main (TQMainWindow):
rows = h / dist rows = h / dist
cols = w / dist cols = w / dist
#ifndef QT_NO_PROGRESSDIALOG #ifndef TQT_NO_PROGRESSDIALOG
#progress=TQProgressDialog( "Creating mesh...", "Abort", rows, #progress=TQProgressDialog( "Creating mesh...", "Abort", rows,
# self, "progress", True ); # self, "progress", True );
#endif #endif
@ -554,13 +554,13 @@ class Main (TQMainWindow):
el.show() el.show()
lastRow[n-1]=prev lastRow[n-1]=prev
#ifndef QT_NO_PROGRESSDIALOG #ifndef TQT_NO_PROGRESSDIALOG
#progress.setProgress( j ) #progress.setProgress( j )
#if progress.wasCancelled() : #if progress.wasCancelled() :
# break # break
#endif #endif
#ifndef QT_NO_PROGRESSDIALOG #ifndef TQT_NO_PROGRESSDIALOG
#progress.setProgress( rows ) #progress.setProgress( rows )
#endif #endif
#// tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); #// tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );

20
pyuic3/embed.cpp
Unescape View File

@ -32,8 +32,8 @@
// on embedded, we do not compress image data. Rationale: by mapping // on embedded, we do not compress image data. Rationale: by mapping
// the ready-only data directly into memory we are both faster and // the ready-only data directly into memory we are both faster and
// more memory efficient // more memory efficient
#if (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(QT_NO_IMAGE_COLLECTION_COMPRESSION) #if (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
#define QT_NO_IMAGE_COLLECTION_COMPRESSION #define TQT_NO_IMAGE_COLLECTION_COMPRESSION
#endif #endif
struct EmbedImage struct EmbedImage
@ -45,7 +45,7 @@ struct EmbedImage
TQString name; TQString name;
TQString cname; TQString cname;
bool alpha; bool alpha;
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
ulong compressed; ulong compressed;
#endif #endif
}; };
@ -66,7 +66,7 @@ static TQString convertToCIdentifier( const char *s )
static ulong embedData( TQTextStream& out, const uchar* input, int nbytes ) static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
{ {
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
TQByteArray bazip( tqCompress( input, nbytes ) ); TQByteArray bazip( tqCompress( input, nbytes ) );
uint len = bazip.size(); uint len = bazip.size();
#else #else
@ -84,7 +84,7 @@ static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
s.truncate( 0 ); s.truncate( 0 );
} }
uint v = (uchar) uint v = (uchar)
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
bazip bazip
#else #else
input input
@ -136,7 +136,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
out << "\n"; out << "\n";
out << "\n"; out << "\n";
out << "from python_tqt.qt import TQImage, TQMimeSourceFactory"; out << "from python_tqt.qt import TQImage, TQMimeSourceFactory";
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
out << ", tqUncompress"; out << ", tqUncompress";
#endif #endif
out << "\n"; out << "\n";
@ -171,7 +171,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
img = img.convertBitOrder(TQImage::BigEndian); img = img.convertBitOrder(TQImage::BigEndian);
out << s.sprintf( "%s_data =", out << s.sprintf( "%s_data =",
(const char *)e->cname ); (const char *)e->cname );
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
e->compressed = e->compressed =
#endif #endif
embedData( out, img.bits(), img.numBytes() ); embedData( out, img.bits(), img.numBytes() );
@ -194,7 +194,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
<< e->height << "," << e->height << ","
<< e->depth << "," << e->depth << ","
<< e->cname << "_data," << e->cname << "_data,"
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
<< e->compressed << "," << e->compressed << ","
#endif #endif
<< e->numColors << ","; << e->numColors << ",";
@ -218,7 +218,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
++indent; ++indent;
out << indent << "global embed_image_vec\n"; out << indent << "global embed_image_vec\n";
out << "\n"; out << "\n";
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
out << indent << "for (w,h,depth,data,comp,nrCol,colTab,alpha,iname) in embed_image_vec:" << endl; out << indent << "for (w,h,depth,data,comp,nrCol,colTab,alpha,iname) in embed_image_vec:" << endl;
#else #else
out << indent << "for (w,h,depth,data,nrCol,colTab,alpha,iname) in embed_image_vec:" << endl; out << indent << "for (w,h,depth,data,nrCol,colTab,alpha,iname) in embed_image_vec:" << endl;
@ -226,7 +226,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
++indent; ++indent;
out << indent << "if iname == str(name):" << endl; out << indent << "if iname == str(name):" << endl;
++indent; ++indent;
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
// Keep the data object alive until we have a deep copy of the image. // Keep the data object alive until we have a deep copy of the image.
out << indent << "data = tqUncompress(data).data()\n"; out << indent << "data = tqUncompress(data).data()\n";
#endif #endif

8
pyuic3/widgetdatabase.cpp
Unescape View File

@ -233,7 +233,7 @@ void WidgetDatabase::setupDataBase( int id )
append( r ); append( r );
#if !defined(QT_NO_ICONVIEW) || defined(UIC) #if !defined(TQT_NO_ICONVIEW) || defined(UIC)
r = new WidgetDatabaseRecord; r = new WidgetDatabaseRecord;
r->iconSet = "designer_iconview.png"; r->iconSet = "designer_iconview.png";
r->name = "TQIconView"; r->name = "TQIconView";
@ -243,7 +243,7 @@ void WidgetDatabase::setupDataBase( int id )
append( r ); append( r );
#endif #endif
#if !defined(QT_NO_TABLE) #if !defined(TQT_NO_TABLE)
r = new WidgetDatabaseRecord; r = new WidgetDatabaseRecord;
r->iconSet = "designer_table.png"; r->iconSet = "designer_table.png";
r->name = "TQTable"; r->name = "TQTable";
@ -253,7 +253,7 @@ void WidgetDatabase::setupDataBase( int id )
append( r ); append( r );
#endif #endif
#if !defined(QT_NO_SQL) #if !defined(TQT_NO_SQL)
r = new WidgetDatabaseRecord; r = new WidgetDatabaseRecord;
r->iconSet = "designer_datatable.png"; r->iconSet = "designer_datatable.png";
r->includeFile = "qdatatable.h"; r->includeFile = "qdatatable.h";
@ -541,7 +541,7 @@ void WidgetDatabase::setupDataBase( int id )
append( r ); append( r );
#ifndef QT_NO_SQL #ifndef TQT_NO_SQL
r = new WidgetDatabaseRecord; r = new WidgetDatabaseRecord;
r->iconSet = ""; r->iconSet = "";
r->name = "TQDataBrowser"; r->name = "TQDataBrowser";

2
sip/qt/qobject.sip
Unescape View File

@ -1447,7 +1447,7 @@ TQMetaObject *UniversalSlot::staticMetaObject()
"UniversalSlot", TQObject::staticMetaObject(), "UniversalSlot", TQObject::staticMetaObject(),
slot_tbl, 1, slot_tbl, 1,
0, 0, 0, 0,
#ifndef QT_NO_PROPERTIES #ifndef TQT_NO_PROPERTIES
0, 0, 0, 0,
0, 0, 0, 0,
#endif #endif

Write Preview
Loading…
Cancel
Save