diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
| commit | 735d75d6ce19269dc5faa00abc8f88ff30ce2f23 (patch) | |
| tree | 4e85ad9cc0479892232125234c6b71c4f17ac611 /filters/kspread | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'filters/kspread')
| -rw-r--r-- | filters/kspread/csv/csvdialog.cpp | 18 | ||||
| -rw-r--r-- | filters/kspread/csv/status.html | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 0464b782..75ddc2a5 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -159,7 +159,7 @@ void CSVDialog::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; @@ -214,7 +214,7 @@ void CSVDialog::fillTable( ) case S_START : if (x == m_textquote) { - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == m_delimiter) { @@ -235,21 +235,21 @@ void CSVDialog::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 { 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') { @@ -272,10 +272,10 @@ void CSVDialog::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); @@ -300,7 +300,7 @@ void CSVDialog::fillTable( ) if (x == m_textquote) { field = TQString(); - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; break; } case S_NORMAL_FIELD : diff --git a/filters/kspread/csv/status.html b/filters/kspread/csv/status.html index 497ee00a..c4379ade 100644 --- a/filters/kspread/csv/status.html +++ b/filters/kspread/csv/status.html @@ -98,11 +98,11 @@ Let's try to draw the graph of the state machine using ascii-art. /--\ | | | v " - /--[START]-------->[TQUOTED_FIELD] (**) + /--[START]-------->[QUOTED_FIELD] (**) other| ^ ^ | ^ (*) | | | DEL or | " | " (*) | | | EOL v | other - | | \----[MAYBE_END_OF_TQUOTED_FIELD]--------> Error + | | \----[MAYBE_END_OF_QUOTED_FIELD]--------> Error | | | | DEL or | | EOL |