diff options
| author | Timothy Pearson <[email protected]> | 2012-01-13 13:15:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-01-13 13:15:14 -0600 |
| commit | 735d75d6ce19269dc5faa00abc8f88ff30ce2f23 (patch) | |
| tree | 4e85ad9cc0479892232125234c6b71c4f17ac611 /kchart | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'kchart')
| -rw-r--r-- | kchart/csvimportdialog.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 2aa779ea..31b0ee3f 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -170,7 +170,7 @@ void CSVImportDialog::fillTable( ) { int row, column; bool lastCharDelimiter = false; - 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; @@ -225,7 +225,7 @@ void CSVImportDialog::fillTable( ) case S_START : if (x == m_textquote) { - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == m_delimiter) { @@ -246,10 +246,10 @@ void CSVImportDialog::fillTable( ) state = S_MAYBE_NORMAL_FIELD; } break; - case S_TQUOTED_FIELD : + case S_QUOTED_FIELD : if (x == m_textquote) { - state = S_MAYBE_END_OF_TQUOTED_FIELD; + state = S_MAYBE_END_OF_QUOTED_FIELD; } else if (x == '\n') { @@ -268,11 +268,11 @@ void CSVImportDialog::fillTable( ) 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 == m_delimiter || x == '\n') { @@ -295,10 +295,10 @@ void CSVImportDialog::fillTable( ) } 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 == m_delimiter || x == '\n') { setText(row - m_startRow, column - m_startCol, field); @@ -320,14 +320,14 @@ void CSVImportDialog::fillTable( ) } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if (x == m_textquote) { field = TQString(); - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; break; } case S_NORMAL_FIELD : |