summaryrefslogtreecommitdiffstats
path: root/kaddressbook
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-13 15:08:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-13 15:08:46 -0600
commitd497b1b0373d758ede3d877ab68c8d7c8ab29062 (patch)
tree00ebfc47087a5fd82949fc1abf08dd7e03c1c631 /kaddressbook
parent639f34ef2efdec6ff0d1f47d919ca070d027fb80 (diff)
downloadtdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.tar.gz
tdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.zip
Fix inadvertent TQt changes
This closes Bug 752
Diffstat (limited to 'kaddressbook')
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index a860b5f6f..78cdbf562 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -465,7 +465,7 @@ void CSVImportDialog::fillTable()
int row, column;
bool lastCharDelimiter = false;
bool ignoreDups = mIgnoreDuplicates->isChecked();
- enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD,
+ enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
TQChar x;
@@ -517,7 +517,7 @@ void CSVImportDialog::fillTable()
switch ( state ) {
case S_START :
if ( x == mTextQuote ) {
- state = S_TQUOTED_FIELD;
+ state = S_QUOTED_FIELD;
} else if ( x == mDelimiter ) {
if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
++column;
@@ -530,9 +530,9 @@ void CSVImportDialog::fillTable()
state = S_MAYBE_NORMAL_FIELD;
}
break;
- case S_TQUOTED_FIELD :
+ case S_QUOTED_FIELD :
if ( x == mTextQuote ) {
- state = S_MAYBE_END_OF_TQUOTED_FIELD;
+ state = S_MAYBE_END_OF_QUOTED_FIELD;
} else if ( x == '\n' && mTextQuote.isNull() ) {
setText( row - mStartLine + 1, column, field );
field = "";
@@ -549,10 +549,10 @@ void CSVImportDialog::fillTable()
field += x;
}
break;
- case S_MAYBE_END_OF_TQUOTED_FIELD :
+ case S_MAYBE_END_OF_QUOTED_FIELD :
if ( x == mTextQuote ) {
field += x;
- state = S_TQUOTED_FIELD;
+ state = S_QUOTED_FIELD;
} else if ( x == mDelimiter || x == '\n' ) {
setText( row - mStartLine + 1, column, field );
field = "";
@@ -566,10 +566,10 @@ void CSVImportDialog::fillTable()
}
state = S_START;
} else {
- state = S_END_OF_TQUOTED_FIELD;
+ state = S_END_OF_QUOTED_FIELD;
}
break;
- case S_END_OF_TQUOTED_FIELD :
+ case S_END_OF_QUOTED_FIELD :
if ( x == mDelimiter || x == '\n' ) {
setText( row - mStartLine + 1, column, field );
field = "";
@@ -583,13 +583,13 @@ void CSVImportDialog::fillTable()
}
state = S_START;
} else {
- state = S_END_OF_TQUOTED_FIELD;
+ state = S_END_OF_QUOTED_FIELD;
}
break;
case S_MAYBE_NORMAL_FIELD :
if ( x == mTextQuote ) {
field = "";
- state = S_TQUOTED_FIELD;
+ state = S_QUOTED_FIELD;
break;
}
case S_NORMAL_FIELD :