1 files changed, 13 insertions, 13 deletions

diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index a9333ebb2..e82b02dee 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -24,11 +24,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.
@@ -289,7 +289,7 @@ static TQString dn_escape( const TQString & s ) {
     return result;
 }
 
-static QString
+static TQString
 serialise( const TQValueVector<Kleo::DN::Attribute> & dn ) {
   TQStringList result;
   for ( TQValueVector<Kleo::DN::Attribute>::const_iterator it = dn.begin() ; it != dn.end() ; ++it )
@@ -309,7 +309,7 @@ reorder_dn( const Kleo::DN::Attribute::List & dn ) {
 
   // find all unknown entries in their order of appearance
   for ( Kleo::DN::const_iterator it = dn.begin(); it != dn.end(); ++it )
-    if ( attrOrder.find( (*it).name() ) == attrOrder.end() )
+    if ( attrOrder.tqfind( (*it).name() ) == attrOrder.end() )
       unknownEntries.push_back( *it );
 
   // process the known attrs in the desired order
@@ -378,14 +378,14 @@ const Kleo::DN & Kleo::DN::operator=( const DN & that ) {
 
 TQString Kleo::DN::prettyDN() const {
   if ( !d )
-    return TQString::null;
+    return TQString();
   if ( d->reorderedAttributes.empty() )
     d->reorderedAttributes = reorder_dn( d->attributes );
   return serialise( d->reorderedAttributes );
 }
 
 TQString Kleo::DN::dn() const {
-  return d ? serialise( d->attributes ) : TQString::null ;
+  return d ? serialise( d->attributes ) : TQString() ;
 }
 
 // static
@@ -413,13 +413,13 @@ void Kleo::DN::append( const Attribute & attr ) {
 
 TQString Kleo::DN::operator[]( const TQString & attr ) const {
   if ( !d )
-    return TQString::null;
+    return TQString();
   const TQString attrUpper = attr.upper();
   for ( TQValueVector<Attribute>::const_iterator it = d->attributes.begin() ;
 	it != d->attributes.end() ; ++it )
     if ( (*it).name() == attrUpper )
       return (*it).value();
-  return TQString::null;
+  return TQString();
 }
 
 static TQValueVector<Kleo::DN::Attribute> empty;
@@ -507,9 +507,9 @@ const Kleo::DNAttributeMapper * Kleo::DNAttributeMapper::instance() {
 
 TQString Kleo::DNAttributeMapper::name2label( const TQString & s ) const {
   const std::map<const char*,const char*,ltstr>::const_iterator it
-    = d->map.find( s.stripWhiteSpace().upper().latin1() );
+    = d->map.tqfind( s.stripWhiteSpace().upper().latin1() );
   if ( it == d->map.end() )
-    return TQString::null;
+    return TQString();
   return i18n( it->second );
 }
 
@@ -533,6 +533,6 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
   config.writeEntry( "AttributeOrder", order );
 }
 
-Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * parent, const char * name ) const {
-  return new DNAttributeOrderConfigWidget( mSelf, parent, name );
+Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * tqparent, const char * name ) const {
+  return new DNAttributeOrderConfigWidget( mSelf, tqparent, name );
 }