Browse Source

QT_NO_* -> TQT_NO_* renaming.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 7 months ago
parent
commit
79113dda15
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 21 additions and 21 deletions
  1. 1
    1
      build.py
  2. 2
    2
      configure.py
  3. 3
    3
      examples3/canvas/canvas.py
  4. 10
    10
      pyuic3/embed.cpp
  5. 4
    4
      pyuic3/widgetdatabase.cpp
  6. 1
    1
      sip/qt/qobject.sip

+ 1
- 1
build.py View File

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

+ 2
- 2
configure.py View File

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

+ 3
- 3
examples3/canvas/canvas.py View File

@@ -518,7 +518,7 @@ class Main (TQMainWindow):
518 518
         rows = h / dist
519 519
         cols = w / dist
520 520
 
521
-        #ifndef QT_NO_PROGRESSDIALOG
521
+        #ifndef TQT_NO_PROGRESSDIALOG
522 522
         #progress=TQProgressDialog( "Creating mesh...", "Abort", rows,
523 523
         #         self, "progress", True );
524 524
         #endif
@@ -554,13 +554,13 @@ class Main (TQMainWindow):
554 554
                 el.show()
555 555
 
556 556
             lastRow[n-1]=prev
557
-            #ifndef QT_NO_PROGRESSDIALOG
557
+            #ifndef TQT_NO_PROGRESSDIALOG
558 558
             #progress.setProgress( j )
559 559
             #if  progress.wasCancelled() :
560 560
             #   break
561 561
             #endif
562 562
 
563
-        #ifndef QT_NO_PROGRESSDIALOG
563
+        #ifndef TQT_NO_PROGRESSDIALOG
564 564
         #progress.setProgress( rows )
565 565
         #endif
566 566
         #// tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );

+ 10
- 10
pyuic3/embed.cpp View File

@@ -32,8 +32,8 @@
32 32
 // on embedded, we do not compress image data. Rationale: by mapping
33 33
 // the ready-only data directly into memory we are both faster and
34 34
 // more memory efficient
35
-#if (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(QT_NO_IMAGE_COLLECTION_COMPRESSION)
36
-#define QT_NO_IMAGE_COLLECTION_COMPRESSION
35
+#if (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
36
+#define TQT_NO_IMAGE_COLLECTION_COMPRESSION
37 37
 #endif
38 38
 
39 39
 struct EmbedImage
@@ -45,7 +45,7 @@ struct EmbedImage
45 45
     TQString name;
46 46
     TQString cname;
47 47
     bool alpha;
48
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
48
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
49 49
     ulong compressed;
50 50
 #endif
51 51
 };
@@ -66,7 +66,7 @@ static TQString convertToCIdentifier( const char *s )
66 66
 
67 67
 static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
68 68
 {
69
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
69
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
70 70
     TQByteArray bazip( tqCompress( input, nbytes ) );
71 71
     uint len = bazip.size();
72 72
 #else
@@ -84,7 +84,7 @@ static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
84 84
 	    s.truncate( 0 );
85 85
 	}
86 86
         uint v = (uchar)
87
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
87
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
88 88
                  bazip
89 89
 #else
90 90
                  input
@@ -136,7 +136,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
136 136
     out << "\n";
137 137
     out << "\n";
138 138
     out << "from python_tqt.qt import TQImage, TQMimeSourceFactory";
139
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
139
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
140 140
     out << ", tqUncompress";
141 141
 #endif
142 142
     out << "\n";
@@ -171,7 +171,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
171 171
 	    img = img.convertBitOrder(TQImage::BigEndian);
172 172
 	out << s.sprintf( "%s_data =",
173 173
 			  (const char *)e->cname );
174
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
174
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
175 175
         e->compressed =
176 176
 #endif
177 177
 	    embedData( out, img.bits(), img.numBytes() );
@@ -194,7 +194,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
194 194
 		<< e->height << ","
195 195
 		<< e->depth << ","
196 196
 		<< e->cname << "_data,"
197
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
197
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
198 198
                 << e->compressed << ","
199 199
 #endif
200 200
 		<< e->numColors << ",";
@@ -218,7 +218,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
218 218
 	++indent;
219 219
 	out << indent << "global embed_image_vec\n";
220 220
 	out << "\n";
221
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
221
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
222 222
 	out << indent << "for (w,h,depth,data,comp,nrCol,colTab,alpha,iname) in embed_image_vec:" << endl;
223 223
 #else
224 224
 	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
226 226
 	++indent;
227 227
 	out << indent << "if iname == str(name):" << endl;
228 228
 	++indent;
229
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
229
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
230 230
 	// Keep the data object alive until we have a deep copy of the image.
231 231
 	out << indent << "data = tqUncompress(data).data()\n";
232 232
 #endif

+ 4
- 4
pyuic3/widgetdatabase.cpp View File

@@ -233,7 +233,7 @@ void WidgetDatabase::setupDataBase( int id )
233 233
 
234 234
     append( r );
235 235
 
236
-#if !defined(QT_NO_ICONVIEW) || defined(UIC)
236
+#if !defined(TQT_NO_ICONVIEW) || defined(UIC)
237 237
     r = new WidgetDatabaseRecord;
238 238
     r->iconSet = "designer_iconview.png";
239 239
     r->name = "TQIconView";
@@ -243,7 +243,7 @@ void WidgetDatabase::setupDataBase( int id )
243 243
     append( r );
244 244
 #endif
245 245
 
246
-#if !defined(QT_NO_TABLE)
246
+#if !defined(TQT_NO_TABLE)
247 247
     r = new WidgetDatabaseRecord;
248 248
     r->iconSet = "designer_table.png";
249 249
     r->name = "TQTable";
@@ -253,7 +253,7 @@ void WidgetDatabase::setupDataBase( int id )
253 253
     append( r );
254 254
 #endif
255 255
 
256
-#if !defined(QT_NO_SQL)
256
+#if !defined(TQT_NO_SQL)
257 257
     r = new WidgetDatabaseRecord;
258 258
     r->iconSet = "designer_datatable.png";
259 259
     r->includeFile = "qdatatable.h";
@@ -541,7 +541,7 @@ void WidgetDatabase::setupDataBase( int id )
541 541
 
542 542
     append( r );
543 543
 
544
-#ifndef QT_NO_SQL
544
+#ifndef TQT_NO_SQL
545 545
     r = new WidgetDatabaseRecord;
546 546
     r->iconSet = "";
547 547
     r->name = "TQDataBrowser";

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

@@ -1447,7 +1447,7 @@ TQMetaObject *UniversalSlot::staticMetaObject()
1447 1447
 			"UniversalSlot", TQObject::staticMetaObject(),
1448 1448
 			slot_tbl, 1,
1449 1449
 			0, 0,
1450
-#ifndef QT_NO_PROPERTIES
1450
+#ifndef TQT_NO_PROPERTIES
1451 1451
 			0, 0,
1452 1452
 			0, 0,
1453 1453
 #endif

Loading…
Cancel
Save