Automated update from Qt3

5 files changed, 9 insertions, 9 deletions

diff --git a/src/codecs/ntqtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h
index 787941f51..d0ac81034 100644
--- a/src/codecs/ntqtextcodecplugin.h
+++ b/src/codecs/ntqtextcodecplugin.h
@@ -52,7 +52,7 @@ class TQTextCodecPluginPrivate;
 
 class Q_EXPORT TQTextCodecPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTextCodecPlugin();
     ~TQTextCodecPlugin();
diff --git a/src/codecs/qfontjpcodec.cpp b/src/codecs/qfontjpcodec.cpp
index 365f21e0e..bd21e167e 100644
--- a/src/codecs/qfontjpcodec.cpp
+++ b/src/codecs/qfontjpcodec.cpp
@@ -109,7 +109,7 @@ void TQFontJis0201Codec::fromUnicode(const TQChar *in, unsigned short *out, int
 
 int TQFontJis0201Codec::heuristicNameMatch(const char* hint) const
 {
-    if ( qstrncmp( hint, "jisx0201", 8 ) == 0 )
+    if ( tqstrncmp( hint, "jisx0201", 8 ) == 0 )
 	return 20;
     return -1;
 
@@ -137,7 +137,7 @@ int TQFontJis0208Codec::heuristicContentMatch(const char *, int) const
 
 int TQFontJis0208Codec::heuristicNameMatch(const char *hint) const
 {
-    if ( qstrncmp( hint, "jisx0208.", 9 ) == 0 )
+    if ( tqstrncmp( hint, "jisx0208.", 9 ) == 0 )
 	return 20;
     return -1;
 }
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index 938967071..74f833362 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -117,7 +117,7 @@
 
 #include "ntqgb18030codec.h"
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "move obsolete header <ntqgbkcodec.h> into the src/compat directory"
 #endif
 
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 23b6ff51a..c03529df2 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -504,17 +504,17 @@ int TQTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
 {
     // if they're the same, return a perfect score.
     if ( name && hint && *name && *hint && qstricmp( name, hint ) == 0 )
-	return qstrlen( hint );
+	return tqstrlen( hint );
 
     // if the letters and numbers are the same, we have an "almost"
     // perfect match.
     TQString h( lettersAndNumbers( hint ) );
     TQString n( lettersAndNumbers( name ) );
     if ( h == n )
-	return qstrlen( hint )-1;
+	return tqstrlen( hint )-1;
 
     if ( h.stripWhiteSpace() == n.stripWhiteSpace() )
-	return qstrlen( hint )-2;
+	return tqstrlen( hint )-2;
 
     // could do some more here, but I don't think it's worth it
 
@@ -1115,7 +1115,7 @@ TQString TQTextCodec::toUnicode(const TQCString& a) const
 */
 TQString TQTextCodec::toUnicode(const char* chars) const
 {
-    return toUnicode(chars,qstrlen(chars));
+    return toUnicode(chars,tqstrlen(chars));
 }
 
 /*!
diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp
index 71e5ed125..df9757e28 100644
--- a/src/codecs/qtextcodecfactory.cpp
+++ b/src/codecs/qtextcodecfactory.cpp
@@ -79,7 +79,7 @@ static void create_manager()
 	new TQPluginManager<TQTextCodecFactoryInterface>(IID_QTextCodecFactory,
 						       TQApplication::libraryPaths(), "/codecs",
 						       FALSE);
-    Q_CHECK_PTR( manager );
+    TQ_CHECK_PTR( manager );
     cleanup_manager.set( &manager );
 }