summaryrefslogtreecommitdiffstats
path: root/quanta/components/tableeditor/tableeditor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/components/tableeditor/tableeditor.cpp')
-rw-r--r--quanta/components/tableeditor/tableeditor.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index e9475242..c49d2be0 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -152,7 +152,7 @@ void TableEditor::slotContextMenuRequested( int row, int col, const TQPoint & po
TQTableSelection selection = m_dataTable->selection(m_dataTable->currentSelection());
TQRect rect(TQPoint(selection.topRow(), selection.leftCol()) ,
TQPoint(selection.bottomRow(), selection.rightCol()));
- if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.tqcontains(m_row, m_col)) {
+ if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.contains(m_row, m_col)) {
m_popup->setItemVisible(m_mergeCellsId, true);
m_popup->setItemVisible(m_mergeSeparatorId, true);
}
@@ -919,7 +919,7 @@ void TableEditor::slotRemoveRow()
if ((*it3).merged)
{
TableNode *mainTableNode = &((*m_tableTags)[(*it3).mergedRow][(*it3).mergedCol]);
- if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode))
+ if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode))
{
int rowspan = mainTableNode->node->tag->attributeValue("rowspan", true).toInt();
rowspan--;
@@ -970,7 +970,7 @@ void TableEditor::slotRemoveCol()
if ((*it2).merged)
{
TableNode *mainTableNode = &((*m_tableTags)[(*it2).mergedRow][(*it2).mergedCol]);
- if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode))
+ if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode))
{
int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt();
colspan--;
@@ -1163,7 +1163,7 @@ void TableEditor::slotEditChildTable()
table = *it;
if (table.row == m_row && table.col == m_col) {
TQString cellData = m_dataTable->text(table.row, table.col);
- int pos = cellData.tqfind(table.nestedData);
+ int pos = cellData.find(table.nestedData);
if (pos == -1) {
KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table"));
error = true;
@@ -1182,9 +1182,9 @@ void TableEditor::slotEditChildTable()
baseNode = localParser->parse(w);
tempDocCreated = true;
//try to find the child table position
- int pos2 = tableData.tqfind(cellData);
+ int pos2 = tableData.find(cellData);
if (pos2 != -1)
- pos2 = tableData.tqfind(table.nestedData, pos2);
+ pos2 = tableData.find(table.nestedData, pos2);
else {
KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table"));
error = true;
@@ -1192,8 +1192,8 @@ void TableEditor::slotEditChildTable()
break;
}
tableData = tableData.left(pos2);
- table.bLine = tableData.tqcontains('\n');
- pos2 = tableData.tqfindRev('\n');
+ table.bLine = tableData.contains('\n');
+ pos2 = tableData.findRev('\n');
if (pos2 != -1) {
table.bCol = tableData.length() - pos2;
} else {
@@ -1214,7 +1214,7 @@ void TableEditor::slotEditChildTable()
if (editor.exec()) {
int length = table.nestedData.length();
(*it).nestedData = editor.readModifiedTable();
- cellData.tqreplace(pos, length, (*it).nestedData);
+ cellData.replace(pos, length, (*it).nestedData);
setCellText(m_dataTable, table.row, table.col, cellData);
}
//cleanup on success