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

2 files changed, 10 insertions, 9 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: