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, 12 insertions, 11 deletions

diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc
index 22e23c84..3082c552 100644
--- a/kbabel/datatools/not-translated/main.cc
+++ b/kbabel/datatools/not-translated/main.cc
@@ -20,11 +20,11 @@
 
    In addition, as a special exception, the copyright holders give
    permission to link the code of this program with any edition of
-   the Qt library by Trolltech AS, Norway (or with modified versions
-   of Qt that use the same license as Qt), and distribute linked
+   the TQt library by Trolltech AS, Norway (or with modified versions
+   of TQt that use the same license as TQt), and distribute linked
    combinations including the two.  You must obey the GNU General
    Public License in all respects for all of the code used other than
-   Qt. If you modify this file, you may extend this exception to
+   TQt. If you modify this file, you may extend this exception to
    your version of the file, but you are not obligated to do so.  If
    you do not wish to do so, delete this exception statement from
    your version.
@@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_nottranslatedtool, KGenericFactory<NotTransla
 
 using namespace KBabel;
 
-NotTranslatedTool::NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & )
-    : KDataTool( parent, name ) , _cache_origin( 0 )
+NotTranslatedTool::NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & )
+    : KDataTool( tqparent, name ) , _cache_origin( 0 )
 {
     i18n("which check found errors","English text in translation");
 }
@@ -101,13 +101,13 @@ bool NotTranslatedTool::run( const TQString& command, void* data, const TQString
 			if( item->pluralForm() == KDESpecific ) {
 				str = TQStringList::split( "\\n", item->msgstr().first(), true );
 				id = TQStringList::split( "\\n", 
-					item->msgid().first().replace( TQRegExp(_plurals), ""), true );
+					item->msgid().first().tqreplace( TQRegExp(_plurals), ""), true );
 			} else {
 				str = item->msgstr();
 				id = item->msgid();
 			}
 			for( TQStringList::Iterator i = id.begin() ; i != id.end() ; i++ ) {
-				TQString id_str = (*i).replace( TQRegExp(_context), "");
+				TQString id_str = (*i).tqreplace( TQRegExp(_context), "");
 				for( TQStringList::Iterator j = str.begin() ; j != str.end() ; j++ ) {
 					TQString str_str = (*j);
 					hasError = hasError || ( id_str == str_str );
diff --git a/kbabel/datatools/not-translated/main.h b/kbabel/datatools/not-translated/main.h
index c1aeabd8..a9cba848 100644
--- a/kbabel/datatools/not-translated/main.h
+++ b/kbabel/datatools/not-translated/main.h
@@ -20,11 +20,11 @@
 
    In addition, as a special exception, the copyright holders give
    permission to link the code of this program with any edition of
-   the Qt library by Trolltech AS, Norway (or with modified versions
-   of Qt that use the same license as Qt), and distribute linked
+   the TQt library by Trolltech AS, Norway (or with modified versions
+   of TQt that use the same license as TQt), and distribute linked
    combinations including the two.  You must obey the GNU General
    Public License in all respects for all of the code used other than
-   Qt. If you modify this file, you may extend this exception to
+   TQt. If you modify this file, you may extend this exception to
    your version of the file, but you are not obligated to do so.  If
    you do not wish to do so, delete this exception statement from
    your version.
@@ -41,9 +41,10 @@
 class NotTranslatedTool : public KDataTool
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & );
+    NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & );
     virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
     
 private: