1 files changed, 18 insertions, 18 deletions

diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h
index fb8377cbb..0740d9cf0 100644
--- a/kabc/frontend/mainWindow.ui.h
+++ b/kabc/frontend/mainWindow.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -17,11 +17,11 @@
 
 using namespace KABC;
 
-class AddresseeItem : public QListViewItem
+class AddresseeItem : public TQListViewItem
 {
   public:
-    AddresseeItem( TQListView *parent, const Addressee &a ) :
-      TQListViewItem( parent, a.realName(), a.uid() ), mAddressee( a ) {}
+    AddresseeItem( TQListView *tqparent, const Addressee &a ) :
+      TQListViewItem( tqparent, a.realName(), a.uid() ), mAddressee( a ) {}
       
     void setAddressee( const Addressee &a ) { mAddressee = a; }
     Addressee &addressee() { return mAddressee; }
@@ -72,7 +72,7 @@ void MainWindow::loadAddressBook( const TQString &fileName )
 
   mAddresseeList->clear();
   mCurrentItem = 0;
-  mCurrentAddress = TQString::null;
+  mCurrentAddress = TQString();
   readAddressee( Addressee() );
     
   KABC::AddressBook::Iterator it;
@@ -139,8 +139,8 @@ void MainWindow::readAddressee( const KABC::Addressee &a )
   TQStringList customs = a.customs();
   TQStringList::ConstIterator it5;
   for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) {
-    int posDash = (*it5).find( "-" );
-    int posColon = (*it5).find( ":" );
+    int posDash = (*it5).tqfind( "-" );
+    int posColon = (*it5).tqfind( ":" );
   
     TQString app = (*it5).left( posDash );
     TQString cname = (*it5).mid( posDash + 1, posColon - posDash - 1 );
@@ -156,7 +156,7 @@ void MainWindow::readAddressee( const KABC::Addressee &a )
     mAddressIdCombo->insertItem( (*it).id() );
   }
   if ( mAddressIdCombo->count() > 0 ) mCurrentAddress = mAddressIdCombo->currentText();
-  else mCurrentAddress = TQString::null;
+  else mCurrentAddress = TQString();
   readAddress( mCurrentAddress );
 
   mPhoneIdCombo->clear();
@@ -202,7 +202,7 @@ void MainWindow::newEntry()
   bool ok = false;
   TQString name = KInputDialog::getText( i18n("New Address Book Entry"),
                                         i18n("Please enter name:"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
@@ -232,7 +232,7 @@ void MainWindow::updateAddress( int id )
   if ( mAddressIdCombo->count()  > 0 ) {
     mCurrentAddress = mAddressIdCombo->text( id );
   } else {
-    mCurrentAddress = TQString::null;
+    mCurrentAddress = TQString();
   }
   readAddress( mCurrentAddress );
 }
@@ -323,7 +323,7 @@ void MainWindow::updatePhone( int id )
   if ( mPhoneIdCombo->count()  > 0 ) {
     mCurrentPhone = mPhoneIdCombo->text( id );
   } else {
-    mCurrentPhone = TQString::null;
+    mCurrentPhone = TQString();
   }
   readPhone( mCurrentPhone );
 }
@@ -452,7 +452,7 @@ void MainWindow::newEmail()
   bool ok = false;
   TQString name = KInputDialog::getText( i18n("New Email Address"),
                                         i18n("Please enter email address:"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
@@ -524,7 +524,7 @@ void MainWindow::newCategory()
   bool ok = false;
   TQString name = KInputDialog::getText( i18n("New Category"),
                                         i18n("Please enter category name:"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
@@ -583,8 +583,8 @@ void MainWindow::editCustom()
                                         this );
   if ( !ok || name.isEmpty() ) return;
 
-  int posDash = name.find( "-" );
-  int posColon = name.find( ":" );
+  int posDash = name.tqfind( "-" );
+  int posColon = name.tqfind( ":" );
   
   TQString app = name.left( posDash );
   TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );
@@ -606,12 +606,12 @@ void MainWindow::newCustom()
   TQString name = KInputDialog::getText( i18n("New Custom Entry"),
                                         i18n("Please enter custom entry.\n"
                                              "Format: APP-NAME:VALUE"),
-                                        TQString::null, &ok,
+                                        TQString(), &ok,
                                         this );
   if ( !ok || name.isEmpty() ) return;
   
-  int posDash = name.find( "-" );
-  int posColon = name.find( ":" );
+  int posDash = name.tqfind( "-" );
+  int posColon = name.tqfind( ":" );
   
   TQString app = name.left( posDash );
   TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );