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

1 files changed, 14 insertions, 14 deletions

diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 0847d594..cb5ebae1 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -19,11 +19,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.                                                         *
@@ -294,8 +294,8 @@ DataBaseItem::toRawData (char *_data)
 
 
 DataBaseManager::DataBaseManager (TQString directory, TQString lang,
-				  TQObject * parent, const char *name):
-TQObject (parent, name)
+				  TQObject * tqparent, const char *name):
+TQObject (tqparent, name)
 {
     TQString filename;
 
@@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory,
 
     rename (filename.local8Bit (), filename.local8Bit () + ",old");
 
-//kdDebug(0) << TQString("Creating %1").arg(filename) << endl;
+//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl;
 
     iAmOk = true;
 
@@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n)
 	  return InfoItem ();
       }
 
-// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
 
     InfoItem it ((char *) data.data, language);
 //free(data.data);  // Read docu for this!!!!
@@ -1000,7 +1000,7 @@ DataBaseManager::loadInfo ()
 
 TQValueList < TQString > DataBaseManager::wordsIn (TQString string)
 {
-    QString
+    TQString
 	a;
     TQValueList < TQString > words;
     int
@@ -1015,7 +1015,7 @@ TQValueList < TQString > DataBaseManager::wordsIn (TQString string)
     int
 	c = 0;
     //words.setAutoDelete(true);  //Not sure... check if it is en.
-    QString
+    TQString
 	m;
     for (i = 0; i < l; i++)
 	if (a[i].isLetterOrNumber ())
@@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key)
     else
 	ret = *(uint32 *) key.data;
 
-//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl;
+//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl;
 
 
     free (data.data);
@@ -1333,7 +1333,7 @@ DataBaseManager::appendKey (TQString _key)
 
 }
 
-QString
+TQString
 DataBaseManager::getKey (uint32 n)
 {
 
@@ -1349,11 +1349,11 @@ DataBaseManager::getKey (uint32 n)
 //Check for errors
     int ret = indexDb->get (indexDb, 0, &key, &data, 0);	//DB_SET_RECNO);
     if (ret)
-	return TQString::null;
+	return TQString();
 
     return TQString::fromUtf8 ((char *) data.data);
 
-// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
 
 }
 
@@ -1446,7 +1446,7 @@ DataBaseManager::putNewTranslation (TQString key, TQString tran, int catalog,
 	    isThisOne = (*ittr).translation == msgstr;
 
 	    // is there the catnum we are looking for?
-	    if ((*ittr).infoRef.find (catnum) != (*ittr).infoRef.end ())
+	    if ((*ittr).infoRef.tqfind (catnum) != (*ittr).infoRef.end ())
 	    {
 		found_catalog_info = true;
 		if (ow && !isThisOne)