Browse Source

qt -> tqt conversion:

QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST
QT_NO_STL -> TQT_NO_STL
QT_NO_COMPAT -> TQT_NO_COMPAT
QT_NO_TRANSLATION -> TQT_NO_TRANSLATION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro 8 months ago
parent
commit
89389861b3
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 2
- 2
kate/data/qt4.xml View File

@@ -306,7 +306,7 @@
306 306
     <item> QT_NO_SPLITTER </item>
307 307
     <item> QT_NO_STANDARDITEMMODEL </item>
308 308
     <item> QT_NO_STATEMACHINE </item>
309
-    <item> QT_NO_STL_WCHAR </item>
309
+    <item> TQT_NO_STL_WCHAR </item>
310 310
     <item> QT_NO_STRINGLISTMODEL </item>
311 311
     <item> QT_NO_STYLE_CDE </item>
312 312
     <item> QT_NO_STYLE_CLEANLOOKS </item>
@@ -339,7 +339,7 @@
339 339
     <item> QT_NO_TOOLBAR </item>
340 340
     <item> QT_NO_TOOLBOX </item>
341 341
     <item> QT_NO_TOOLBUTTON </item>
342
-    <item> QT_NO_TRANSLATION_UTF8 </item>
342
+    <item> TQT_NO_TRANSLATION_UTF8 </item>
343 343
     <item> QT_NO_TREEVIEW </item>
344 344
     <item> QT_NO_TREEWIDGET </item>
345 345
     <item> QT_NO_UNDOGROUP </item>

+ 2
- 2
tdecore/tdeapplication.cpp View File

@@ -32,7 +32,7 @@
32 32
 // #error tqtranslator.h was already included
33 33
 // #endif // TQTRANSLATOR_H
34 34
 
35
-#undef QT_NO_TRANSLATION
35
+#undef TQT_NO_TRANSLATION
36 36
 #undef TQT_NO_TRANSLATION
37 37
 #include <tqtranslator.h>
38 38
 
@@ -43,7 +43,7 @@
43 43
 #include "tdeapplication.h"
44 44
 #undef TDEAPPLICATION_BINARY_COMPAT_HACK
45 45
 
46
-#define QT_NO_TRANSLATION
46
+#define TQT_NO_TRANSLATION
47 47
 #define TQT_NO_TRANSLATION
48 48
 #include <tqdir.h>
49 49
 #include <tqptrcollection.h>

+ 2
- 2
tdeio/tests/dataprotocoltest.cpp View File

@@ -5,8 +5,8 @@
5 5
 // invoke "make test" to generate the binary outside KDE CVS
6 6
 
7 7
 // fix the symptoms, not the illness ;-)
8
-#ifdef QT_NO_ASCII_CAST
9
-#  undef QT_NO_ASCII_CAST
8
+#ifdef TQT_NO_ASCII_CAST
9
+#  undef TQT_NO_ASCII_CAST
10 10
 #endif
11 11
 
12 12
 #ifdef DATAKIOSLAVE

+ 1
- 1
tdespell2/Makefile.am View File

@@ -3,7 +3,7 @@ METASOURCES = AUTO
3 3
 
4 4
 noinst_LTLIBRARIES = libtdespell2base.la
5 5
 
6
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
6
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
7 7
 
8 8
 tdespell2baseincludedir = $(includedir)/tdespell2
9 9
 

+ 1
- 1
tdespell2/tests/Makefile.am View File

@@ -1,4 +1,4 @@
1
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
1
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
2 2
 METASOURCES = AUTO
3 3
 
4 4
 

+ 1
- 1
tdespell2/ui/Makefile.am View File

@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdespell2.la
4 4
 # Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
5 5
 noinst_LTLIBRARIES = libtdespell2_noinst.la
6 6
 
7
-KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
7
+KDE_CXXFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT
8 8
 INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes)
9 9
 
10 10
 tdespell2includedir = $(includedir)/tdespell2

+ 1
- 1
tdestyles/keramik/CMakeLists.txt View File

@@ -10,7 +10,7 @@
10 10
 #################################################
11 11
 
12 12
 add_definitions(
13
-  -UQT_NO_ASCII_CAST
13
+  -UTQT_NO_ASCII_CAST
14 14
   -DQT_PLUGIN
15 15
 )
16 16
 

+ 1
- 1
tdestyles/keramik/Makefile.am View File

@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DQT_PLUGIN
2 2
 
3 3
 INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
4 4
 # qembed's output needs that...
5
-KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
5
+KDE_CXXFLAGS = -UTQT_NO_ASCII_CAST
6 6
 noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h
7 7
 kde_style_LTLIBRARIES = keramik.la
8 8
 keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module

+ 2
- 2
tdewallet/tests/CMakeLists.txt View File

@@ -26,8 +26,8 @@ link_directories(
26 26
 
27 27
 add_definitions (
28 28
     -DKDE_NO_COMPAT
29
-    -DQT_NO_COMPAT
30
-    -DQT_NO_ASCII_CAST
29
+    -DTQT_NO_COMPAT
30
+    -DTQT_NO_ASCII_CAST
31 31
 )
32 32
 
33 33
 tde_add_check_executable( tdewalletsync  AUTOMOC LINK tdewalletclient-shared )

+ 1
- 1
tdewallet/tests/Makefile.am View File

@@ -1,4 +1,4 @@
1
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
1
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)
2 2
 
3 3
 METASOURCES = AUTO
4 4
 check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth

+ 1
- 1
win/pro_files/tdemdi/test/test.pro View File

@@ -9,7 +9,7 @@ CONFIG -= windows
9 9
 CONFIG += debug
10 10
 CONFIG += console
11 11
 
12
-unix:DEFINES   = NO_INCLUDE_MOCFILES QT_NO_COMPAT
12
+unix:DEFINES   = NO_INCLUDE_MOCFILES TQT_NO_COMPAT
13 13
 unix:LIBS       += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts
14 14
 unix:INCLUDEPATH     += . .. $(TDEDIR)/include
15 15
 

+ 1
- 1
win/tdelibs_global_win.h View File

@@ -136,7 +136,7 @@ typedef int mode_t;
136 136
 # endif
137 137
 
138 138
 //operator (char*) caused errors
139
-//#define QT_NO_ASCII_CAST
139
+//#define TQT_NO_ASCII_CAST
140 140
 
141 141
 /* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called
142 142
 

Loading…
Cancel
Save