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 /kspread | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'kspread')
| -rw-r--r-- | kspread/dialogs/kspread_dlg_csv.cc | 20 | ||||
| -rw-r--r-- | kspread/kspread_functions_math.cc | 2 | ||||
| -rw-r--r-- | kspread/kspread_global.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index 09da5d58..6cd77574 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -286,7 +286,7 @@ void CSVDialog::fillSheet() int row, column; bool lastCharDelimiter = false; bool ignoreDups = m_ignoreDuplicates->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; @@ -318,7 +318,7 @@ void CSVDialog::fillSheet() case S_START : if (x == m_textquote) { - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == m_delimiter) { @@ -337,10 +337,10 @@ void CSVDialog::fillSheet() 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') { @@ -364,11 +364,11 @@ void CSVDialog::fillSheet() 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') { @@ -389,10 +389,10 @@ void CSVDialog::fillSheet() } 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_startline, column, field); @@ -412,14 +412,14 @@ void CSVDialog::fillSheet() } 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; break; } case S_NORMAL_FIELD : diff --git a/kspread/kspread_functions_math.cc b/kspread/kspread_functions_math.cc index 8ee54a1a..b34996f6 100644 --- a/kspread/kspread_functions_math.cc +++ b/kspread/kspread_functions_math.cc @@ -502,7 +502,7 @@ Value func_int (valVector args, ValueCalc *calc, FuncExtra *) return calc->conv()->asInteger (args[0]); } -// Function: TQUOTIENT +// Function: QUOTIENT Value func_quotient (valVector args, ValueCalc *calc, FuncExtra *) { if (calc->isZero (args[1])) diff --git a/kspread/kspread_global.h b/kspread/kspread_global.h index 6ec5f836..205bb4eb 100644 --- a/kspread/kspread_global.h +++ b/kspread/kspread_global.h @@ -183,7 +183,7 @@ enum ToolEditMode { //INS_AUTOFORM = 10, //INS_FREEHAND = 11, //INS_POLYLINE = 12, - //INS_TQUADRICBEZIERCURVE = 13, + //INS_QUADRICBEZIERCURVE = 13, //INS_CUBICBEZIERCURVE = 14, //INS_POLYGON = 15, INS_PICTURE = 16 @@ -192,7 +192,7 @@ enum ToolEditMode { //TEM_ZOOM = 19, //INS_CLOSED_FREEHAND = 20, //INS_CLOSED_POLYLINE = 21, - //INS_CLOSED_TQUADRICBEZIERCURVE = 22, + //INS_CLOSED_QUADRICBEZIERCURVE = 22, //INS_CLOSED_CUBICBEZIERCURVE = 23 }; |