QT_NO_* -> TQT_NO_* renaming.

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 21 insertions, 21 deletions

diff --git a/build.py b/build.py
index 3a4402b..5440c2b 100644
--- a/build.py
+++ b/build.py
@@ -336,7 +336,7 @@ int main(int argc,char **argv)
     for feat in flist:
         f.write(
 """
-#if defined(QT_NO_%s)
+#if defined(TQT_NO_%s)
     fprintf(fp,"-x TQt_%s\\n");
 #endif
 """ % (feat, feat))
diff --git a/configure.py b/configure.py
index 39057b6..de047fb 100644
--- a/configure.py
+++ b/configure.py
@@ -716,7 +716,7 @@ int main(int argc,char **argv)
     fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
 #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");
 #endif
 
@@ -728,7 +728,7 @@ int main(int argc,char **argv)
     for feat in flist:
         f.write(
 """
-#if defined(QT_NO_%s)
+#if defined(TQT_NO_%s)
     fprintf(fp,"-x TQt_%s\\n");
 #endif
 """ % (feat, feat))
diff --git a/examples3/canvas/canvas.py b/examples3/canvas/canvas.py
index 2fa3bf9..5f7f774 100755
--- a/examples3/canvas/canvas.py
+++ b/examples3/canvas/canvas.py
@@ -518,7 +518,7 @@ class Main (TQMainWindow):
         rows = h / dist
         cols = w / dist
 
-        #ifndef QT_NO_PROGRESSDIALOG
+        #ifndef TQT_NO_PROGRESSDIALOG
         #progress=TQProgressDialog( "Creating mesh...", "Abort", rows,
         #         self, "progress", True );
         #endif
@@ -554,13 +554,13 @@ class Main (TQMainWindow):
                 el.show()
 
             lastRow[n-1]=prev
-            #ifndef QT_NO_PROGRESSDIALOG
+            #ifndef TQT_NO_PROGRESSDIALOG
             #progress.setProgress( j )
             #if  progress.wasCancelled() :
             #   break
             #endif
 
-        #ifndef QT_NO_PROGRESSDIALOG
+        #ifndef TQT_NO_PROGRESSDIALOG
         #progress.setProgress( rows )
         #endif
         #// tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
diff --git a/pyuic3/embed.cpp b/pyuic3/embed.cpp
index bba5f7f..00e59d0 100644
--- a/pyuic3/embed.cpp
+++ b/pyuic3/embed.cpp
@@ -32,8 +32,8 @@
 // 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 (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(QT_NO_IMAGE_COLLECTION_COMPRESSION)
-#define QT_NO_IMAGE_COLLECTION_COMPRESSION
+#if (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
+#define TQT_NO_IMAGE_COLLECTION_COMPRESSION
 #endif
 
 struct EmbedImage
@@ -45,7 +45,7 @@ struct EmbedImage
     TQString name;
     TQString cname;
     bool alpha;
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
     ulong compressed;
 #endif
 };
@@ -66,7 +66,7 @@ static TQString convertToCIdentifier( const char *s )
 
 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 ) );
     uint len = bazip.size();
 #else
@@ -84,7 +84,7 @@ static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
 	    s.truncate( 0 );
 	}
         uint v = (uchar)
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
                  bazip
 #else
                  input
@@ -136,7 +136,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
     out << "\n";
     out << "\n";
     out << "from python_tqt.qt import TQImage, TQMimeSourceFactory";
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
     out << ", tqUncompress";
 #endif
     out << "\n";
@@ -171,7 +171,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    img = img.convertBitOrder(TQImage::BigEndian);
 	out << s.sprintf( "%s_data =",
 			  (const char *)e->cname );
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
         e->compressed =
 #endif
 	    embedData( out, img.bits(), img.numBytes() );
@@ -194,7 +194,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 		<< e->height << ","
 		<< e->depth << ","
 		<< e->cname << "_data,"
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
                 << e->compressed << ","
 #endif
 		<< e->numColors << ",";
@@ -218,7 +218,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	++indent;
 	out << indent << "global embed_image_vec\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;
 #else
 	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;
 	out << indent << "if iname == str(name):" << endl;
 	++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.
 	out << indent << "data = tqUncompress(data).data()\n";
 #endif
diff --git a/pyuic3/widgetdatabase.cpp b/pyuic3/widgetdatabase.cpp
index 198a41b..78273a4 100644
--- a/pyuic3/widgetdatabase.cpp
+++ b/pyuic3/widgetdatabase.cpp
@@ -233,7 +233,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#if !defined(QT_NO_ICONVIEW) || defined(UIC)
+#if !defined(TQT_NO_ICONVIEW) || defined(UIC)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_iconview.png";
     r->name = "TQIconView";
@@ -243,7 +243,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_table.png";
     r->name = "TQTable";
@@ -253,7 +253,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_datatable.png";
     r->includeFile = "qdatatable.h";
@@ -541,7 +541,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDataBrowser";
diff --git a/sip/qt/qobject.sip b/sip/qt/qobject.sip
index f039534..2ce5778 100644
--- a/sip/qt/qobject.sip
+++ b/sip/qt/qobject.sip
@@ -1447,7 +1447,7 @@ TQMetaObject *UniversalSlot::staticMetaObject()
 			"UniversalSlot", TQObject::staticMetaObject(),
 			slot_tbl, 1,
 			0, 0,
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 			0, 0,
 			0, 0,
 #endif