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>

12 files changed, 14 insertions, 14 deletions

diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 4a0041b4..5ab3d1b3 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -586,7 +586,7 @@ LOOP:
 				     ($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or
 				     ($p =~ m/^#\s*if\s+defined\(_WS_MAC_/ and $qt_embedded) or
 				     ($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or
-				     $p =~ m/^#\s*ifndef\s+QT_NO_STL/ or
+				     $p =~ m/^#\s*ifndef\s+TQT_NO_STL/ or
 				     $p =~ m/^#\s*if\s+defined\s*\(Q_OS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
 				     $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index 5959b552..1c8b3477 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -4,7 +4,7 @@ AM_CXXFLAGS = -frtti
 # Make sure the include path includes Qt's uilib
 INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes)
 
-INCLUDES += -DQT_NO_ASCII_CAST
+INCLUDES += -DTQT_NO_ASCII_CAST
 
 SUBDIRS = bindings builtins qtbindings . plugin plugins tdescript stdlib cpptests docs
 
diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am
index 3d7ee10d..99ebe1b7 100644
--- a/kjsembed/bindings/Makefile.am
+++ b/kjsembed/bindings/Makefile.am
@@ -1,6 +1,6 @@
 
 INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
-KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused
+KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST -Wno-unused
 
 noinst_LTLIBRARIES = libkjsembedbindings.la
 
diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am
index 61e17518..a786b402 100644
--- a/kjsembed/builtins/Makefile.am
+++ b/kjsembed/builtins/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES= -I$(srcdir)/../.. -I.. -I$(top_srcdir)/kjsembed $(all_includes)
-KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused
+KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST -Wno-unused
 
 noinst_LTLIBRARIES = libkjsembedbuiltins.la
 
diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am
index 9a3c15d3..8c4013ef 100644
--- a/kjsembed/cpptests/jsaccess/Makefile.am
+++ b/kjsembed/cpptests/jsaccess/Makefile.am
@@ -3,7 +3,7 @@
 # Make sure the include path includes Qt's uilib
 INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_srcdir) $(all_includes)
 
-INCLUDES += -DQT_NO_ASCII_CAST
+INCLUDES += -DTQT_NO_ASCII_CAST
 
 noinst_PROGRAMS    = jsaccess
 
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index 201a3203..49c861ea 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -223,7 +223,7 @@
 
 2004-12-04 Saturday 02:34  geiseri
 
-	QT_NO_ASCII_CAST build fix.
+	TQT_NO_ASCII_CAST build fix.
 
 2004-12-04 Saturday 02:25  geiseri
 
@@ -509,7 +509,7 @@
 
 2004-11-24 Wednesday 01:59  staikos
 
-	QT_NO_COMPAT fix (untested, but at least it compiles now):
+	TQT_NO_COMPAT fix (untested, but at least it compiles now):
 	int match ( const TQString & str, int index = 0, int * len = 0, bool indexIsStart = TRUE ) const  (obsolete)
 	int search ( const TQString & str, int offset = 0, CaretMode caretMode = CaretAtZero ) const
 
@@ -4013,7 +4013,7 @@
 	- Moved loadScript(filename) from main.cpp into the KPart, and renamed
 	  the existing loadXX() to executeXX() which is better anyway.
 
-	- Added -DQT_NO_ASCII_CAST to the build flags.
+	- Added -DTQT_NO_ASCII_CAST to the build flags.
 
 	- Added a standalone factory class. This class is responsible for
 	  creating the various objects, and for creating bindings.
diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am
index d55101ba..a3b25e8b 100644
--- a/kjsembed/plugin/Makefile.am
+++ b/kjsembed/plugin/Makefile.am
@@ -3,7 +3,7 @@
 # Make sure the include path includes Qt's uilib
 INCLUDES= -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) $(all_includes)
 
-INCLUDES += -DQT_NO_ASCII_CAST
+INCLUDES += -DTQT_NO_ASCII_CAST
 
 kde_module_LTLIBRARIES = libjsconsoleplugin.la
 
diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am
index e4521c66..27d17682 100644
--- a/kjsembed/plugins/Makefile.am
+++ b/kjsembed/plugins/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES=  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
-KDE_CXXFLAGS = -DQT_NO_ASCII_CAST
+KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST
 
 kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
 noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la
diff --git a/kjsembed/qtbindings/Makefile.am b/kjsembed/qtbindings/Makefile.am
index b4bf0aa6..ac595696 100644
--- a/kjsembed/qtbindings/Makefile.am
+++ b/kjsembed/qtbindings/Makefile.am
@@ -1,6 +1,6 @@
 
 INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
-KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused
+KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST -Wno-unused
 
 noinst_LTLIBRARIES = libkjsembedqtbindings.la
 
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index e784261c..2c53259a 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -133,7 +133,7 @@ public:
     virtual void setActive(bool yes);
     bool isActive() const
 	{ return (bool)act; }
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
     bool visible() const
 	{ return (bool)vis; }
     bool selected() const
diff --git a/smoke/tde/qtguess.pl.in b/smoke/tde/qtguess.pl.in
index 5955fbd6..8a5b89a5 100644
--- a/smoke/tde/qtguess.pl.in
+++ b/smoke/tde/qtguess.pl.in
@@ -263,7 +263,7 @@ our %tests = (
 					£, 5],
  	"QT_NO_COLORDIALOG" =>		["qcolordialog.h", "TQColorDialog::customCount();", 12],
  	"QT_NO_COMBOBOX" =>		["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
-	"QT_NO_COMPAT" =>		["qfontmetrics.h", q£
+	"TQT_NO_COMPAT" =>		["qfontmetrics.h", q£
 						TQFontMetrics *foo= new TQFontMetrics( TQFont() );
 						int bar = foo->width( 'c' );
 					£, 0],
diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in
index 5955fbd6..8a5b89a5 100644
--- a/smoke/tqt/qtguess.pl.in
+++ b/smoke/tqt/qtguess.pl.in
@@ -263,7 +263,7 @@ our %tests = (
 					£, 5],
  	"QT_NO_COLORDIALOG" =>		["qcolordialog.h", "TQColorDialog::customCount();", 12],
  	"QT_NO_COMBOBOX" =>		["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
-	"QT_NO_COMPAT" =>		["qfontmetrics.h", q£
+	"TQT_NO_COMPAT" =>		["qfontmetrics.h", q£
 						TQFontMetrics *foo= new TQFontMetrics( TQFont() );
 						int bar = foo->width( 'c' );
 					£, 0],