1 files changed, 18 insertions, 18 deletions

diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp
index cb59200a6..904415982 100644
--- a/libkdepim/kimportdialog.cpp
+++ b/libkdepim/kimportdialog.cpp
@@ -130,7 +130,7 @@ TQString KImportColumn::convert()
 
 class ColumnItem : public TQListViewItem {
   public:
-    ColumnItem(KImportColumn *col,TQListView *parent) : TQListViewItem(parent), mColumn(col)
+    ColumnItem(KImportColumn *col,TQListView *tqparent) : TQListViewItem(tqparent), mColumn(col)
     {
       setText(0,mColumn->header());
     }
@@ -148,8 +148,8 @@ class ColumnItem : public TQListViewItem {
   data objects, this class has to be inherited by a special class, which
   reimplements the convertRow() function.
 */
-KImportDialog::KImportDialog(TQWidget* parent)
-    : KDialogBase(parent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
+KImportDialog::KImportDialog(TQWidget* tqparent)
+    : KDialogBase(tqparent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
       mSeparator(","),
       mCurrentRow(0)
 {
@@ -303,7 +303,7 @@ void KImportDialog::readFile( int rows )
   mData.clear();
 
   int row, column;
-  enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
+  enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD,
          S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
 
   TQChar m_textquote = '"';
@@ -347,7 +347,7 @@ void KImportDialog::readFile( int rows )
       case S_START :
         if (x == m_textquote) {
           field += x;
-          state = S_QUOTED_FIELD;
+          state = S_TQUOTED_FIELD;
         } else if (x == mSeparator) {
           ++column;
         } else if (x == '\n')  {
@@ -358,10 +358,10 @@ void KImportDialog::readFile( int rows )
           state = S_MAYBE_NORMAL_FIELD;
         }
         break;
-      case S_QUOTED_FIELD :
+      case S_TQUOTED_FIELD :
         if (x == m_textquote) {
           field += x;
-          state = S_MAYBE_END_OF_QUOTED_FIELD;
+          state = S_MAYBE_END_OF_TQUOTED_FIELD;
         } else if (x == '\n') {
           setData(row - m_startline, column, field);
           field = "";
@@ -376,10 +376,10 @@ void KImportDialog::readFile( int rows )
           field += x;
         }
         break;
-      case S_MAYBE_END_OF_QUOTED_FIELD :
+      case S_MAYBE_END_OF_TQUOTED_FIELD :
         if (x == m_textquote) {
           field += x;
-          state = S_QUOTED_FIELD;
+          state = S_TQUOTED_FIELD;
         } else if (x == mSeparator || x == '\n') {
           setData(row - m_startline, column, field);
           field = "";
@@ -391,10 +391,10 @@ void KImportDialog::readFile( int rows )
           }
           state = S_START;
         } else {
-          state = S_END_OF_QUOTED_FIELD;
+          state = S_END_OF_TQUOTED_FIELD;
         }
         break;
-      case S_END_OF_QUOTED_FIELD :
+      case S_END_OF_TQUOTED_FIELD :
         if (x == mSeparator || x == '\n') {
           setData(row - m_startline, column, field);
           field = "";
@@ -406,13 +406,13 @@ void KImportDialog::readFile( int rows )
           }
           state = S_START;
         } else {
-          state = S_END_OF_QUOTED_FIELD;
+          state = S_END_OF_TQUOTED_FIELD;
         }
         break;
       case S_MAYBE_NORMAL_FIELD :
         if (x == m_textquote) {
           field = "";
-          state = S_QUOTED_FIELD;
+          state = S_TQUOTED_FIELD;
         }
       case S_NORMAL_FIELD :
         if (x == mSeparator || x == '\n') {
@@ -443,7 +443,7 @@ void KImportDialog::setCellText(int row, int col, const TQString& text)
   if ((mTable->numRows() - 1) < row) mTable->setNumRows(row + 1);
   if ((mTable->numCols() - 1) < col) mTable->setNumCols(col + 1);
 
-  KImportColumn *c = mColumnDict.find(col);
+  KImportColumn *c = mColumnDict.tqfind(col);
   TQString formattedText;
   if (c) formattedText = c->preview(text,findFormat(col));
   else formattedText = text;
@@ -492,7 +492,7 @@ void KImportDialog::tableSelected()
   TQTableSelection selection = mTable->selection(mTable->currentSelection());
 
   TQListViewItem *item = mHeaderList->firstChild();
-  KImportColumn *col = mColumnDict.find(selection.leftCol());
+  KImportColumn *col = mColumnDict.tqfind(selection.leftCol());
   if (col) {
     while(item) {
       if (item->text(0) == col->header()) {
@@ -633,7 +633,7 @@ void KImportDialog::removeColumn()
   for(int i=selection.leftCol();i<=selection.rightCol();++i) {
     if (i >= 0) {
       mTable->horizontalHeader()->setLabel(i,TQString::number(i+1));
-      KImportColumn *col = mColumnDict.find(i);
+      KImportColumn *col = mColumnDict.tqfind(i);
       if (col) {
         mColumnDict.remove(i);
         mFormats.remove(i);
@@ -674,7 +674,7 @@ void KImportDialog::applyConverter()
 
 int KImportDialog::findFormat(int column)
 {
-  TQMap<int,int>::ConstIterator formatIt = mFormats.find(column);
+  TQMap<int,int>::ConstIterator formatIt = mFormats.tqfind(column);
   int format;
   if (formatIt == mFormats.end()) format = KImportColumn::FormatUndefined;
   else format = *formatIt;
@@ -713,7 +713,7 @@ void KImportDialog::setData( uint row, uint col, const TQString &value )
     rowVector->resize( col + 1 );
   }
   
-  KImportColumn *c = mColumnDict.find( col );
+  KImportColumn *c = mColumnDict.tqfind( col );
   if ( c )
   	rowVector->at( col ) = c->preview( val, findFormat(col) );
   else