1 files changed, 12 insertions, 12 deletions

diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp
index ef9d3a88..eb953b0e 100644
--- a/lib/compatibility/knewstuff/entry.cpp
+++ b/lib/compatibility/knewstuff/entry.cpp
@@ -26,7 +26,7 @@
 using namespace KNS;
 
 Entry::Entry() :
-  mRelease( 0 ), mReleaseDate( TQDate::currentDate() ), mRating( 0 ),
+  mRelease( 0 ), mReleaseDate( TQDate::tqcurrentDate() ), mRating( 0 ),
   mDownloads( 0 )
 {
 }
@@ -89,12 +89,12 @@ void Entry::setSummary( const TQString &text, const TQString &lang )
 {
   mSummaryMap.insert( lang, text );
 
-  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 TQString Entry::summary( const TQString &lang ) const
 {
-  if ( mSummaryMap.isEmpty() ) return TQString::null;
+  if ( mSummaryMap.isEmpty() ) return TQString();
 
   if ( !mSummaryMap[ lang ].isEmpty() ) return mSummaryMap[ lang ];
   else {
@@ -102,7 +102,7 @@ TQString Entry::summary( const TQString &lang ) const
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mSummaryMap[ *it ].isEmpty() ) return mSummaryMap[ *it ];
   }
-  if ( !mSummaryMap[ TQString::null ].isEmpty() ) return mSummaryMap[ TQString::null ];
+  if ( !mSummaryMap[ TQString() ].isEmpty() ) return mSummaryMap[ TQString() ];
   else return *(mSummaryMap.begin());
 }
 
@@ -144,7 +144,7 @@ void Entry::setPayload( const KURL &url, const TQString &lang )
 {
   mPayloadMap.insert( lang, url );
 
-  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 KURL Entry::payload( const TQString &lang ) const
@@ -155,7 +155,7 @@ KURL Entry::payload( const TQString &lang ) const
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mPayloadMap[ *it ].isEmpty() ) return mPayloadMap[ *it ];
   }
-  if ( payload.isEmpty() ) payload = mPayloadMap [ TQString::null ];
+  if ( payload.isEmpty() ) payload = mPayloadMap [ TQString() ];
   if ( payload.isEmpty() && !mPayloadMap.isEmpty() ) {
     payload = *(mPayloadMap.begin());
   }
@@ -167,7 +167,7 @@ void Entry::setPreview( const KURL &url, const TQString &lang )
 {
   mPreviewMap.insert( lang, url );
   
-  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 KURL Entry::preview( const TQString &lang ) const
@@ -178,7 +178,7 @@ KURL Entry::preview( const TQString &lang ) const
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mPreviewMap[ *it ].isEmpty() ) return mPreviewMap[ *it ];
   }
-  if ( preview.isEmpty() ) preview = mPreviewMap [ TQString::null ];
+  if ( preview.isEmpty() ) preview = mPreviewMap [ TQString() ];
   if ( preview.isEmpty() && !mPreviewMap.isEmpty() ) {
     preview = *(mPreviewMap.begin());
   }
@@ -252,11 +252,11 @@ void Entry::parseDomElement( const TQDomElement &element )
 }
 
 TQDomElement Entry::createDomElement( TQDomDocument &doc,
-                                              TQDomElement &parent )
+                                              TQDomElement &tqparent )
 {
   TQDomElement entry = doc.createElement( "stuff" );
   entry.setAttribute("type", mType);
-  parent.appendChild( entry );
+  tqparent.appendChild( entry );
 
   addElement( doc, entry, "name", name() );
   addElement( doc, entry, "author", author() );
@@ -283,12 +283,12 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc,
   return entry;
 }
 
-TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &parent,
+TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &tqparent,
                                const TQString &tag, const TQString &value )
 {
   TQDomElement n = doc.createElement( tag );
   n.appendChild( doc.createTextNode( value ) );
-  parent.appendChild( n );
+  tqparent.appendChild( n );
 
   return n;
 }