Explorar el Código

QT_NO_* -> TQT_NO_* renaming.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro hace 7 meses
padre
commit
2e0398f755
Firmado por: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 3
- 3
dcop/dcopidlng/kalyptus Ver fichero

@@ -108,7 +108,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
108 108
     QM_EXPORT_NETWORK => '',
109 109
     QM_EXPORT_SQL => '',
110 110
     QM_EXPORT_WORKSPACE => '',
111
-    QT_NO_REMOTE => 'QT_NO_REMOTE',
111
+    TQT_NO_REMOTE => 'TQT_NO_REMOTE',
112 112
     QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
113 113
     Q_WS_X11 => 'Q_WS_X11',
114 114
     TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
@@ -225,7 +225,7 @@ else
225 225
     sub
226 226
     {
227 227
         my $s = shift;
228
-        $s =~ m/^\#\s*ifndef\s+QT_NO_(?:REMOTE| # not in the default compile options
228
+        $s =~ m/^\#\s*ifndef\s+TQT_NO_(?:REMOTE| # not in the default compile options
229 229
                                         NIS|    #  ...
230 230
                                         XINERAMA|
231 231
                                         IMAGEIO_(?:MNG|JPEG)|
@@ -473,7 +473,7 @@ LOOP:
473 473
 					 last if !defined $p;
474 474
 					 $if_depth++ if $p =~ m/^#\s*if/;
475 475
 					 $if_depth-- if $p =~ m/^#\s*endif/;
476
-					 # Exit at #else in the #ifdef QT_NO_ACCEL/#else/#endif case
476
+					 # Exit at #else in the #ifdef TQT_NO_ACCEL/#else/#endif case
477 477
 					 last if $if_depth == 1 && $p =~ m/^#\s*else\s/;
478 478
 					 #ignore elif for now
479 479
 					 print "Skipping ifdef'ed line: $p" if $debug;

+ 179
- 179
kate/data/qt4.xml Ver fichero

@@ -61,10 +61,10 @@
61 61
         http://qt-project.org/doc/qt-4.8/qurl.html#macros
62 62
       -->
63 63
     <item> Q_DECLARE_METATYPE </item>
64
-    <item> QT_NO_CAST_FROM_BYTEARRAY </item>
65
-    <item> QT_NO_CAST_FROM_ASCII </item>
66
-    <item> QT_NO_CAST_TO_ASCII </item>
67
-    <item> QT_NO_URL_CAST_FROM_STRING </item>
64
+    <item> TQT_NO_CAST_FROM_BYTEARRAY </item>
65
+    <item> TQT_NO_CAST_FROM_ASCII </item>
66
+    <item> TQT_NO_CAST_TO_ASCII </item>
67
+    <item> TQT_NO_URL_CAST_FROM_STRING </item>
68 68
     <item> QT_USE_QSTRINGBUILDER </item>
69 69
     <!-- QtTest macros: http://qt-project.org/doc/qt-4.8/qtest.html#macros -->
70 70
     <item> QBENCHMARK </item>
@@ -189,181 +189,181 @@
189 189
     <item> QT_MODULE_TEST </item>
190 190
     <item> QT_MODULE_XML </item>
191 191
     <item> QT_MODULE_XMLPATTERNS </item>
192
-    <item> QT_NO_ACCESSIBILITY </item>
193
-    <item> QT_NO_ANIMATION </item>
194
-    <item> QT_NO_ARM_EABI </item>
195
-    <item> QT_NO_BEARERMANAGEMENT </item>
196
-    <item> QT_NO_BUTTONGROUP </item>
197
-    <item> QT_NO_CALENDARWIDGET </item>
198
-    <item> QT_NO_CLIPBOARD </item>
199
-    <item> QT_NO_CODECS </item>
200
-    <item> QT_NO_COLORDIALOG </item>
201
-    <item> QT_NO_COLUMNVIEW </item>
202
-    <item> QT_NO_COMBOBOX </item>
203
-    <item> QT_NO_COMPLETER </item>
204
-    <item> QT_NO_CONCURRENT </item>
205
-    <item> QT_NO_CONCURRENT_FILTER </item>
206
-    <item> QT_NO_CONCURRENT_MAP </item>
207
-    <item> QT_NO_CONTEXTMENU </item>
208
-    <item> QT_NO_COP </item>
209
-    <item> QT_NO_CRASHHANDLER </item>
210
-    <item> QT_NO_CUPS </item>
211
-    <item> QT_NO_DATAWIDGETMAPPER </item>
212
-    <item> QT_NO_DATESTRING </item>
213
-    <item> QT_NO_DATETIMEEDIT </item>
214
-    <item> QT_NO_DBUS </item>
215
-    <item> QT_NO_DEBUG </item>
216
-    <item> QT_NO_DEBUG_STREAM </item>
217
-    <item> QT_NO_DECLARATIVE </item>
218
-    <item> QT_NO_DIAL </item>
219
-    <item> QT_NO_DIRMODEL </item>
220
-    <item> QT_NO_DOCKWIDGET </item>
221
-    <item> QT_NO_DRAGANDDROP </item>
222
-    <item> QT_NO_EGL </item>
223
-    <item> QT_NO_ERRORMESSAGE </item>
224
-    <item> QT_NO_EXCEPTIONS </item>
225
-    <item> QT_NO_FILEDIALOG </item>
226
-    <item> QT_NO_FILESYSTEMMODEL </item>
227
-    <item> QT_NO_FONTCOMBOBOX </item>
228
-    <item> QT_NO_FONTCONFIG </item>
229
-    <item> QT_NO_FONTDIALOG </item>
230
-    <item> QT_NO_FPU </item>
231
-    <item> QT_NO_FSCOMPLETER </item>
232
-    <item> QT_NO_FTP </item>
233
-    <item> QT_NO_GETIFADDRS </item>
234
-    <item> QT_NO_GRAPHICSEFFECT </item>
235
-    <item> QT_NO_GRAPHICSSVGITEM </item>
236
-    <item> QT_NO_GRAPHICSVIEW </item>
237
-    <item> QT_NO_GSTREAMER </item>
238
-    <item> QT_NO_HOSTINFO </item>
239
-    <item> QT_NO_HTTP </item>
240
-    <item> QT_NO_ICD </item>
241
-    <item> QT_NO_IM </item>
242
-    <item> QT_NO_IMAGEFORMAT_JPEG </item>
243
-    <item> QT_NO_IMAGEFORMAT_MNG </item>
244
-    <item> QT_NO_IMAGEFORMAT_PNG </item>
245
-    <item> QT_NO_IMAGEFORMAT_TIFF </item>
246
-    <item> QT_NO_IMAGEFORMAT_XPM </item>
247
-    <item> QT_NO_INPUTDIALOG </item>
248
-    <item> QT_NO_ITEMVIEWS </item>
249
-    <item> QT_NO_LIBRARY </item>
250
-    <item> QT_NO_LISTVIEW </item>
251
-    <item> QT_NO_LISTWIDGET </item>
252
-    <item> QT_NO_LPR </item>
253
-    <item> QT_NO_MAINWINDOW </item>
254
-    <item> QT_NO_MDIAREA </item>
255
-    <item> QT_NO_MENU </item>
256
-    <item> QT_NO_MENUBAR </item>
257
-    <item> QT_NO_MITSHM </item>
258
-    <item> QT_NO_MULTIMEDIA </item>
259
-    <item> QT_NO_NAS </item>
260
-    <item> QT_NO_NETWORKDISKCACHE </item>
261
-    <item> QT_NO_OPENGL </item>
262
-    <item> QT_NO_OPENVG </item>
263
-    <item> QT_NO_PAINT_DEBUG </item>
264
-    <item> QT_NO_PHONON </item>
265
-    <item> QT_NO_PHONON_EFFECTWIDGET </item>
266
-    <item> QT_NO_PHONON_PLATFORMPLUGIN </item>
267
-    <item> QT_NO_PHONON_SEEKSLIDER </item>
268
-    <item> QT_NO_PHONON_SETTINGSGROUP </item>
269
-    <item> QT_NO_PHONON_VIDEOPLAYER </item>
270
-    <item> QT_NO_PHONON_VOLUMEFADEREFFECT </item>
271
-    <item> QT_NO_PHONON_VOLUMESLIDER </item>
272
-    <item> QT_NO_PRINTDIALOG </item>
273
-    <item> QT_NO_PRINTER </item>
274
-    <item> QT_NO_PRINTPREVIEWDIALOG </item>
275
-    <item> QT_NO_PRINTPREVIEWWIDGET </item>
276
-    <item> QT_NO_PROCESS </item>
277
-    <item> QT_NO_PROGRESSDIALOG </item>
278
-    <item> QT_NO_PROXYMODEL </item>
279
-    <item> QT_NO_PULSEAUDIO </item>
280
-    <item> QT_NO_QDEBUG_MACRO </item>
281
-    <item> QT_NO_QFUTURE </item>
282
-    <item> QT_NO_QWARNING_MACRO </item>
283
-    <item> QT_NO_QWS_CURSOR </item>
284
-    <item> QT_NO_QWS_DECORATION_STYLED </item>
285
-    <item> QT_NO_QWS_DECORATION_WINDOWS </item>
286
-    <item> QT_NO_QWS_DYNAMICSCREENTRANSFORMATION </item>
287
-    <item> QT_NO_QWS_INPUTMETHODS </item>
288
-    <item> QT_NO_QWS_MANAGER </item>
289
-    <item> QT_NO_QWS_MULTIPROCESS </item>
290
-    <item> QT_NO_QWS_SOUNDSERVER </item>
291
-    <item> QT_NO_QWS_TRANSFORMED </item>
292
-    <item> QT_NO_QWS_VNC </item>
293
-    <item> QT_NO_RAWFONT </item>
294
-    <item> QT_NO_S60 </item>
295
-    <item> QT_NO_SCRIPT </item>
296
-    <item> QT_NO_SCRIPTTOOLS </item>
297
-    <item> QT_NO_SCROLLAREA </item>
298
-    <item> QT_NO_SCROLLBAR </item>
299
-    <item> QT_NO_SESSIONMANAGER </item>
300
-    <item> QT_NO_SHAPE </item>
301
-    <item> QT_NO_SHAREDMEMORY </item>
302
-    <item> QT_NO_SOCKS5 </item>
303
-    <item> QT_NO_SOFTKEYMANAGER </item>
304
-    <item> QT_NO_SORTFILTERPROXYMODEL </item>
305
-    <item> QT_NO_SPINBOX </item>
306
-    <item> QT_NO_SPLITTER </item>
307
-    <item> QT_NO_STANDARDITEMMODEL </item>
308
-    <item> QT_NO_STATEMACHINE </item>
309
-    <item> QT_NO_STL_WCHAR </item>
310
-    <item> QT_NO_STRINGLISTMODEL </item>
311
-    <item> QT_NO_STYLE_CDE </item>
312
-    <item> QT_NO_STYLE_CLEANLOOKS </item>
313
-    <item> QT_NO_STYLE_GTK </item>
314
-    <item> QT_NO_STYLE_PLASTIQUE </item>
315
-    <item> QT_NO_STYLE_S60 </item>
316
-    <item> QT_NO_STYLE_STYLESHEET </item>
317
-    <item> QT_NO_STYLE_WINDOWSCE </item>
318
-    <item> QT_NO_STYLE_WINDOWSMOBILE </item>
319
-    <item> QT_NO_STYLE_WINDOWSVISTA </item>
320
-    <item> QT_NO_STYLE_WINDOWSXP </item>
321
-    <item> QT_NO_SVG </item>
322
-    <item> QT_NO_SVGGENERATOR </item>
323
-    <item> QT_NO_SVGRENDERER </item>
324
-    <item> QT_NO_SVGWIDGET </item>
325
-    <item> QT_NO_SXE </item>
326
-    <item> QT_NO_SYNTAXHIGHLIGHTER </item>
327
-    <item> QT_NO_SYSTEMSEMAPHORE </item>
328
-    <item> QT_NO_TABBAR </item>
329
-    <item> QT_NO_TABDIALOG </item>
330
-    <item> QT_NO_TABLET </item>
331
-    <item> QT_NO_TABLEVIEW </item>
332
-    <item> QT_NO_TABLEWIDGET </item>
333
-    <item> QT_NO_TABWIDGET </item>
334
-    <item> QT_NO_TEMPLATE_TEMPLATE_PARAMETERS </item>
335
-    <item> QT_NO_TEXTBROWSER </item>
336
-    <item> QT_NO_TEXTCODECPLUGIN </item>
337
-    <item> QT_NO_TEXTEDIT </item>
338
-    <item> QT_NO_TEXTODFWRITER </item>
339
-    <item> QT_NO_TOOLBAR </item>
340
-    <item> QT_NO_TOOLBOX </item>
341
-    <item> QT_NO_TOOLBUTTON </item>
342
-    <item> QT_NO_TRANSLATION_UTF8 </item>
343
-    <item> QT_NO_TREEVIEW </item>
344
-    <item> QT_NO_TREEWIDGET </item>
345
-    <item> QT_NO_UNDOGROUP </item>
346
-    <item> QT_NO_UNDOSTACK </item>
347
-    <item> QT_NO_UNDOVIEW </item>
348
-    <item> QT_NO_WARNINGS </item>
349
-    <item> QT_NO_WEBKIT </item>
350
-    <item> QT_NO_WHATSTHIS </item>
351
-    <item> QT_NO_WIN_ACTIVEQT </item>
352
-    <item> QT_NO_WIZARD </item>
353
-    <item> QT_NO_WORKSPACE </item>
354
-    <item> QT_NO_XCURSOR </item>
355
-    <item> QT_NO_XFIXES </item>
356
-    <item> QT_NO_XINERAMA </item>
357
-    <item> QT_NO_XINPUT </item>
358
-    <item> QT_NO_XKB </item>
359
-    <item> QT_NO_XMLPATTERNS </item>
360
-    <item> QT_NO_XMLSTREAMREADER </item>
361
-    <item> QT_NO_XMLSTREAMWRITER </item>
362
-    <item> QT_NO_XRANDR </item>
363
-    <item> QT_NO_XRENDER </item>
364
-    <item> QT_NO_XSYNC </item>
365
-    <item> QT_NO_XVIDEO </item>
366
-    <item> QT_NO_ZLIB </item>
192
+    <item> TQT_NO_ACCESSIBILITY </item>
193
+    <item> TQT_NO_ANIMATION </item>
194
+    <item> TQT_NO_ARM_EABI </item>
195
+    <item> TQT_NO_BEARERMANAGEMENT </item>
196
+    <item> TQT_NO_BUTTONGROUP </item>
197
+    <item> TQT_NO_CALENDARWIDGET </item>
198
+    <item> TQT_NO_CLIPBOARD </item>
199
+    <item> TQT_NO_CODECS </item>
200
+    <item> TQT_NO_COLORDIALOG </item>
201
+    <item> TQT_NO_COLUMNVIEW </item>
202
+    <item> TQT_NO_COMBOBOX </item>
203
+    <item> TQT_NO_COMPLETER </item>
204
+    <item> TQT_NO_CONCURRENT </item>
205
+    <item> TQT_NO_CONCURRENT_FILTER </item>
206
+    <item> TQT_NO_CONCURRENT_MAP </item>
207
+    <item> TQT_NO_CONTEXTMENU </item>
208
+    <item> TQT_NO_COP </item>
209
+    <item> TQT_NO_CRASHHANDLER </item>
210
+    <item> TQT_NO_CUPS </item>
211
+    <item> TQT_NO_DATAWIDGETMAPPER </item>
212
+    <item> TQT_NO_DATESTRING </item>
213
+    <item> TQT_NO_DATETIMEEDIT </item>
214
+    <item> TQT_NO_DBUS </item>
215
+    <item> TQT_NO_DEBUG </item>
216
+    <item> TQT_NO_DEBUG_STREAM </item>
217
+    <item> TQT_NO_DECLARATIVE </item>
218
+    <item> TQT_NO_DIAL </item>
219
+    <item> TQT_NO_DIRMODEL </item>
220
+    <item> TQT_NO_DOCKWIDGET </item>
221
+    <item> TQT_NO_DRAGANDDROP </item>
222
+    <item> TQT_NO_EGL </item>
223
+    <item> TQT_NO_ERRORMESSAGE </item>
224
+    <item> TQT_NO_EXCEPTIONS </item>
225
+    <item> TQT_NO_FILEDIALOG </item>
226
+    <item> TQT_NO_FILESYSTEMMODEL </item>
227
+    <item> TQT_NO_FONTCOMBOBOX </item>
228
+    <item> TQT_NO_FONTCONFIG </item>
229
+    <item> TQT_NO_FONTDIALOG </item>
230
+    <item> TQT_NO_FPU </item>
231
+    <item> TQT_NO_FSCOMPLETER </item>
232
+    <item> TQT_NO_FTP </item>
233
+    <item> TQT_NO_GETIFADDRS </item>
234
+    <item> TQT_NO_GRAPHICSEFFECT </item>
235
+    <item> TQT_NO_GRAPHICSSVGITEM </item>
236
+    <item> TQT_NO_GRAPHICSVIEW </item>
237
+    <item> TQT_NO_GSTREAMER </item>
238
+    <item> TQT_NO_HOSTINFO </item>
239
+    <item> TQT_NO_HTTP </item>
240
+    <item> TQT_NO_ICD </item>
241
+    <item> TQT_NO_IM </item>
242
+    <item> TQT_NO_IMAGEFORMAT_JPEG </item>
243
+    <item> TQT_NO_IMAGEFORMAT_MNG </item>
244
+    <item> TQT_NO_IMAGEFORMAT_PNG </item>
245
+    <item> TQT_NO_IMAGEFORMAT_TIFF </item>
246
+    <item> TQT_NO_IMAGEFORMAT_XPM </item>
247
+    <item> TQT_NO_INPUTDIALOG </item>
248
+    <item> TQT_NO_ITEMVIEWS </item>
249
+    <item> TQT_NO_LIBRARY </item>
250
+    <item> TQT_NO_LISTVIEW </item>
251
+    <item> TQT_NO_LISTWIDGET </item>
252
+    <item> TQT_NO_LPR </item>
253
+    <item> TQT_NO_MAINWINDOW </item>
254
+    <item> TQT_NO_MDIAREA </item>
255
+    <item> TQT_NO_MENU </item>
256
+    <item> TQT_NO_MENUBAR </item>
257
+    <item> TQT_NO_MITSHM </item>
258
+    <item> TQT_NO_MULTIMEDIA </item>
259
+    <item> TQT_NO_NAS </item>
260
+    <item> TQT_NO_NETWORKDISKCACHE </item>
261
+    <item> TQT_NO_OPENGL </item>
262
+    <item> TQT_NO_OPENVG </item>
263
+    <item> TQT_NO_PAINT_DEBUG </item>
264
+    <item> TQT_NO_PHONON </item>
265
+    <item> TQT_NO_PHONON_EFFECTWIDGET </item>
266
+    <item> TQT_NO_PHONON_PLATFORMPLUGIN </item>
267
+    <item> TQT_NO_PHONON_SEEKSLIDER </item>
268
+    <item> TQT_NO_PHONON_SETTINGSGROUP </item>
269
+    <item> TQT_NO_PHONON_VIDEOPLAYER </item>
270
+    <item> TQT_NO_PHONON_VOLUMEFADEREFFECT </item>
271
+    <item> TQT_NO_PHONON_VOLUMESLIDER </item>
272
+    <item> TQT_NO_PRINTDIALOG </item>
273
+    <item> TQT_NO_PRINTER </item>
274
+    <item> TQT_NO_PRINTPREVIEWDIALOG </item>
275
+    <item> TQT_NO_PRINTPREVIEWWIDGET </item>
276
+    <item> TQT_NO_PROCESS </item>
277
+    <item> TQT_NO_PROGRESSDIALOG </item>
278
+    <item> TQT_NO_PROXYMODEL </item>
279
+    <item> TQT_NO_PULSEAUDIO </item>
280
+    <item> TQT_NO_QDEBUG_MACRO </item>
281
+    <item> TQT_NO_QFUTURE </item>
282
+    <item> TQT_NO_QWARNING_MACRO </item>
283
+    <item> TQT_NO_QWS_CURSOR </item>
284
+    <item> TQT_NO_QWS_DECORATION_STYLED </item>
285
+    <item> TQT_NO_QWS_DECORATION_WINDOWS </item>
286
+    <item> TQT_NO_QWS_DYNAMICSCREENTRANSFORMATION </item>
287
+    <item> TQT_NO_QWS_INPUTMETHODS </item>
288
+    <item> TQT_NO_QWS_MANAGER </item>
289
+    <item> TQT_NO_QWS_MULTIPROCESS </item>
290
+    <item> TQT_NO_QWS_SOUNDSERVER </item>
291
+    <item> TQT_NO_QWS_TRANSFORMED </item>
292
+    <item> TQT_NO_QWS_VNC </item>
293
+    <item> TQT_NO_RAWFONT </item>
294
+    <item> TQT_NO_S60 </item>
295
+    <item> TQT_NO_SCRIPT </item>
296
+    <item> TQT_NO_SCRIPTTOOLS </item>
297
+    <item> TQT_NO_SCROLLAREA </item>
298
+    <item> TQT_NO_SCROLLBAR </item>
299
+    <item> TQT_NO_SESSIONMANAGER </item>
300
+    <item> TQT_NO_SHAPE </item>
301
+    <item> TQT_NO_SHAREDMEMORY </item>
302
+    <item> TQT_NO_SOCKS5 </item>
303
+    <item> TQT_NO_SOFTKEYMANAGER </item>
304
+    <item> TQT_NO_SORTFILTERPROXYMODEL </item>
305
+    <item> TQT_NO_SPINBOX </item>
306
+    <item> TQT_NO_SPLITTER </item>
307
+    <item> TQT_NO_STANDARDITEMMODEL </item>
308
+    <item> TQT_NO_STATEMACHINE </item>
309
+    <item> TQT_NO_STL_WCHAR </item>
310
+    <item> TQT_NO_STRINGLISTMODEL </item>
311
+    <item> TQT_NO_STYLE_CDE </item>
312
+    <item> TQT_NO_STYLE_CLEANLOOKS </item>
313
+    <item> TQT_NO_STYLE_GTK </item>
314
+    <item> TQT_NO_STYLE_PLASTIQUE </item>
315
+    <item> TQT_NO_STYLE_S60 </item>
316
+    <item> TQT_NO_STYLE_STYLESHEET </item>
317
+    <item> TQT_NO_STYLE_WINDOWSCE </item>
318
+    <item> TQT_NO_STYLE_WINDOWSMOBILE </item>
319
+    <item> TQT_NO_STYLE_WINDOWSVISTA </item>
320
+    <item> TQT_NO_STYLE_WINDOWSXP </item>
321
+    <item> TQT_NO_SVG </item>
322
+    <item> TQT_NO_SVGGENERATOR </item>
323
+    <item> TQT_NO_SVGRENDERER </item>
324
+    <item> TQT_NO_SVGWIDGET </item>
325
+    <item> TQT_NO_SXE </item>
326
+    <item> TQT_NO_SYNTAXHIGHLIGHTER </item>
327
+    <item> TQT_NO_SYSTEMSEMAPHORE </item>
328
+    <item> TQT_NO_TABBAR </item>
329
+    <item> TQT_NO_TABDIALOG </item>
330
+    <item> TQT_NO_TABLET </item>
331
+    <item> TQT_NO_TABLEVIEW </item>
332
+    <item> TQT_NO_TABLEWIDGET </item>
333
+    <item> TQT_NO_TABWIDGET </item>
334
+    <item> TQT_NO_TEMPLATE_TEMPLATE_PARAMETERS </item>
335
+    <item> TQT_NO_TEXTBROWSER </item>
336
+    <item> TQT_NO_TEXTCODECPLUGIN </item>
337
+    <item> TQT_NO_TEXTEDIT </item>
338
+    <item> TQT_NO_TEXTODFWRITER </item>
339
+    <item> TQT_NO_TOOLBAR </item>
340
+    <item> TQT_NO_TOOLBOX </item>
341
+    <item> TQT_NO_TOOLBUTTON </item>
342
+    <item> TQT_NO_TRANSLATION_UTF8 </item>
343
+    <item> TQT_NO_TREEVIEW </item>
344
+    <item> TQT_NO_TREEWIDGET </item>
345
+    <item> TQT_NO_UNDOGROUP </item>
346
+    <item> TQT_NO_UNDOSTACK </item>
347
+    <item> TQT_NO_UNDOVIEW </item>
348
+    <item> TQT_NO_WARNINGS </item>
349
+    <item> TQT_NO_WEBKIT </item>
350
+    <item> TQT_NO_WHATSTHIS </item>
351
+    <item> TQT_NO_WIN_ACTIVEQT </item>
352
+    <item> TQT_NO_WIZARD </item>
353
+    <item> TQT_NO_WORKSPACE </item>
354
+    <item> TQT_NO_XCURSOR </item>
355
+    <item> TQT_NO_XFIXES </item>
356
+    <item> TQT_NO_XINERAMA </item>
357
+    <item> TQT_NO_XINPUT </item>
358
+    <item> TQT_NO_XKB </item>
359
+    <item> TQT_NO_XMLPATTERNS </item>
360
+    <item> TQT_NO_XMLSTREAMREADER </item>
361
+    <item> TQT_NO_XMLSTREAMWRITER </item>
362
+    <item> TQT_NO_XRANDR </item>
363
+    <item> TQT_NO_XRENDER </item>
364
+    <item> TQT_NO_XSYNC </item>
365
+    <item> TQT_NO_XVIDEO </item>
366
+    <item> TQT_NO_ZLIB </item>
367 367
     <item> QT_PACKAGEDATE_STR </item>
368 368
     <item> QT_PACKAGE_TAG </item>
369 369
     <item> QT_POINTER_SIZE </item>

+ 2
- 2
tdecore/kurl.cpp Ver fichero

@@ -533,7 +533,7 @@ TQDataStream & operator>> (TQDataStream & s, KURL & a)
533 533
     return s;
534 534
 }
535 535
 
536
-#ifndef QT_NO_NETWORKPROTOCOL
536
+#ifndef TQT_NO_NETWORKPROTOCOL
537 537
 KURL::KURL( const TQUrl &u )
538 538
 {
539 539
   d = new KURLPrivate();
@@ -1065,7 +1065,7 @@ KURL& KURL::operator=( const char * _url )
1065 1065
   return *this;
1066 1066
 }
1067 1067
 
1068
-#ifndef QT_NO_NETWORKPROTOCOL
1068
+#ifndef TQT_NO_NETWORKPROTOCOL
1069 1069
 KURL& KURL::operator=( const TQUrl & u )
1070 1070
 {
1071 1071
   m_strProtocol = u.protocol();

+ 2
- 2
tdecore/tdeapplication.cpp Ver fichero

@@ -64,7 +64,7 @@
64 64
 #include <tqstylefactory.h>
65 65
 #include <tqmetaobject.h>
66 66
 #include <tqimage.h>
67
-#ifndef QT_NO_SQL
67
+#ifndef TQT_NO_SQL
68 68
 #include <tqsqlpropertymap.h>
69 69
 #endif
70 70
 
@@ -2610,7 +2610,7 @@ void TDEApplication::propagateSettings(SettingsCategory arg)
2610 2610
 
2611 2611
 void TDEApplication::installKDEPropertyMap()
2612 2612
 {
2613
-#ifndef QT_NO_SQL
2613
+#ifndef TQT_NO_SQL
2614 2614
     static bool installed = false;
2615 2615
     if (installed) return;
2616 2616
     installed = true;

+ 1
- 1
tdecore/tdeconfig_compiler/tests/CMakeLists.txt Ver fichero

@@ -25,7 +25,7 @@ link_directories(
25 25
 )
26 26
 
27 27
 add_definitions(
28
-    -DQT_NO_CAST_ASCII
28
+    -DTQT_NO_CAST_ASCII
29 29
     -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}"
30 30
 )
31 31
 

+ 1
- 1
tdecore/tdeconfig_compiler/tests/Makefile.am Ver fichero

@@ -1,4 +1,4 @@
1
-AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
1
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DTQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
2 2
 
3 3
 check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
4 4
 

+ 1
- 1
tdecore/tdemultipledrag.cpp Ver fichero

@@ -20,7 +20,7 @@
20 20
 #include "tdemultipledrag.h"
21 21
 #include "kdebug.h"
22 22
 
23
-#ifndef QT_NO_DRAGANDDROP
23
+#ifndef TQT_NO_DRAGANDDROP
24 24
 
25 25
 KMultipleDrag::KMultipleDrag( TQWidget *dragSource, const char *name )
26 26
     : TQDragObject( dragSource, name )

+ 2
- 2
tdecore/tdemultipledrag.h Ver fichero

@@ -20,7 +20,7 @@
20 20
 #ifndef TDEMULTIPLEDRAG_H
21 21
 #define TDEMULTIPLEDRAG_H
22 22
 
23
-#ifndef QT_NO_DRAGANDDROP
23
+#ifndef TQT_NO_DRAGANDDROP
24 24
 
25 25
 #include <tqdragobject.h>
26 26
 #include <tqvaluelist.h>
@@ -100,6 +100,6 @@ private:
100 100
     KMultipleDragPrivate* d;
101 101
 };
102 102
 
103
-#endif // QT_NO_DRAGANDDROP
103
+#endif // TQT_NO_DRAGANDDROP
104 104
 
105 105
 #endif // TDEMULTIPLEDRAG_H

+ 2
- 2
tdehtml/rendering/bidi.cpp Ver fichero

@@ -939,7 +939,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
939 939
             dirCurrent = bidi.current.direction();
940 940
         }
941 941
 
942
-#ifndef QT_NO_UNICODETABLES
942
+#ifndef TQT_NO_UNICODETABLES
943 943
 
944 944
 #if BIDI_DEBUG > 1
945 945
         kdDebug(6041) << "directions: dir=" << (int)dir << " current=" << (int)dirCurrent << " last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong << " embedding=" << (int)context->dir << " level =" << (int)context->level << endl;
@@ -1620,7 +1620,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
1620 1620
     // remove leading spaces.  Any inline flows we encounter will be empty and should also
1621 1621
     // be skipped.
1622 1622
     while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() &&
1623
-#ifndef QT_NO_UNICODETABLES
1623
+#ifndef TQT_NO_UNICODETABLES
1624 1624
         ( (start.current().unicode() == (ushort)0x0020) || // ASCII space
1625 1625
           (start.current().unicode() == (ushort)0x0009) || // ASCII tab
1626 1626
           (start.current().unicode() == (ushort)0x000A) || // ASCII line feed

+ 7
- 7
tdehtml/tdehtml_ext.cpp Ver fichero

@@ -225,7 +225,7 @@ void TDEHTMLPartBrowserExtension::copy()
225 225
 
226 226
         TQClipboard *cb = TQApplication::clipboard();
227 227
         disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
228
-#ifndef QT_NO_MIMECLIPBOARD
228
+#ifndef TQT_NO_MIMECLIPBOARD
229 229
 	TQString htmltext;
230 230
 	/*
231 231
 	 * When selectionModeEnabled, that means the user has just selected
@@ -334,7 +334,7 @@ void TDEHTMLPartBrowserExtension::updateEditActions()
334 334
     }
335 335
 
336 336
     // ### duplicated from KonqMainWindow::slotClipboardDataChanged
337
-#ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
337
+#ifndef TQT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
338 338
     TQMimeSource *data = TQApplication::clipboard()->data();
339 339
     enableAction( "paste", data->provides( "text/plain" ) );
340 340
 #else
@@ -604,12 +604,12 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
604 604
                  actionCollection(), "sendimage" );
605 605
 
606 606
 
607
-#ifndef QT_NO_MIMECLIPBOARD
607
+#ifndef TQT_NO_MIMECLIPBOARD
608 608
     (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
609 609
                  actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull());
610 610
 #endif
611 611
 
612
-    if(d->m_pixmap.isNull()) {    //fallback to image location if still loading the image.  this will always be true if ifdef QT_NO_MIMECLIPBOARD
612
+    if(d->m_pixmap.isNull()) {    //fallback to image location if still loading the image.  this will always be true if ifdef TQT_NO_MIMECLIPBOARD
613 613
       new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
614 614
                    actionCollection(), "copyimagelocation" );
615 615
     }
@@ -711,7 +711,7 @@ void TDEHTMLPopupGUIClient::slotCopyLinkLocation()
711 711
 {
712 712
   KURL safeURL(d->m_url);
713 713
   safeURL.setPass(TQString::null);
714
-#ifndef QT_NO_MIMECLIPBOARD
714
+#ifndef TQT_NO_MIMECLIPBOARD
715 715
   // Set it in both the mouse selection and in the clipboard
716 716
   KURL::List lst;
717 717
   lst.append( safeURL );
@@ -729,7 +729,7 @@ void TDEHTMLPopupGUIClient::slotStopAnimations()
729 729
 
730 730
 void TDEHTMLPopupGUIClient::slotCopyImage()
731 731
 {
732
-#ifndef QT_NO_MIMECLIPBOARD
732
+#ifndef TQT_NO_MIMECLIPBOARD
733 733
   KURL safeURL(d->m_imageURL);
734 734
   safeURL.setPass(TQString::null);
735 735
 
@@ -752,7 +752,7 @@ void TDEHTMLPopupGUIClient::slotCopyImageLocation()
752 752
 {
753 753
   KURL safeURL(d->m_imageURL);
754 754
   safeURL.setPass(TQString::null);
755
-#ifndef QT_NO_MIMECLIPBOARD
755
+#ifndef TQT_NO_MIMECLIPBOARD
756 756
   // Set it in both the mouse selection and in the clipboard
757 757
   KURL::List lst;
758 758
   lst.append( safeURL );

+ 7
- 7
tdehtml/tdehtml_part.cpp Ver fichero

@@ -93,7 +93,7 @@ using namespace DOM;
93 93
 #include <kurldrag.h>
94 94
 #include <tdeapplication.h>
95 95
 #include <tdeparts/browserinterface.h>
96
-#if !defined(QT_NO_DRAGANDDROP)
96
+#if !defined(TQT_NO_DRAGANDDROP)
97 97
 #include <tdemultipledrag.h>
98 98
 #endif
99 99
 #include "../tdeutils/kfinddialog.h"
@@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear()
1483 1483
   d->m_selectionEnd = DOM::Node();
1484 1484
   d->m_startOffset = 0;
1485 1485
   d->m_endOffset = 0;
1486
-#ifndef QT_NO_CLIPBOARD
1486
+#ifndef TQT_NO_CLIPBOARD
1487 1487
   connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
1488 1488
 #endif
1489 1489
 
@@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText()
3008 3008
   }
3009 3009
 
3010 3010
   // The lineedit of the dialog would make tdehtml lose its selection, otherwise
3011
-#ifndef QT_NO_CLIPBOARD
3011
+#ifndef TQT_NO_CLIPBOARD
3012 3012
   disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
3013 3013
 #endif
3014 3014
 
@@ -3039,7 +3039,7 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent,
3039 3039
   if ( !d->m_doc )
3040 3040
     return;
3041 3041
 
3042
-#ifndef QT_NO_CLIPBOARD
3042
+#ifndef TQT_NO_CLIPBOARD
3043 3043
   connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
3044 3044
 #endif
3045 3045
 
@@ -6392,7 +6392,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event )
6392 6392
   DOM::DOMString target = event->target();
6393 6393
   DOM::Node innerNode = event->innerNode();
6394 6394
 
6395
-#ifndef QT_NO_DRAGANDDROP
6395
+#ifndef TQT_NO_DRAGANDDROP
6396 6396
   if( d->m_bDnd && d->m_bMousePressed &&
6397 6397
       ( (!d->m_strSelectedURL.isEmpty() && !isEditable())
6398 6398
         || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) ) {
@@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
6539 6539
       tmp_iface->callMethod( "goHistory(int)", -1 );
6540 6540
     }
6541 6541
   }
6542
-#ifndef QT_NO_CLIPBOARD
6542
+#ifndef TQT_NO_CLIPBOARD
6543 6543
   if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
6544 6544
     kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen="
6545 6545
                     << d->m_bOpenMiddleClick << endl;
@@ -6613,7 +6613,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
6613 6613
     emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset());
6614 6614
 #endif
6615 6615
     // get selected text and paste to the clipboard
6616
-#ifndef QT_NO_CLIPBOARD
6616
+#ifndef TQT_NO_CLIPBOARD
6617 6617
     TQString text = selectedText();
6618 6618
     text.replace(TQChar(0xa0), ' ');
6619 6619
     disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));

+ 7
- 7
tdehtml/tdehtmlview.cpp Ver fichero

@@ -112,7 +112,7 @@ using namespace tdehtml;
112 112
 class TDEHTMLToolTip;
113 113
 
114 114
 
115
-#ifndef QT_NO_TOOLTIP
115
+#ifndef TQT_NO_TOOLTIP
116 116
 
117 117
 class TDEHTMLToolTip : public TQToolTip
118 118
 {
@@ -412,7 +412,7 @@ public:
412 412
 #endif
413 413
 };
414 414
 
415
-#ifndef QT_NO_TOOLTIP
415
+#ifndef TQT_NO_TOOLTIP
416 416
 
417 417
 /** calculates the client-side image map rectangle for the given image element
418 418
  * @param img image element
@@ -507,7 +507,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
507 507
 
508 508
     KImageIO::registerFormats();
509 509
 
510
-#ifndef QT_NO_TOOLTIP
510
+#ifndef TQT_NO_TOOLTIP
511 511
     d->tooltip = new TDEHTMLToolTip( this, d );
512 512
 #endif
513 513
 
@@ -2866,7 +2866,7 @@ void TDEHTMLView::print(bool quick)
2866 2866
 
2867 2867
         bool scalePage = false;
2868 2868
         double scale = 0.0;
2869
-#ifndef QT_NO_TRANSFORMATIONS
2869
+#ifndef TQT_NO_TRANSFORMATIONS
2870 2870
         if(root->docWidth() > metrics.width()) {
2871 2871
             scalePage = true;
2872 2872
             scale = ((double) metrics.width())/((double) root->docWidth());
@@ -2921,7 +2921,7 @@ void TDEHTMLView::print(bool quick)
2921 2921
             }
2922 2922
 
2923 2923
 
2924
-#ifndef QT_NO_TRANSFORMATIONS
2924
+#ifndef TQT_NO_TRANSFORMATIONS
2925 2925
             if (scalePage)
2926 2926
                 p->scale(scale, scale);
2927 2927
 #endif
@@ -2993,7 +2993,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
2993 2993
     p->translate(rc.left(), rc.top());
2994 2994
     double scale = ((double) rc.width()/(double) root->docWidth());
2995 2995
     int height = (int) ((double) rc.height() / scale);
2996
-#ifndef QT_NO_TRANSFORMATIONS
2996
+#ifndef TQT_NO_TRANSFORMATIONS
2997 2997
     p->scale(scale, scale);
2998 2998
 #endif
2999 2999
     root->setPageTop(yOff);
@@ -3267,7 +3267,7 @@ void TDEHTMLView::setIgnoreWheelEvents( bool e )
3267 3267
     d->ignoreWheelEvents = e;
3268 3268
 }
3269 3269
 
3270
-#ifndef QT_NO_WHEELEVENT
3270
+#ifndef TQT_NO_WHEELEVENT
3271 3271
 
3272 3272
 void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
3273 3273
 {

+ 2
- 2
tdehtml/tdehtmlview.h Ver fichero

@@ -203,7 +203,7 @@ protected:
203 203
     virtual void viewportMouseMoveEvent(TQMouseEvent *);
204 204
     virtual void viewportMouseReleaseEvent(TQMouseEvent *);
205 205
     virtual void viewportResizeEvent(TQResizeEvent*);
206
-#ifndef QT_NO_WHEELEVENT
206
+#ifndef TQT_NO_WHEELEVENT
207 207
     virtual void viewportWheelEvent(TQWheelEvent*);
208 208
 #endif
209 209
     virtual void dragEnterEvent( TQDragEnterEvent* );
@@ -220,7 +220,7 @@ protected:
220 220
 #ifndef NO_SMOOTH_SCROLL_HACK
221 221
     void startScrolling();
222 222
     void stopScrolling();
223
-#ifndef QT_NO_WHEELEVENT
223
+#ifndef TQT_NO_WHEELEVENT
224 224
     void scrollViewWheelEvent( TQWheelEvent* e );
225 225
 #endif
226 226
 #endif

+ 2
- 2
tdehtml/test_regression_fontoverload.cpp Ver fichero

@@ -21,8 +21,8 @@
21 21
  */
22 22
 
23 23
 #include "ecma/kjs_proxy.h"
24
-#define QT_NO_XRANDR 1
25
-#define QT_NO_XFTFREETYPE 1
24
+#define TQT_NO_XRANDR 1
25
+#define TQT_NO_XFTFREETYPE 1
26 26
 #include <private/qfontengine_p.h>
27 27
 #include <tqfontdatabase.h>
28 28
 #include <tqfont.h>

+ 1
- 1
tdeinit/tdedostartupconfig.cpp Ver fichero

@@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE.
22 22
 
23 23
 ****************************************************************************/
24 24
 
25
-#undef QT_NO_CAST_ASCII
25
+#undef TQT_NO_CAST_ASCII
26 26
 
27 27
 // See description in tdestartupconfig.cpp .
28 28
 

+ 1
- 1
tdeio/kssl/ksslcertdlg.cc Ver fichero

@@ -80,7 +80,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal)
80 80
    h->addWidget(d->p_pb_dontsend);
81 81
    connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont()));
82 82
 
83
-#ifndef QT_NO_WIDGET_TOPEXTRA
83
+#ifndef TQT_NO_WIDGET_TOPEXTRA
84 84
    setCaption(i18n("KDE SSL Certificate Dialog"));
85 85
 #endif
86 86
 }

+ 4
- 4
tdeio/tdeio/paste.cpp Ver fichero

@@ -93,7 +93,7 @@ static TDEIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray&
93 93
      return TDEIO::move( orig_url, new_url );
94 94
 }
95 95
 
96
-#ifndef QT_NO_MIMECLIPBOARD
96
+#ifndef TQT_NO_MIMECLIPBOARD
97 97
 static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
98 98
                                      const TQValueVector<TQCString>& formats,
99 99
                                      const TQString& text,
@@ -145,7 +145,7 @@ static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
145 145
 // KDE4: remove
146 146
 TDEIO_EXPORT bool TDEIO::isClipboardEmpty()
147 147
 {
148
-#ifndef QT_NO_MIMECLIPBOARD
148
+#ifndef TQT_NO_MIMECLIPBOARD
149 149
   TQMimeSource *data = TQApplication::clipboard()->data();
150 150
   if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 )
151 151
     return false;
@@ -159,7 +159,7 @@ TDEIO_EXPORT bool TDEIO::isClipboardEmpty()
159 159
   return true;
160 160
 }
161 161
 
162
-#ifndef QT_NO_MIMECLIPBOARD
162
+#ifndef TQT_NO_MIMECLIPBOARD
163 163
 // The main method for dropping
164 164
 TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
165 165
                                     const TQString& dialogText, TQWidget* widget, bool clipboard )
@@ -214,7 +214,7 @@ TDEIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move
214 214
     return 0;
215 215
   }
216 216
 
217
-#ifndef QT_NO_MIMECLIPBOARD
217
+#ifndef TQT_NO_MIMECLIPBOARD
218 218
   TQMimeSource *data = TQApplication::clipboard()->data();
219 219
 
220 220
   // First check for URLs.

+ 10
- 10
tdeioslave/http/kcookiejar/kcookiewin.cpp Ver fichero

@@ -26,13 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 26
 // KDE File Manager -- HTTP Cookie Dialogs
27 27
 // $Id$
28 28
 
29
-// The purpose of the QT_NO_TOOLTIP and QT_NO_WHATSTHIS ifdefs is because
29
+// The purpose of the TQT_NO_TOOLTIP and TQT_NO_WHATSTHIS ifdefs is because
30 30
 // this file is also used in Konqueror/Embedded. One of the aims of
31 31
 // Konqueror/Embedded is to be a small as possible to fit on embedded
32 32
 // devices. For this it's also useful to strip out unneeded features of
33 33
 // Qt, like for example TQToolTip or TQWhatsThis. The availability (or the
34 34
 // lack thereof) can be determined using these preprocessor defines.
35
-// The same applies to the QT_NO_ACCEL ifdef below. I hope it doesn't make
35
+// The same applies to the TQT_NO_ACCEL ifdef below. I hope it doesn't make
36 36
 // too much trouble... (Simon)
37 37
 
38 38
 #include <tqhbox.h>
@@ -48,11 +48,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
48 48
 #include <tqradiobutton.h>
49 49
 #include <tqvbuttongroup.h>
50 50
 
51
-#ifndef QT_NO_TOOLTIP
51
+#ifndef TQT_NO_TOOLTIP
52 52
 #include <tqtooltip.h>
53 53
 #endif
54 54
 
55
-#ifndef QT_NO_WHATSTHIS
55
+#ifndef TQT_NO_WHATSTHIS
56 56
 #include <tqwhatsthis.h>
57 57
 #endif
58 58
 
@@ -145,14 +145,14 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
145 145
 
146 146
     txt = (count == 1)? i18n("&Only this cookie") : i18n("&Only these cookies");
147 147
     TQRadioButton* rb = new TQRadioButton( txt, m_btnGrp );
148
-#ifndef QT_NO_WHATSTHIS
148
+#ifndef TQT_NO_WHATSTHIS
149 149
     TQWhatsThis::add( rb, i18n("Select this option to accept/reject only this cookie. "
150 150
                               "You will be prompted if another cookie is received. "
151 151
                               "<em>(see WebBrowsing/Cookies in the Control Center)</em>." ) );
152 152
 #endif
153 153
     m_btnGrp->insert( rb );
154 154
     rb = new TQRadioButton( i18n("All cookies from this do&main"), m_btnGrp );
155
-#ifndef QT_NO_WHATSTHIS
155
+#ifndef TQT_NO_WHATSTHIS
156 156
     TQWhatsThis::add( rb, i18n("Select this option to accept/reject all cookies from "
157 157
                               "this site. Choosing this option will add a new policy for "
158 158
                               "the site this cookie originated from. This policy will be "
@@ -161,7 +161,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
161 161
 #endif
162 162
     m_btnGrp->insert( rb );
163 163
     rb = new TQRadioButton( i18n("All &cookies"), m_btnGrp );
164
-#ifndef QT_NO_WHATSTHIS
164
+#ifndef TQT_NO_WHATSTHIS
165 165
     TQWhatsThis::add( rb, i18n("Select this option to accept/reject all cookies from "
166 166
                               "anywhere. Choosing this option will change the global "
167 167
                               "cookie policy set in the Control Center for all cookies "
@@ -188,7 +188,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
188 188
     connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
189 189
     bbLay->addWidget( btn );
190 190
     bbLay->addStretch( 1 );
191
-#ifndef QT_NO_ACCEL
191
+#ifndef TQT_NO_ACCEL
192 192
     TQAccel* a = new TQAccel( this );
193 193
     a->connectItem( a->insertItem(Qt::Key_Escape), btn, TQT_SLOT(animateClick()) );
194 194
 #endif
@@ -197,7 +197,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
197 197
     m_button->setText( m_showDetails ? i18n("&Details <<"):i18n("&Details >>") );
198 198
     connect( m_button, TQT_SIGNAL(clicked()), TQT_SLOT(slotCookieDetails()) );
199 199
     bbLay->addWidget( m_button );
200
-#ifndef QT_NO_WHATSTHIS
200
+#ifndef TQT_NO_WHATSTHIS
201 201
     TQWhatsThis::add( m_button, i18n("See or modify the cookie information") );
202 202
 #endif
203 203
 
@@ -316,7 +316,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount,
316 316
         btnNext->setFixedSize( btnNext->sizeHint() );
317 317
         grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 );
318 318
         connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) );
319
-#ifndef QT_NO_TOOLTIP
319
+#ifndef TQT_NO_TOOLTIP
320 320
         TQToolTip::add( btnNext, i18n("Show details of the next cookie") );
321 321
 #endif
322 322
     }

+ 2
- 2
tdeprint/tests/drawdemo.cpp Ver fichero

@@ -176,7 +176,7 @@ DrawView::DrawView()
176 176
 //
177 177
 DrawView::~DrawView()
178 178
 {
179
-#ifndef QT_NO_PRINTER
179
+#ifndef TQT_NO_PRINTER
180 180
     delete printer;
181 181
 #endif
182 182
 }
@@ -208,7 +208,7 @@ void DrawView::drawIt( TQPainter *p )
208 208
 
209 209
 void DrawView::printIt()
210 210
 {
211
-#ifndef QT_NO_PRINTER
211
+#ifndef TQT_NO_PRINTER
212 212
     if ( printer->setup( this ) ) {
213 213
         TQPainter paint( printer );
214 214
         drawIt( &paint );

+ 1
- 1
tdeprint/tests/helpwindow.cpp Ver fichero

@@ -227,7 +227,7 @@ void HelpWindow::aboutQt()
227 227
 
228 228
 void HelpWindow::openFile()
229 229
 {
230
-#ifndef QT_NO_FILEDIALOG
230
+#ifndef TQT_NO_FILEDIALOG
231 231
     TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this );
232 232
     if ( !fn.isEmpty() )
233 233
 	browser->setSource( fn );

+ 2
- 2
tdeui/kiconview.cpp Ver fichero

@@ -504,7 +504,7 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
504 504
     int pw = 0;
505 505
     int ph = 0;
506 506
 
507
-#ifndef QT_NO_PICTURE
507
+#ifndef TQT_NO_PICTURE
508 508
     if ( picture() ) {
509 509
         TQRect br = picture()->boundingRect();
510 510
         pw = br.width() + 2;
@@ -685,7 +685,7 @@ void TDEIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
685 685
 {
686 686
     TDEIconView *kview = static_cast<TDEIconView *>(iconView());
687 687
 
688
-#ifndef QT_NO_PICTURE
688
+#ifndef TQT_NO_PICTURE
689 689
     if ( picture() ) {
690 690
 	TQPicture *pic = picture();
691 691
 	if ( isSelected() ) {

+ 1
- 1
tdeui/ktabbar.cpp Ver fichero

@@ -279,7 +279,7 @@ void KTabBar::dropEvent( TQDropEvent *e )
279 279
     TQTabBar::dropEvent( e );
280 280
 }
281 281
 
282
-#ifndef QT_NO_WHEELEVENT
282
+#ifndef TQT_NO_WHEELEVENT
283 283
 void KTabBar::wheelEvent( TQWheelEvent *e )
284 284
 {
285 285
     if ( e->orientation() == Qt::Horizontal )

+ 2
- 2
tdeui/ktabbar.h Ver fichero

@@ -69,7 +69,7 @@ signals:
69 69
     void receivedDropEvent( int, TQDropEvent * );
70 70
     void moveTab( int, int );
71 71
     void closeRequest( int );
72
-#ifndef QT_NO_WHEELEVENT
72
+#ifndef TQT_NO_WHEELEVENT
73 73
     void wheelDelta( int );
74 74
 #endif
75 75
 
@@ -78,7 +78,7 @@ protected:
78 78
     virtual void mousePressEvent( TQMouseEvent *e );
79 79
     virtual void mouseMoveEvent( TQMouseEvent *e );
80 80
     virtual void mouseReleaseEvent( TQMouseEvent *e );
81
-#ifndef QT_NO_WHEELEVENT
81
+#ifndef TQT_NO_WHEELEVENT
82 82
     virtual void wheelEvent( TQWheelEvent *e );
83 83
 #endif
84 84
 

+ 2
- 2
tdeui/ktabwidget.cpp Ver fichero

@@ -66,7 +66,7 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f )
66 66
     connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * )));
67 67
     connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int )));
68 68
     connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int )));
69
-#ifndef QT_NO_WHEELEVENT
69
+#ifndef TQT_NO_WHEELEVENT
70 70
     connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int )));
71 71
 #endif
72 72
 }
@@ -325,7 +325,7 @@ void KTabWidget::dropEvent( TQDropEvent *e )
325 325
     TQTabWidget::dropEvent( e );
326 326
 }
327 327
 
328
-#ifndef QT_NO_WHEELEVENT
328
+#ifndef TQT_NO_WHEELEVENT
329 329
 void KTabWidget::wheelEvent( TQWheelEvent *e )
330 330
 {
331 331
     if ( e->orientation() == Qt::Horizontal )

+ 2
- 2
tdeui/ktabwidget.h Ver fichero

@@ -277,7 +277,7 @@ protected:
277 277
     virtual void dragMoveEvent( TQDragMoveEvent * );
278 278
     virtual void dropEvent( TQDropEvent * );
279 279
     unsigned int tabBarWidthForMaxChars( uint maxLength );
280
-#ifndef QT_NO_WHEELEVENT
280
+#ifndef TQT_NO_WHEELEVENT
281 281
     virtual void wheelEvent( TQWheelEvent *e );
282 282
 #endif
283 283
     virtual void resizeEvent( TQResizeEvent * );
@@ -289,7 +289,7 @@ protected slots:
289 289
     virtual void mouseDoubleClick( int );
290 290
     virtual void mouseMiddleClick( int );
291 291
     virtual void closeRequest( int );
292
-#ifndef QT_NO_WHEELEVENT
292
+#ifndef TQT_NO_WHEELEVENT
293 293
     virtual void wheelDelta( int );
294 294
 #endif
295 295
 

+ 1
- 1
tdeutils/tdemultitabbar.cpp Ver fichero

@@ -463,7 +463,7 @@ TQSize KMultiTabBarButton::sizeHint() const
463 463
     int w = 0, h = 0;
464 464
 
465 465
     // calculate contents size...
466
-#ifndef QT_NO_ICONSET
466
+#ifndef TQT_NO_ICONSET
467 467
     if ( iconSet() && !iconSet()->isNull() ) {
468 468
         int iw = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
469 469
         int ih = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height();

Loading…
Cancelar
Guardar