diff options
Diffstat (limited to 'libtdepim/kimportdialog.cpp')
| -rw-r--r-- | libtdepim/kimportdialog.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index d7e5675e..60d5c24f 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -303,7 +303,7 @@ void KImportDialog::readFile( int rows ) mData.clear(); int row, column; - 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 m_textquote = '"'; @@ -347,7 +347,7 @@ void KImportDialog::readFile( int rows ) case S_START : if (x == m_textquote) { field += x; - state = S_TQUOTED_FIELD; + state = S_QUOTED_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_TQUOTED_FIELD : + case S_QUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_MAYBE_END_OF_TQUOTED_FIELD; + state = S_MAYBE_END_OF_QUOTED_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_TQUOTED_FIELD : + case S_MAYBE_END_OF_QUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_TQUOTED_FIELD; + state = S_QUOTED_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_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; - case S_END_OF_TQUOTED_FIELD : + case S_END_OF_QUOTED_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_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if (x == m_textquote) { field = ""; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } case S_NORMAL_FIELD : if (x == mSeparator || x == '\n') { |