TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 27 insertions, 24 deletions

diff --git a/kfile-plugins/c++/kfile_cpp.cpp b/kfile-plugins/c++/kfile_cpp.cpp
index 0840ab7f..59f4fa7e 100644
--- a/kfile-plugins/c++/kfile_cpp.cpp
+++ b/kfile-plugins/c++/kfile_cpp.cpp
@@ -31,9 +31,9 @@ typedef KGenericFactory<KCppPlugin> CppFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_cpp, CppFactory("kfile_cpp"))
 
-KCppPlugin::KCppPlugin(TQObject *parent, const char *name,
+KCppPlugin::KCppPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     kdDebug(7034) << "c++ plugin\n";
     makeMimeTypeInfo("text/x-c++src");
@@ -94,25 +94,25 @@ bool KCppPlugin::readInfo( KFileMetaInfo& info, uint )
             continue;
         }
         
-        if (line.contains("/*")) inComment = true;
+        if (line.tqcontains("/*")) inComment = true;
 
         if (!inComment)
         {
             codeLines++;
-            if (line.contains(TQRegExp("^\\s*#\\s*include"))) Includes++;
+            if (line.tqcontains(TQRegExp("^\\s*#\\s*include"))) Includes++;
 
-            int pos = line.find("//");
+            int pos = line.tqfind("//");
             if (pos>=0) commentLines++;
             // truncate the comment - we don't want to count strings in it
             line.truncate(pos);
                 
-            Strings+=line.contains(TQRegExp("\".*\""));
-            Stringsi18n+=line.contains(TQRegExp("(?:i18n|I18N_NOOP)\\s*\\("));
+            Strings+=line.tqcontains(TQRegExp("\".*\""));
+            Stringsi18n+=line.tqcontains(TQRegExp("(?:i18n|I18N_NOOP)\\s*\\("));
         }
         else
             commentLines++;
           
-        if (line.contains("*/")) inComment = false;
+        if (line.tqcontains("*/")) inComment = false;
     }
 
     KFileMetaInfoGroup group = appendGroup(info, "General");
diff --git a/kfile-plugins/c++/kfile_cpp.h b/kfile-plugins/c++/kfile_cpp.h
index ef0c2083..40072797 100644
--- a/kfile-plugins/c++/kfile_cpp.h
+++ b/kfile-plugins/c++/kfile_cpp.h
@@ -28,9 +28,10 @@ class TQStringList;
 class KCppPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KCppPlugin(TQObject *parent, const char *name, const TQStringList& args);
+    KCppPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:
diff --git a/kfile-plugins/diff/kfile_diff.cpp b/kfile-plugins/diff/kfile_diff.cpp
index 957d0574..1d8b832e 100644
--- a/kfile-plugins/diff/kfile_diff.cpp
+++ b/kfile-plugins/diff/kfile_diff.cpp
@@ -44,9 +44,9 @@
 
 K_EXPORT_COMPONENT_FACTORY(kfile_diff, KGenericFactory<KDiffPlugin>("kfile_diff"))
 
-KDiffPlugin::KDiffPlugin(TQObject *parent, const char *name,
+KDiffPlugin::KDiffPlugin(TQObject *tqparent, const char *name,
                          const TQStringList &preferredItems)
-	: KFilePlugin(parent, name, preferredItems)
+	: KFilePlugin(tqparent, name, preferredItems)
 {
 	kdDebug(7034) << "diff plugin" << endl;
 
@@ -210,25 +210,25 @@ enum KDiffPlugin::Format KDiffPlugin::determineDiffFormat( const TQStringList li
 	while ( it != lines.end() )
 	{
 		line = (*it);
-		if ( line.find( TQRegExp( "^[0-9]+[0-9,]*[acd][0-9]+[0-9,]*$" ), 0 ) == 0 )
+		if ( line.tqfind( TQRegExp( "^[0-9]+[0-9,]*[acd][0-9]+[0-9,]*$" ), 0 ) == 0 )
 		{
 			return KDiffPlugin::Normal;
 		}
-		else if ( line.find( TQRegExp( "^--- " ), 0 ) == 0 )
+		else if ( line.tqfind( TQRegExp( "^--- " ), 0 ) == 0 )
 		{
 			// unified has first a '^--- ' line, then a '^+++ ' line
 			return KDiffPlugin::Unified;
 		}
-		else if ( line.find( TQRegExp( "^\\*\\*\\* [^\\t]+\\t" ), 0 ) == 0 )
+		else if ( line.tqfind( TQRegExp( "^\\*\\*\\* [^\\t]+\\t" ), 0 ) == 0 )
 		{
 			// context has first a '^*** ' line, then a '^--- ' line
 			return KDiffPlugin::Context;
 		}
-		else if ( line.find( TQRegExp( "^[acd][0-9]+ [0-9]+" ), 0 ) == 0 )
+		else if ( line.tqfind( TQRegExp( "^[acd][0-9]+ [0-9]+" ), 0 ) == 0 )
 		{
 			return KDiffPlugin::RCS;
 		}
-		else if ( line.find( TQRegExp( "^[0-9]+[0-9,]*[acd]" ), 0 ) == 0 )
+		else if ( line.tqfind( TQRegExp( "^[0-9]+[0-9,]*[acd]" ), 0 ) == 0 )
 		{
 			return KDiffPlugin::Ed;
 		}
diff --git a/kfile-plugins/diff/kfile_diff.h b/kfile-plugins/diff/kfile_diff.h
index a53d89bb..36b9f13b 100644
--- a/kfile-plugins/diff/kfile_diff.h
+++ b/kfile-plugins/diff/kfile_diff.h
@@ -25,9 +25,10 @@ class TQStringList;
 class KDiffPlugin: public KFilePlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KDiffPlugin( TQObject *parent, const char *name,
+	KDiffPlugin( TQObject *tqparent, const char *name,
 	             const TQStringList& preferredItems );
 
 
diff --git a/kfile-plugins/ts/kfile_ts.cpp b/kfile-plugins/ts/kfile_ts.cpp
index 0d6f5dc1..e027fda6 100644
--- a/kfile-plugins/ts/kfile_ts.cpp
+++ b/kfile-plugins/ts/kfile_ts.cpp
@@ -29,8 +29,8 @@ typedef KGenericFactory<KTsPlugin> TsFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_ts, TsFactory("kfile_ts"))
 
-KTsPlugin::KTsPlugin(TQObject *parent, const char *name,
-        const TQStringList &args) : KFilePlugin(parent, name, args)
+KTsPlugin::KTsPlugin(TQObject *tqparent, const char *name,
+        const TQStringList &args) : KFilePlugin(tqparent, name, args)
 {
     makeMimeTypeInfo( "application/x-linguist" );
 }
@@ -66,18 +66,18 @@ bool KTsPlugin::readInfo(KFileMetaInfo& info, uint)
     TQString line = stream.readLine();
 
     // is it really a linguist file?
-    if (!line.contains("<!DOCTYPE TS>", false))
+    if (!line.tqcontains("<!DOCTYPE TS>", false))
         return false;
 
     while (!stream.eof())
     {
         line = stream.readLine();
 
-        if (line.contains("type=\"obsolete\"")) obsolete++;
+        if (line.tqcontains("type=\"obsolete\"")) obsolete++;
 
-        if (line.contains("<source>")) messages++;
+        if (line.tqcontains("<source>")) messages++;
         
-        if (line.contains("type=\"unfinished\"")) untranslated++;
+        if (line.tqcontains("type=\"unfinished\"")) untranslated++;
         
     }
 
diff --git a/kfile-plugins/ts/kfile_ts.h b/kfile-plugins/ts/kfile_ts.h
index 930de46e..65941e47 100644
--- a/kfile-plugins/ts/kfile_ts.h
+++ b/kfile-plugins/ts/kfile_ts.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KTsPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KTsPlugin(TQObject *parent, const char *name, const TQStringList& args);
+    KTsPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private: