3 files changed, 11 insertions, 11 deletions

diff --git a/lib/catalog/catalog.cpp b/lib/catalog/catalog.cpp
index c58bbe7d..5ece8b2b 100644
--- a/lib/catalog/catalog.cpp
+++ b/lib/catalog/catalog.cpp
@@ -48,7 +48,7 @@ struct _Catalog_Private
 
     bool hasIndex( const TQCString& name ) const
     {
-        return indexList.contains( name );
+        return indexList.tqcontains( name );
     }
 
     DB* index( const TQCString& name )
@@ -172,7 +172,7 @@ void  Catalog::setEnabled( bool isEnabled )
 {
     Q_ASSERT( d->dbp != 0 );
 
-    TQMap<TQCString, DB*>::Iterator it = d->indexList.find( name );
+    TQMap<TQCString, DB*>::Iterator it = d->indexList.tqfind( name );
     if( it == d->indexList.end() ){
         DB* dbp = 0;
 
@@ -213,7 +213,7 @@ void  Catalog::setEnabled( bool isEnabled )
 
  void  Catalog::close()
 {
-    d->dbName = TQString::null;
+    d->dbName = TQString();
 
     TQMap<TQCString, DB*>::Iterator it = d->indexList.begin();
     while( it != d->indexList.end() ){
@@ -369,7 +369,7 @@ void  Catalog::setEnabled( bool isEnabled )
 
     DBC** cursors = new DBC* [ args.size() + 1 ];
 
-    TQValueList< QPair<TQCString,TQVariant> >::ConstIterator it = args.begin();
+    TQValueList< TQPair<TQCString,TQVariant> >::ConstIterator it = args.begin();
     int current = 0;
     while( it != args.end() ){
         TQCString indexName = (*it).first;
diff --git a/lib/catalog/catalog.h b/lib/catalog/catalog.h
index 00eb5b2b..c581dc8c 100644
--- a/lib/catalog/catalog.h
+++ b/lib/catalog/catalog.h
@@ -42,7 +42,7 @@ never or rarely changes. System libraries are perfect examples of such code.
 class Catalog
 {
 public:
-    typedef QPair<TQCString, TQVariant> QueryArgument;
+    typedef TQPair<TQCString, TQVariant> QueryArgument;
 
 public:
     Catalog();
diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h
index f796baa5..426358f4 100644
--- a/lib/catalog/tag.h
+++ b/lib/catalog/tag.h
@@ -122,7 +122,7 @@ public:
         data->fileName = fileName;
     }
 
-    TQString path( const TQString& sep = TQString::fromLatin1("::") ) const
+    TQString path( const TQString& sep = TQString::tqfromLatin1("::") ) const
     {
         TQString s = scope().join( sep );
         if( s.isNull() )
@@ -194,11 +194,11 @@ public:
 			if( hasAttribute( "spc" ) )
 				return data->attributes["spc"].asString();
 			else
-				return TQString::null;
+				return TQString();
 		}
 
 		bool hasSpecializationDeclaration() const {
-			return data->attributes.contains( "spc" );
+			return data->attributes.tqcontains( "spc" );
 		}
 
 		void setSpecializationDeclaration( const TQString& str ) {
@@ -216,7 +216,7 @@ public:
 	    name == "endLine" ||
 	    name == "endColumn" )
 	    return true;
-        return data->attributes.contains( name );
+        return data->attributes.tqcontains( name );
     }
 
     TQVariant attribute( const TQCString& name ) const
@@ -270,7 +270,7 @@ public:
     }
     
     void addTemplateParam( const TQString& param , const TQString& def = "" ) {
-        TQMap<TQCString, TQVariant>::iterator it = data->attributes.find( "tpl" );
+        TQMap<TQCString, TQVariant>::iterator it = data->attributes.tqfind( "tpl" );
         if( it != data->attributes.end() && (*it).type() == TQVariant::StringList ) {
         }else{
             it = data->attributes.insert( "tpl", TQVariant( TQStringList() ) );
@@ -289,7 +289,7 @@ private:
     void detach();
     
 private:
-    struct TagData: public QShared
+    struct TagData: public TQShared
     {
 	TQCString id;
 	int kind;