summaryrefslogtreecommitdiffstats
path: root/quanta/components/tableeditor
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/components/tableeditor')
-rw-r--r--quanta/components/tableeditor/tableeditor.cpp22
-rw-r--r--quanta/components/tableeditor/tableitem.h4
2 files changed, 13 insertions, 13 deletions
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index dcc570b7..45bcf07c 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -204,7 +204,7 @@ void TableEditor::slotEditRow()
void TableEditor::slotEditCol()
{
- KMessageBox::information(this, i18n("Edit col: %1").tqarg(m_col + 1));
+ KMessageBox::information(this, i18n("Edit col: %1").arg(m_col + 1));
TagDialog dlg(QuantaCommon::tagFromDTD(m_dtd,"col"));
dlg.exec();
}
@@ -411,7 +411,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser
m_colSpin->setValue(col);
TableNode tableN = mergeMatrix[nRow - 1][col];
Node *n = tableN.node;
- setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1));
+ setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1));
m_dataTable->item(nRow-1, col)->setEnabled(false);
tableNode.node = new Node(0L);
tableNode.node->tag = new Tag(*(n->tag));
@@ -451,7 +451,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser
m_colSpin->setValue(col);
TableNode tableN = mergeMatrix[nRow - 1][col];
Node *n = tableN.node;
- setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1));
+ setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1));
m_dataTable->item(nRow-1, col)->setEnabled(false);
tableNode.node = new Node(0L);
tableNode.node->tag = new Tag(*(n->tag));
@@ -496,7 +496,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser
m_colSpin->setValue(nCol);
for (int i = 0; i < colValue - 1; i++)
{
- setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").tqarg(nRow).tqarg(lastCol));
+ setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").arg(nRow).arg(lastCol));
m_dataTable->item(nRow-1, lastCol + i)->setEnabled(false);
tableNode.node = new Node(0L);
tableNode.node->tag = new Tag(*(n->tag));
@@ -924,7 +924,7 @@ void TableEditor::slotRemoveRow()
int rowspan = mainTableNode->node->tag->attributeValue("rowspan", true).toInt();
rowspan--;
if (rowspan > 1)
- mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(rowspan));
+ mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(rowspan));
else
mainTableNode->node->tag->deleteAttribute("rowspan");
updatedMainNodes.append(mainTableNode);
@@ -975,7 +975,7 @@ void TableEditor::slotRemoveCol()
int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt();
colspan--;
if (colspan > 1)
- mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(colspan));
+ mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(colspan));
else
mainTableNode->node->tag->deleteAttribute("colspan");
updatedMainNodes.append(mainTableNode);
@@ -1054,13 +1054,13 @@ void TableEditor::slotMergeCells()
rCol = selection.rightCol();
TableNode *mainTableNode = &((*m_tableTags)[tRow][lCol]);
if (rCol - lCol > 0)
- mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(rCol - lCol + 1));
+ mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(rCol - lCol + 1));
if (bRow - tRow > 0)
- mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(bRow - tRow + 1));
+ mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(bRow - tRow + 1));
for (int i = 0; i < bRow - tRow + 1; i++)
for (int j = 0; j < rCol - lCol + 1; j++) {
if (i != 0 || j != 0) {
- setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").tqarg(tRow + 1).tqarg(lCol + 1));
+ setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").arg(tRow + 1).arg(lCol + 1));
m_dataTable->item(tRow + i, lCol + j)->setEnabled(false);
TableNode *tableNode = &((*m_tableTags)[tRow + i][lCol + j]);
Node::deleteNode(tableNode->node);
@@ -1271,7 +1271,7 @@ void TableEditor::configureCell(int row, int col, Node * node)
return;
// Header (TH) or standard cell?
item->setHeader(node->tag->name.lower() == "th");
- //Qt::Horizontal tqalignment
+ //Qt::Horizontal alignment
TQt::AlignmentFlags flags;
TQString align = node->tag->attributeValue("align", true);
if (align == "right")
@@ -1285,7 +1285,7 @@ void TableEditor::configureCell(int row, int col, Node * node)
else
flags = TQt::AlignLeft;
item->setAlignment(flags);
- //Qt::Vertical tqalignment
+ //Qt::Vertical alignment
TQString valign = node->tag->attributeValue("valign", true);
if (valign == "top")
flags = TQt::AlignTop;
diff --git a/quanta/components/tableeditor/tableitem.h b/quanta/components/tableeditor/tableitem.h
index ac9a3777..017738bf 100644
--- a/quanta/components/tableeditor/tableitem.h
+++ b/quanta/components/tableeditor/tableitem.h
@@ -35,7 +35,7 @@ public:
virtual TQWidget* createEditor() const;
// Get text from TQTextEdit
virtual void setContentFromEditor(TQWidget *w);
- // Paint cell - handle tqalignment (horizontal and vertical) and bold for header
+ // Paint cell - handle alignment (horizontal and vertical) and bold for header
virtual void paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bool selected);
// Return A bit larger sizeHint because TQTextEdit has some margin around
virtual TQSize sizeHint() const;
@@ -43,7 +43,7 @@ public:
TQt::AlignmentFlags vAlignment() {return m_valign;}
void setVAlignment(TQt::AlignmentFlags flags) {m_valign = flags;}
// Get and set horizontal aligment
- TQt::AlignmentFlags tqalignment() {return m_halign;}
+ TQt::AlignmentFlags alignment() {return m_halign;}
void setAlignment(TQt::AlignmentFlags flags) {m_halign = flags;}
// Get and set header status (use true for TH, false for TD)
bool header() {return m_header;}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 21:50:37 +0000