1 files changed, 35 insertions, 35 deletions

diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 091d277f..4b0a1c9e 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -41,7 +41,7 @@
 #include <kinputdialog.h>
 #include <tdemessagebox.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "dateparser.h"
@@ -121,33 +121,33 @@ CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent,
 
   reloadCodecs();
 
-  connect( mDelimiterBox, TQT_SIGNAL( clicked( int ) ),
-           this, TQT_SLOT( delimiterClicked( int ) ) );
-  connect( mDelimiterEdit, TQT_SIGNAL( returnPressed() ),
-           this, TQT_SLOT( returnPressed() ) );
-  connect( mDelimiterEdit, TQT_SIGNAL( textChanged ( const TQString& ) ),
-           this, TQT_SLOT( textChanged ( const TQString& ) ) );
-  connect( mComboLine, TQT_SIGNAL( activated( const TQString& ) ),
-           this, TQT_SLOT( lineSelected( const TQString& ) ) );
-  connect( mComboQuote, TQT_SIGNAL( activated( const TQString& ) ),
-           this, TQT_SLOT( textquoteSelected( const TQString& ) ) );
-  connect( mIgnoreDuplicates, TQT_SIGNAL( stateChanged( int ) ),
-           this, TQT_SLOT( ignoreDuplicatesChanged( int ) ) );
-  connect( mCodecCombo, TQT_SIGNAL( activated( const TQString& ) ),
-           this, TQT_SLOT( codecChanged() ) );
-
-  connect( mUrlRequester, TQT_SIGNAL( returnPressed( const TQString& ) ),
-           this, TQT_SLOT( setFile( const TQString& ) ) );
-  connect( mUrlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ),
-           this, TQT_SLOT( setFile( const TQString& ) ) );
-  connect( mUrlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString& ) ),
-           this, TQT_SLOT( urlChanged( const TQString& ) ) );
-
-  connect( this, TQT_SIGNAL( user1Clicked() ),
-           this, TQT_SLOT( applyTemplate() ) );
-
-  connect( this, TQT_SIGNAL( user2Clicked() ),
-           this, TQT_SLOT( saveTemplate() ) );
+  connect( mDelimiterBox, TQ_SIGNAL( clicked( int ) ),
+           this, TQ_SLOT( delimiterClicked( int ) ) );
+  connect( mDelimiterEdit, TQ_SIGNAL( returnPressed() ),
+           this, TQ_SLOT( returnPressed() ) );
+  connect( mDelimiterEdit, TQ_SIGNAL( textChanged ( const TQString& ) ),
+           this, TQ_SLOT( textChanged ( const TQString& ) ) );
+  connect( mComboLine, TQ_SIGNAL( activated( const TQString& ) ),
+           this, TQ_SLOT( lineSelected( const TQString& ) ) );
+  connect( mComboQuote, TQ_SIGNAL( activated( const TQString& ) ),
+           this, TQ_SLOT( textquoteSelected( const TQString& ) ) );
+  connect( mIgnoreDuplicates, TQ_SIGNAL( stateChanged( int ) ),
+           this, TQ_SLOT( ignoreDuplicatesChanged( int ) ) );
+  connect( mCodecCombo, TQ_SIGNAL( activated( const TQString& ) ),
+           this, TQ_SLOT( codecChanged() ) );
+
+  connect( mUrlRequester, TQ_SIGNAL( returnPressed( const TQString& ) ),
+           this, TQ_SLOT( setFile( const TQString& ) ) );
+  connect( mUrlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ),
+           this, TQ_SLOT( setFile( const TQString& ) ) );
+  connect( mUrlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString& ) ),
+           this, TQ_SLOT( urlChanged( const TQString& ) ) );
+
+  connect( this, TQ_SIGNAL( user1Clicked() ),
+           this, TQ_SLOT( applyTemplate() ) );
+
+  connect( this, TQ_SIGNAL( user2Clicked() ),
+           this, TQ_SLOT( saveTemplate() ) );
 }
 
 CSVImportDialog::~CSVImportDialog()
@@ -166,7 +166,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
   progressDialog.setLabel( i18n( "Importing contacts" ) );
   progressDialog.show();
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   for ( int row = 1; row < mTable->numRows(); ++row ) {
     TDEABC::Addressee a;
@@ -344,7 +344,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
       }
     }
 
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     if ( progressDialog.wasCancelled() )
       return TDEABC::AddresseeList();
@@ -383,7 +383,7 @@ void CSVImportDialog::initGUI()
 
   // Delimiter: comma, semicolon, tab, space, other
   mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
-  mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
+  mDelimiterBox->setColumnLayout( 0, TQt::Vertical );
   mDelimiterBox->layout()->setSpacing( spacingHint() );
   mDelimiterBox->layout()->setMargin( marginHint() );
   TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
@@ -792,12 +792,12 @@ void CSVImportDialog::applyTemplate()
   TQStringList templates;
 
   // load all template files
-  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) +
+  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) +
       "/csv-templates/*.desktop", true, true );
 
   for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it )
   {
-    KSimpleConfig config( *it, true );
+    TDESimpleConfig config( *it, true );
 
     if ( !config.hasGroup( "csv column map" ) )
 	    continue;
@@ -817,7 +817,7 @@ void CSVImportDialog::applyTemplate()
   if ( !ok )
     return;
 
-  KSimpleConfig config( fileMap[ tmp ], true );
+  TDESimpleConfig config( fileMap[ tmp ], true );
   config.setGroup( "General" );
   mDatePatternEdit->setText( config.readEntry( "DatePattern", "Y-M-D" ) );
   uint numColumns = config.readUnsignedNumEntry( "Columns" );
@@ -848,7 +848,7 @@ void CSVImportDialog::applyTemplate()
 void CSVImportDialog::saveTemplate()
 {
   TQString fileName = KFileDialog::getSaveFileName(
-                     locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ),
+                     locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ),
                      "*.desktop", this );
 
   if ( fileName.isEmpty() )