Finished remaining porting to new TQt API

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp

@@ -25,7 +25,7 @@ protected:
     {
         Q_UNUSED(className);
         Q_UNUSED(args);
-        return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name );
+        return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
     }
 };
 
@@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate
 public:
     KFileAudioPreviewPrivate( TQWidget *parent )
     {
-        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString::null, parent );
+        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
     }
 
     ~KFileAudioPreviewPrivate()

interfaces/ktexteditor/document.h

@@ -33,6 +33,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
   friend class PrivateDocument;
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     Document ( TQObject *parent = 0, const char *name = 0 );

interfaces/ktexteditor/editor.h

@@ -41,6 +41,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
   friend class PrivateEditor;
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**

interfaces/ktexteditor/editorchooser.cpp

@@ -57,7 +57,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
 	{
     		if ((*it)->desktopEntryName().contains(editor))
 		{
-			d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name()));
+			d->chooser->editorCombo->insertItem(TQString(i18n("System Default (%1)").arg((*it)->name())));
 			break;
 		}
   	}
@@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
 	if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
 	else
 	{
-		int idx=d->elements.findIndex(editor);
+		int idx=d->elements.tqfindIndex(editor);
 		idx=idx+1;
 		d->chooser->editorCombo->setCurrentItem(idx);
 	}

interfaces/ktexteditor/editorchooser_ui.ui

@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EditorChooser_UI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EditorChooser</cstring>
     </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>editorCombo</cstring>
                     </property>

interfaces/ktexteditor/templateinterface.cpp

@@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
   KABC::StdAddressBook *addrBook = 0;
   KABC::Addressee userAddress;
   TQDateTime datetime = TQDateTime::tqcurrentDateTime();
-  TQDate date = datetime.date();
-  TQTime time = datetime.time();
+  TQDate date = TQT_TQDATE_OBJECT(datetime.date());
+  TQTime time = TQT_TQTIME_OBJECT(datetime.time());
 
   TQMap<TQString,TQString>::Iterator it;
   for ( it = map.begin(); it != map.end(); ++it )
@@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
         }
       }
       TQString placeholder = rx.cap( 1 );
-      if ( ! enhancedInitValues.contains( placeholder ) )
+      if ( ! enhancedInitValues.tqcontains( placeholder ) )
         enhancedInitValues[ placeholder ] = "";
 
       pos += rx.matchedLength();

kabc/addresseedialog.cpp

@@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
     topLayout->addLayout( selectedLayout );
     topLayout->setSpacing( spacingHint() );
 
-    TQGroupBox *selectedGroup = new TQGroupBox( 1, Horizontal, i18n("Selected"),
+    TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"),
                                               topWidget );
     selectedLayout->addWidget( selectedGroup );
 

kabc/addresseehelper.cpp

@@ -92,17 +92,17 @@ void AddresseeHelper::initSettings()
 
 bool AddresseeHelper::containsTitle( const TQString& title ) const
 {
-  return mTitles.tqfind( title ) != mTitles.end();
+  return mTitles.find( title ) != mTitles.end();
 }
 
 bool AddresseeHelper::containsPrefix( const TQString& prefix ) const
 {
-  return mPrefixes.tqfind( prefix ) != mPrefixes.end();
+  return mPrefixes.find( prefix ) != mPrefixes.end();
 }
 
 bool AddresseeHelper::containsSuffix( const TQString& suffix ) const
 {
-  return mSuffixes.tqfind( suffix ) != mSuffixes.end();
+  return mSuffixes.find( suffix ) != mSuffixes.end();
 }
 
 bool AddresseeHelper::tradeAsFamilyName() const

kabc/addresslineedit.cpp

@@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
 
 void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e )
 {
-   if (m_useCompletion && (e->button() == MidButton))
+   if (m_useCompletion && (e->button() == Qt::MidButton))
    {
       m_smartPaste = true;
       KLineEdit::mouseReleaseEvent(e);
@@ -293,7 +293,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
     TQString prevAddr;    
     
     TQString s(text());    
-    int n = s.findRev(',');
+    int n = s.tqfindRev(',');
         
     if (n >= 0)
     {
@@ -465,7 +465,7 @@ void AddressLineEdit::startLoadingLDAPEntries()
     TQString s( *s_LDAPText );
     // TODO cache last?
     TQString prevAddr;
-    int n = s.findRev(',');
+    int n = s.tqfindRev(',');
     if (n>= 0)
     {
         prevAddr = s.left(n+1) + ' ';

kabc/distributionlistdialog.cpp

@@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString &curren
   TQFrame *topFrame = plainPage();
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
 
-  mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
@@ -100,7 +100,7 @@ TQString EmailSelector::getEmail( const TQStringList &emails, const TQString &cu
   return result;
 }
 
-class EntryItem : public QListViewItem
+class EntryItem : public TQListViewItem
 {
   public:
     EntryItem( TQListView *parent, const Addressee &addressee,

kabc/distributionlisteditor.cpp

@@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString
   TQFrame *topFrame = plainPage();
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
 
-  mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   mButtonGroup->setRadioButtonExclusive( true );
   topLayout->addWidget( mButtonGroup );
@@ -80,7 +80,7 @@ TQString EmailSelectDialog::getEmail( const TQStringList &emails, const TQString
   return result;
 }
 
-class EditEntryItem : public QListViewItem
+class EditEntryItem : public TQListViewItem
 {
   public:
     EditEntryItem( TQListView *parent, const Addressee &addressee,

kabc/formats/binaryformat.cpp

@@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
   }
 
   // set real number of entries
-  stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
+  stream.tqdevice()->at( 2 * sizeof( TQ_UINT32 ) );
   stream << counter;
 }
 
@@ -140,12 +140,12 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const
   }
 
   if ( magic != 0x2e93e ) {
-    kdError() << i18n("File '%1' is not binary format.").arg( file->name() ) << endl;
+    kdError() << TQString(i18n("File '%1' is not binary format.").arg( file->name() )) << endl;
     return false;
   }
 
   if ( version != BINARY_FORMAT_VERSION ) {
-    kdError() << i18n("File '%1' is the wrong version.").arg( file->name() ) << endl;
+    kdError() << TQString(i18n("File '%1' is the wrong version.").arg( file->name() )) << endl;
     return false;
   }
 

kabc/kab2kabc.cpp

@@ -58,7 +58,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   TQString comment;
 
   if ( entry.at( entry.length() -1 ) == ')' ) {
-    int br = entry.findRev( '(' );
+    int br = entry.tqfindRev( '(' );
     if ( br >= 0 ) {
       comment = entry.mid( br + 1, entry.length() - br - 2 );
       entry.truncate( br );
@@ -68,7 +68,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
     }
   }
 
-  int posSpace = entry.findRev( ' ' );
+  int posSpace = entry.tqfindRev( ' ' );
   if ( posSpace < 0 ) {
     email = entry;
     if ( !comment.isEmpty() ) {
@@ -91,7 +91,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   }
 
   if ( name.at( name.length() -1 ) == ')' ) {
-    int br = name.findRev( '(' );
+    int br = name.tqfindRev( '(' );
     if ( br >= 0 ) {
       comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
       name.truncate( br );

kabc/ldapclient.cpp

@@ -408,7 +408,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
     }
 
     LdapResult sr;
-    sr.clientNumber = mClients.findIndex( (*it1).client );
+    sr.clientNumber = mClients.tqfindIndex( (*it1).client );
     sr.name = name;
     sr.email = mail;
     resList.append( sr );

kabc/ldapconfigwidget.cpp

@@ -607,8 +607,8 @@ void LdapConfigWidget::setFlags( int flags )
 
   // First delete all the child widgets.
   // FIXME: I hope it's correct
-  const TQObjectList *ch = children();
-  TQObjectList ch2 = *ch;
+  const TQObjectList ch = childrenListObject();
+  TQObjectList ch2 = ch;
   TQObject *obj;
   TQWidget *widget;
 

kabc/ldapconfigwidget.h

@@ -50,7 +50,8 @@ namespace KABC {
   class KABC_EXPORT LdapConfigWidget : public TQWidget
   {
     Q_OBJECT
-    Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
+    TQ_OBJECT
+    TQ_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
     Q_PROPERTY( TQString user READ user WRITE setUser )
     Q_PROPERTY( TQString password READ password WRITE setPassword )
     Q_PROPERTY( TQString bindDN READ bindDN WRITE setBindDN )
@@ -69,7 +70,7 @@ namespace KABC {
     Q_PROPERTY( bool authSASL READ isAuthSASL WRITE setAuthSASL )
     Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
     Q_PROPERTY( int timeLimit READ timeLimit WRITE setTimeLimit )
-    Q_SETS ( LCW_Flags )
+    TQ_SETS ( LCW_Flags )
         
     public:
     

kabc/ldapurl.cpp

@@ -58,7 +58,7 @@ void LDAPUrl::setDn( const TQString &dn)
 
 bool LDAPUrl::hasExtension( const TQString &key ) const
 {
-  return m_extensions.contains( key );
+  return m_extensions.tqcontains( key );
 }
 
 LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const

kabc/ldif.cpp

@@ -178,7 +178,7 @@ bool LDIF::splitControl( const TQCString &line, TQString &oid, bool &critical,
   critical = false;
   bool url = splitLine( line, tmp, value );
   
-  kdDebug(5700) << "splitControl: value: " << TQString::fromUtf8(value, value.size()) << endl;
+  kdDebug(5700) << "splitControl: value: " << TQString(TQString::fromUtf8(value, value.size())) << endl;
   if ( tmp.isEmpty() ) {
     tmp = TQString::fromUtf8( value, value.size() );
     value.resize( 0 );
@@ -211,7 +211,7 @@ LDIF::ParseVal LDIF::processLine()
       if ( attrLower == "version" ) {
         if ( !mDn.isEmpty() ) retval = Err;
       } else if ( attrLower == "dn" ) {
-        kdDebug(5700) << "ldapentry dn: " << TQString::fromUtf8( mVal, mVal.size() ) << endl;
+        kdDebug(5700) << "ldapentry dn: " << TQString(TQString::fromUtf8( mVal, mVal.size() )) << endl;
         mDn = TQString::fromUtf8( mVal, mVal.size() );
         mModType = Mod_None;
         retval = NewEntry;

kabc/ldifconverter.cpp

@@ -87,11 +87,11 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
   const Address workAddr = addr.address( Address::Work );
 
   ldif_out( t, "dn", TQString( "cn=%1,mail=%2" )
-            .arg( addr.formattedName().simplifyWhiteSpace() )
+            .arg( TQString(addr.formattedName()).simplifyWhiteSpace() )
             .arg( addr.preferredEmail() ) );
   ldif_out( t, "givenname", addr.givenName() );
   ldif_out( t, "sn", addr.familyName() );
-  ldif_out( t, "cn", addr.formattedName().simplifyWhiteSpace() );
+  ldif_out( t, "cn", TQString(addr.formattedName()).simplifyWhiteSpace() );
   ldif_out( t, "uid", addr.uid() );
   ldif_out( t, "nickname", addr.nickName() );
   ldif_out( t, "xmozillanickname", addr.nickName() );
@@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
   ldif_out( t, "homeurl", addr.url().prettyURL() );
   ldif_out( t, "description", addr.note() );
   if (addr.revision().isValid())
-    ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) );
+    ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) );
 
   t << "objectclass: top\n";
   t << "objectclass: person\n";
@@ -271,7 +271,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
   }
   if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
        fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
-    if ( a.emails().findIndex( value ) == -1 )
+    if ( a.emails().tqfindIndex( value ) == -1 )
       a.insertEmail( value );
     return true;
   }
@@ -489,8 +489,8 @@ addComment:
   if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
     return true;
 
-  kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
-                             .arg(a.formattedName()).arg(fieldname).arg(value);
+  kdWarning() << TQString(TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
+                             .arg(a.formattedName()).arg(fieldname).arg(value));
 
   return true;
 }
@@ -554,7 +554,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
   }
 
   // generate the new string and split it to 72 chars/line
-  TQCString txt = (formatStr.arg(value)).utf8();
+  TQCString txt = TQString(formatStr.arg(value)).utf8();
 
   if (allowEncode) {
     len = txt.length();

kabc/plugins/dir/resourcedirconfig.cpp

@@ -82,7 +82,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
     return;
   }
 
-  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
+  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
 
   mFileNameEdit->setURL( resource->path() );
   if ( mFileNameEdit->url().isEmpty() )

kabc/plugins/file/resourcefileconfig.cpp

@@ -86,7 +86,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res  )
     return;
   }
 
-  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
+  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
 
   mFileNameEdit->setURL( resource->fileName() );
   if ( mFileNameEdit->url().isEmpty() )

kabc/plugins/ldapkio/resourceldapkio.cpp

@@ -122,8 +122,8 @@ ResourceLDAPKIO::~ResourceLDAPKIO()
 
 void ResourceLDAPKIO::enter_loop()
 {
-  TQWidget dummy(0,0,WType_Dialog | WShowModal);
-  dummy.setFocusPolicy( TQWidget::NoFocus );
+  TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
+  dummy.setFocusPolicy( TQ_NoFocus );
   qt_enter_modal(&dummy);
   tqApp->enter_loop();
   qt_leave_modal(&dummy);
@@ -308,7 +308,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
   }
   
   tmp += "\n";  
-  kdDebug(7125) << "ldif: " << TQString::fromUtf8(tmp) << endl;
+  kdDebug(7125) << "ldif: " << TQString(TQString::fromUtf8(tmp)) << endl;
   ldif = tmp;
   return true;
 }
@@ -330,49 +330,49 @@ void ResourceLDAPKIO::init()
     handle them in the load() method below.
     These are the default values
    */
-  if ( !mAttributes.contains("objectClass") )
+  if ( !mAttributes.tqcontains("objectClass") )
     mAttributes.insert( "objectClass", "inetOrgPerson" );
-  if ( !mAttributes.contains("commonName") )
+  if ( !mAttributes.tqcontains("commonName") )
     mAttributes.insert( "commonName", "cn" );
-  if ( !mAttributes.contains("formattedName") )
+  if ( !mAttributes.tqcontains("formattedName") )
     mAttributes.insert( "formattedName", "displayName" );
-  if ( !mAttributes.contains("familyName") )
+  if ( !mAttributes.tqcontains("familyName") )
     mAttributes.insert( "familyName", "sn" );
-  if ( !mAttributes.contains("givenName") )
+  if ( !mAttributes.tqcontains("givenName") )
     mAttributes.insert( "givenName", "givenName" );
-  if ( !mAttributes.contains("mail") )
+  if ( !mAttributes.tqcontains("mail") )
     mAttributes.insert( "mail", "mail" );
-  if ( !mAttributes.contains("mailAlias") )
+  if ( !mAttributes.tqcontains("mailAlias") )
     mAttributes.insert( "mailAlias", "" );
-  if ( !mAttributes.contains("phoneNumber") )
+  if ( !mAttributes.tqcontains("phoneNumber") )
     mAttributes.insert( "phoneNumber", "homePhone" );
-  if ( !mAttributes.contains("telephoneNumber") )
+  if ( !mAttributes.tqcontains("telephoneNumber") )
     mAttributes.insert( "telephoneNumber", "telephoneNumber" );
-  if ( !mAttributes.contains("facsimileTelephoneNumber") )
+  if ( !mAttributes.tqcontains("facsimileTelephoneNumber") )
     mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" );
-  if ( !mAttributes.contains("mobile") )
+  if ( !mAttributes.tqcontains("mobile") )
     mAttributes.insert( "mobile", "mobile" );
-  if ( !mAttributes.contains("pager") )
+  if ( !mAttributes.tqcontains("pager") )
     mAttributes.insert( "pager", "pager" );
-  if ( !mAttributes.contains("description") )
+  if ( !mAttributes.tqcontains("description") )
     mAttributes.insert( "description", "description" );
 
-  if ( !mAttributes.contains("title") )
+  if ( !mAttributes.tqcontains("title") )
     mAttributes.insert( "title", "title" );
-  if ( !mAttributes.contains("street") )
+  if ( !mAttributes.tqcontains("street") )
     mAttributes.insert( "street", "street" );
-  if ( !mAttributes.contains("state") )
+  if ( !mAttributes.tqcontains("state") )
     mAttributes.insert( "state", "st" );
-  if ( !mAttributes.contains("city") )
+  if ( !mAttributes.tqcontains("city") )
     mAttributes.insert( "city", "l" );
-  if ( !mAttributes.contains("organization") )
+  if ( !mAttributes.tqcontains("organization") )
     mAttributes.insert( "organization", "o" );
-  if ( !mAttributes.contains("postalcode") )
+  if ( !mAttributes.tqcontains("postalcode") )
     mAttributes.insert( "postalcode", "postalCode" );
 
-  if ( !mAttributes.contains("uid") )
+  if ( !mAttributes.tqcontains("uid") )
     mAttributes.insert( "uid", "uid" );
-  if ( !mAttributes.contains("jpegPhoto") )
+  if ( !mAttributes.tqcontains("jpegPhoto") )
     mAttributes.insert( "jpegPhoto", "jpegPhoto" );
 
   d->mLDAPUrl = KURL();

kabc/plugins/ldapkio/resourceldapkioconfig.cpp

@@ -281,7 +281,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
   for ( i = 1; i < mMapCombo->count(); i++ ) {
     TQDictIterator<KLineEdit> it2( mLineEditDict );
     for ( ; it2.current(); ++it2 ) {
-      if ( mMapList[ i ].contains( it2.currentKey() ) ) {
+      if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) {
         if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
       } else {
         if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break;

kabc/plugins/net/resourcenetconfig.cpp

@@ -79,7 +79,7 @@ void ResourceNetConfig::loadSettings( KRES::Resource *res )
     return;
   }
 
-  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
+  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
 
   mUrlEdit->setURL( resource->url().url() );
 }

kabc/resourceselectdialog.cpp

@@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   KButtonBox *buttonBox = new KButtonBox( this );
 
   buttonBox->addStretch();
-  buttonBox->addButton(  KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
-  buttonBox->addButton(  KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
+  buttonBox->addButton(  KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) );
+  buttonBox->addButton(  KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) );
   buttonBox->layout();
 
   mainLayout->addWidget( buttonBox );

kabc/scripts/addressee.src.cpp

@@ -212,11 +212,11 @@ void Addressee::setNameFromString( const TQString &s )
   setName( str );
 
   // clear all name parts
-  setPrefix( TQString::null );
-  setGivenName( TQString::null );
-  setAdditionalName( TQString::null );
-  setFamilyName( TQString::null );
-  setSuffix( TQString::null );
+  setPrefix( TQString() );
+  setGivenName( TQString() );
+  setAdditionalName( TQString() );
+  setFamilyName( TQString() );
+  setSuffix( TQString() );
 
   if ( str.isEmpty() )
     return;
@@ -391,7 +391,7 @@ TQString Addressee::fullEmail( const TQString &email ) const
   } else {
     e = email;
   }
-  if ( e.isEmpty() ) return TQString::null;
+  if ( e.isEmpty() ) return TQString();
 
   TQString text;
   if ( realName().isEmpty() )
@@ -444,7 +444,7 @@ void Addressee::removeEmail( const TQString &email )
 
 TQString Addressee::preferredEmail() const
 {
-  if ( mData->emails.count() == 0 ) return TQString::null;
+  if ( mData->emails.count() == 0 ) return TQString();
   else return mData->emails.first();
 }
 
@@ -755,7 +755,7 @@ void Addressee::insertCategory( const TQString &c )
   detach();
   mData->empty = false;
 
-  if ( mData->categories.findIndex( c ) != -1 ) return;
+  if ( mData->categories.tqfindIndex( c ) != -1 ) return;
 
   mData->categories.append( c );
 }
@@ -772,7 +772,7 @@ void Addressee::removeCategory( const TQString &c )
 
 bool Addressee::hasCategory( const TQString &c ) const
 {
-  return ( mData->categories.findIndex( c ) != -1 );
+  return ( mData->categories.tqfindIndex( c ) != -1 );
 }
 
 void Addressee::setCategories( const TQStringList &c )

kabc/scripts/entrylist

@@ -13,64 +13,64 @@
 #  Field Category : Categories the field belongs to (see Field::FieldCategory).
 #  Output function: Function used to convert type to string for debug output (optional)
 
-ALE,name,,QString,name
+ALE,name,,TQString,name
 
-ALFE,formatted name,,QString,formattedName,Frequent
+ALFE,formatted name,,TQString,formattedName,Frequent
 
-ALFE,family name,,QString,familyName,Frequent
-ALFE,given name,,QString,givenName,Frequent
-ALFE,additional names,,QString,additionalName
-ALFE,honorific prefixes,,QString,prefix
-ALFE,honorific suffixes,,QString,suffix
+ALFE,family name,,TQString,familyName,Frequent
+ALFE,given name,,TQString,givenName,Frequent
+ALFE,additional names,,TQString,additionalName
+ALFE,honorific prefixes,,TQString,prefix
+ALFE,honorific suffixes,,TQString,suffix
 
-ALFE,nick name,,QString,nickName,Personal
+ALFE,nick name,,TQString,nickName,Personal
 
-ALFE,birthday,,QDateTime,birthday,Personal,.toString()
+ALFE,birthday,,TQDateTime,birthday,Personal,.toString()
 
 #Address address
-LF,home address street,,QString,homeAddressStreet,Address|Personal
-LF,home address city,,QString,homeAddressLocality,Address|Personal
-LF,home address state,,QString,homeAddressRegion,Address|Personal
-LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
-LF,home address country,,QString,homeAddressCountry,Address|Personal
-LF,home address label,,QString,homeAddressLabel,Address|Personal
-
-LF,business address street,,QString,businessAddressStreet,Address|Organization
-LF,business address city,,QString,businessAddressLocality,Address|Organization
-LF,business address state,,QString,businessAddressRegion,Address|Organization
-LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization
-LF,business address country,,QString,businessAddressCountry,Address|Organization
-LF,business address label,,QString,businessAddressLabel,Address|Organization
+LF,home address street,,TQString,homeAddressStreet,Address|Personal
+LF,home address city,,TQString,homeAddressLocality,Address|Personal
+LF,home address state,,TQString,homeAddressRegion,Address|Personal
+LF,home address zip code,,TQString,homeAddressPostalCode,Address|Personal
+LF,home address country,,TQString,homeAddressCountry,Address|Personal
+LF,home address label,,TQString,homeAddressLabel,Address|Personal
+
+LF,business address street,,TQString,businessAddressStreet,Address|Organization
+LF,business address city,,TQString,businessAddressLocality,Address|Organization
+LF,business address state,,TQString,businessAddressRegion,Address|Organization
+LF,business address zip code,,TQString,businessAddressPostalCode,Address|Organization
+LF,business address country,,TQString,businessAddressCountry,Address|Organization
+LF,business address label,,TQString,businessAddressLabel,Address|Organization
 
 #phoneNumbers
-LF,home phone,,QString,homePhone,Personal|Frequent
-LF,business phone,,QString,businessPhone,Organization|Frequent
-LF,mobile phone,,QString,mobilePhone,Frequent
-LF,home fax,,QString,homeFax
-LF,business fax,,QString,businessFax
-LF,car phone,,QString,carPhone
-LF,ISDN,,QString,isdn
-LF,pager,,QString,pager
+LF,home phone,,TQString,homePhone,Personal|Frequent
+LF,business phone,,TQString,businessPhone,Organization|Frequent
+LF,mobile phone,,TQString,mobilePhone,Frequent
+LF,home fax,,TQString,homeFax
+LF,business fax,,TQString,businessFax
+LF,car phone,,TQString,carPhone
+LF,ISDN,,TQString,isdn
+LF,pager,,TQString,pager
 
 #emails
-LF,email address,,QString,email,Email|Frequent
+LF,email address,,TQString,email,Email|Frequent
 
-ALFE,mail client,,QString,mailer,Email
+ALFE,mail client,,TQString,mailer,Email
 
 ALE,time zone,,TimeZone,timeZone,,.asString()
 ALE,geographic position,,Geo,geo,,.asString()
 
-ALFE,title,person,QString,title,Organization
-ALFE,role,person in organization,QString,role,Organization
-ALFE,organization,,QString,organization,Organization
-ALFE,department,,QString,department,Organization
+ALFE,title,person,TQString,title,Organization
+ALFE,role,person in organization,TQString,role,Organization
+ALFE,organization,,TQString,organization,Organization
+ALFE,department,,TQString,department,Organization
 
-ALFE,note,,QString,note
+ALFE,note,,TQString,note
 
-ALE,product identifier,,QString,productId
-ALE,revision date,,QDateTime,revision,,.toString()
+ALE,product identifier,,TQString,productId
+ALE,revision date,,TQDateTime,revision,,.toString()
 
-ALE,sort string,,QString,sortString
+ALE,sort string,,TQString,sortString
 
 ALF,homepage,,KURL,url,,.url()
 

kabc/scripts/field.src.cpp

@@ -344,7 +344,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
         return true;
       }
     case FieldImpl::Birthday:
-      a.setBirthday( TQDate::fromString( value, Qt::ISODate ) );
+      a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) );
       return true;
     case FieldImpl::CustomField:
       a.insertCustom( mImpl->app(), mImpl->key(), value );
@@ -360,7 +360,7 @@ TQString Field::sortKey( const KABC::Addressee &a )
     --CASEVALUE--
     case FieldImpl::Birthday:
       if ( a.birthday().isValid() ) {
-        TQDate date = a.birthday().date();
+        TQDate date = TQT_TQDATE_OBJECT(a.birthday().date());
         TQString key;
         key.sprintf( "%02d-%02d", date.month(), date.day() );
         return key;

kabc/scripts/makeaddressee

@@ -55,7 +55,7 @@ if (!open( H_OUT, ">../addressee.h" ) ) {
         print H_OUT "    /**\n";
         print H_OUT "      Return translated label for $entryNames[$i] field.\n";
         print H_OUT "     */\n";
-        print H_OUT "    static QString $entryNames[$i]Label();\n\n";
+        print H_OUT "    static TQString $entryNames[$i]Label();\n\n";
       }
     } else {
       print H_OUT;
@@ -100,7 +100,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
           $labelwords[$j] = ucfirst $labelwords[$j];
         }
         $label = join ' ', @labelwords;
-        print CPP_OUT "QString Addressee::$entryNames[$i]Label()\n{\n";
+        print CPP_OUT "TQString Addressee::$entryNames[$i]Label()\n{\n";
         if ( $entryComments[$i] ) {
           print CPP_OUT "  return i18n(\"$entryComments[$i]\",\"$label\");\n";
         } else {
@@ -112,7 +112,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
       for( $i=0; $i<@entryNames; ++$i ) {
         if ( $entryCtrl[$i] =~ /E/ ) {
           if ( $entryNames[$i] !~ "revision" ) {
-            if ( $entryTypes[$i] =~ "QString" ) {
+            if ( $entryTypes[$i] =~ "TQString" ) {
               print CPP_OUT "  if ( mData->$entryNames[$i] != a.mData->$entryNames[$i] &&\n";
               print CPP_OUT "     !( mData->$entryNames[$i].isEmpty() && a.mData->$entryNames[$i].isEmpty() ) ) {\n";
               print CPP_OUT "    kdDebug(5700) << \"$entryNames[$i] differs\" << endl;\n";
@@ -184,7 +184,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
       for( $i=0; $i<@entryNames; ++$i ) {
         if ( $entryCtrl[$i] !~ /A/ ) { next; }
         if ( $entryCtrl[$i] !~ /F/ ) { next; }
-        if ( $entryTypes[$i] ne "QString" ) { next; }
+        if ( $entryTypes[$i] ne "TQString" ) { next; }
         print CPP_OUT "    case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
         print CPP_OUT "      return a.$entryNames[$i]();\n";
       }
@@ -192,7 +192,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
       for( $i=0; $i<@entryNames; ++$i ) {
         if ( $entryCtrl[$i] !~ /A/ ) { next; }
         if ( $entryCtrl[$i] !~ /F/ ) { next; }
-        if ( $entryTypes[$i] ne "QString" ) { next; }
+        if ( $entryTypes[$i] ne "TQString" ) { next; }
         print CPP_OUT "    case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
         print CPP_OUT "      a.set" . ucfirst($entryNames[$i]) . "( value );\n";
         print CPP_OUT "      return true;\n";

kabc/vcard/ContentLine.cpp

@@ -140,7 +140,7 @@ ContentLine::_parse()
 	vDebug("parse");
 	
 	// Unqote newlines
-	strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
+	strRep_ = strRep_.tqreplace( TQRegExp( "\\\\n" ), "\n" );
 	
 	int split = strRep_.tqfind(':');
 	
@@ -275,7 +275,7 @@ ContentLine::_assemble()
         }
 
 	// Quote newlines
-	line = line.replace( TQRegExp( "\n" ), "\\n" );
+	line = line.tqreplace( TQRegExp( "\n" ), "\\n" );
 		
 	// Fold lines longer than 72 chars
 	const int maxLen = 72;

kabc/vcard/DateValue.cpp

@@ -173,7 +173,7 @@ DateValue::_parse()
 	
 	/////////////////////////////////////////////////////////////// DATE
 	
-	dateStr.replace(TQRegExp("-"), "");
+	dateStr.tqreplace(TQRegExp("-"), "");
 
 	kdDebug(5710) << "dateStr: " << dateStr << endl;
 
@@ -208,7 +208,7 @@ DateValue::_parse()
 
 	//////////////////////////////////////////////////// SECOND FRACTION
 	
-	int secFracSep = timeStr.findRev(',');
+	int secFracSep = timeStr.tqfindRev(',');
 	
 	if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
 		TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
@@ -217,7 +217,7 @@ DateValue::_parse()
 	
 	/////////////////////////////////////////////////////////////// HMS
 
-	timeStr.replace(TQRegExp(":"), "");
+	timeStr.tqreplace(TQRegExp(":"), "");
 	
 	hour_	= timeStr.left(2).toInt();
 	minute_	= timeStr.mid(2, 2).toInt();
@@ -398,7 +398,7 @@ DateValue::setZoneMinute(unsigned int i)
 	assembled_ = false;
 }
 
-	QDate
+	TQDate
 DateValue::qdate()
 {
 	parse();
@@ -406,7 +406,7 @@ DateValue::qdate()
 	return d;
 }
 
-	QTime
+	TQTime
 DateValue::qtime()
 {
 	parse();
@@ -415,7 +415,7 @@ DateValue::qtime()
 	return t;
 }
 
-	QDateTime
+	TQDateTime
 DateValue::qdt()
 {
 	parse();

kabc/vcard/Entity.cpp

@@ -99,7 +99,7 @@ Entity::~Entity()
 	// empty
 }
 		
-	QCString
+	TQCString
 Entity::asString()
 {
 //	vDebug("Entity::asString()");

kabc/vcard/Enum.cpp

@@ -31,7 +31,7 @@ using namespace VCARD;
 // There are 31 possible types, not including extensions.
 // URI is a custom field designed to store the upstream URI for each contact
 // in order to handle certain limited CardDAV systems such as Zimbra
-	const QCString
+	const TQCString
 VCARD::paramNames [] =
 {
 	"NAME",
@@ -228,7 +228,7 @@ VCARD::EntityTypeToValueType(EntityType e)
 	return t;
 }
 
-	QCString
+	TQCString
 VCARD::EntityTypeToParamName(EntityType e)
 {
 	if ( e > EntityUnknown ) e = EntityUnknown;

kabc/vcard/LangValue.cpp

@@ -97,14 +97,14 @@ LangValue::_assemble()
 		strRep_ += TQCString('-') + it.current();
 }
 
-	QCString
+	TQCString
 LangValue::primary()
 {
 	parse();
 	return primary_;
 }
 	
-	QStrList
+	TQStrList
 LangValue::subtags()
 {
 	parse();

kabc/vcard/OrgValue.cpp

@@ -98,7 +98,7 @@ OrgValue::numValues()
 	return valueList_.count();
 }
 
-	QCString
+	TQCString
 OrgValue::value(unsigned int i)
 {
 	parse();

kabc/vcard/Param.cpp

@@ -116,13 +116,13 @@ Param::setValue(const TQCString & value)
         assembled_ = false;
 }
 
-	QCString
+	TQCString
 Param::name()
 {
 	return name_;
 }
 
-	QCString
+	TQCString
 Param::value()
 {
 	return value_;

kabc/vcard/TextListValue.cpp

@@ -98,7 +98,7 @@ TextListValue::numValues()
 	return valueList_.count();
 }
 
-	QCString
+	TQCString
 TextListValue::value(unsigned int i)
 {
 	parse();

kabc/vcard/URIValue.cpp

@@ -103,14 +103,14 @@ URIValue::_assemble()
 	strRep_ = scheme_ + ':' + schemeSpecificPart_;
 }
 
-	QCString
+	TQCString
 URIValue::scheme()
 {
 	parse();
 	return scheme_;
 }
 
-	QCString
+	TQCString
 URIValue::schemeSpecificPart()
 {
 	parse();

kabc/vcard/include/VCardAdrParam.h

@@ -56,8 +56,8 @@ class KVCARD_EXPORT AdrParam : public Param
 	
 	private:
 		
-		QStrList	adrTypeList_;
-		QCString	textParam_;
+		TQStrList	adrTypeList_;
+		TQCString	textParam_;
 };
 }
 

kabc/vcard/include/VCardContentLine.h

@@ -39,8 +39,8 @@ class KVCARD_EXPORT ContentLine : public Entity
 
 #include "ContentLine-generated.h"
 	
-	QCString	group()		{ parse(); return group_;	}
-	QCString	name()		{ parse(); return name_;	}
+	TQCString	group()		{ parse(); return group_;	}
+	TQCString	name()		{ parse(); return name_;	}
 	Value	*	value()		{ parse(); return value_;	}
 	ParamList	paramList()	{ parse(); return paramList_;	}
 	ParamType	paramType()	{ parse(); return paramType_;	}
@@ -63,8 +63,8 @@ class KVCARD_EXPORT ContentLine : public Entity
 	
 	private:
 		
-		QCString		group_;
-		QCString		name_;
+		TQCString		group_;
+		TQCString		name_;
 		TQPtrList<Param>		paramList_;
 		Value			* value_;
 		

kabc/vcard/include/VCardEmailParam.h

@@ -36,7 +36,7 @@ class KVCARD_EXPORT EmailParam : public Param
 	
 #include "EmailParam-generated.h"
 	
-	QCString	emailType() { parse(); return emailType_;	}
+	TQCString	emailType() { parse(); return emailType_;	}
 	bool		pref()		{ parse(); return pref_;		}
 	
 	void