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 <[email protected]>

8 files changed, 8 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index c2e77583..037ae1a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2387,7 +2387,7 @@
           now instead of references to them
         * Changed ClassStore API to always use QStringLists instead
           of QStrList
-        * Compiles with QT_NO_ASCII_CAST and QT_CLEAN_NAMESPACE now
+        * Compiles with TQT_NO_ASCII_CAST and QT_CLEAN_NAMESPACE now
 2001-09-26 Victor Rder <[email protected]>
         * CppCCParser rewritten by Daniel Engelschalt
         * The affected code for CC is saved in a temporary file now
diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt
index 4cdcea2b..676a4d57 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/kdevdesigner/designer/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_definitions( -DDESIGNER -UQT_NO_ASCII_CAST )
+add_definitions( -DDESIGNER -UTQT_NO_ASCII_CAST )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdevdesigner/designer/Makefile.am b/kdevdesigner/designer/Makefile.am
index e00a6de8..88ec3c68 100644
--- a/kdevdesigner/designer/Makefile.am
+++ b/kdevdesigner/designer/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = pics
 
 AM_CXXFLAGS=-DDESIGNER
-KDE_CXXFLAGS=-UQT_NO_ASCII_CAST
+KDE_CXXFLAGS=-UTQT_NO_ASCII_CAST
 INCLUDES = -I$(top_srcdir)/kdevdesigner/shared \
 	-I$(top_srcdir)/lib/interfaces/external $(all_includes)
 METASOURCES = AUTO
diff --git a/kdevdesigner/shared/Makefile.am b/kdevdesigner/shared/Makefile.am
index ea86ae94..140da1e9 100644
--- a/kdevdesigner/shared/Makefile.am
+++ b/kdevdesigner/shared/Makefile.am
@@ -1,4 +1,4 @@
-KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
+KDE_CXXFLAGS = -UTQT_NO_ASCII_CAST
 INCLUDES = -I$(top_srcdir)/lib/interfaces/external $(all_includes)
 METASOURCES = AUTO
 libshared_la_LDFLAGS = $(all_libraries)
diff --git a/kdevdesigner/uilib/Makefile.am b/kdevdesigner/uilib/Makefile.am
index 0480cd50..0a4aa920 100644
--- a/kdevdesigner/uilib/Makefile.am
+++ b/kdevdesigner/uilib/Makefile.am
@@ -1,4 +1,4 @@
-KDE_CXXFLAGS=-UQT_NO_ASCII_CAST
+KDE_CXXFLAGS=-UTQT_NO_ASCII_CAST
 
 INCLUDES = -I$(top_srcdir)/kdevdesigner/shared $(all_includes)
 METASOURCES = AUTO
diff --git a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
index 1d419822..fe62552f 100644
--- a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am for %{APPNAMELC}.
 #
 
-AM_CPPFLAGS = -UQT_NO_ASCII_CAST
+AM_CPPFLAGS = -UTQT_NO_ASCII_CAST
 METASOURCES = AUTO
 
 INCLUDES = $(all_includes)
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 717579f4..84b2c812 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -820,7 +820,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			lenv.AppendUnique( ENV = os.environ )
 		if not 'lang_qt' in _flags:
 			## Use this define if you are using the kde translation scheme (.po files)
-			lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' )
+			lenv.Append( CPPFLAGS = '-DTQT_NO_TRANSLATION' )
 		if 'rpath' in _flags:
 			## Use this to set rpath - this may cause trouble if folders are moved (chrpath)
 			lenv.Append( RPATH = [env['TQTLIBPATH'], env['KDELIBPATH'], env['KDEMODULE']] )
diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am
index c66c174e..32327d8d 100644
--- a/src/tdeconf_update/Makefile.am
+++ b/src/tdeconf_update/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT $(all_includes)
 
 update_DATA = kdev-gen-settings.upd 
 updatedir = $(kde_datadir)/tdeconf_update