diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:41:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:41:14 -0600 |
commit | 26f93a7d9105483b49ae930545ddb2873156fa8e (patch) | |
tree | bd208384438ff06193cc1a0a1548a9d69a83cd41 /src/gui | |
parent | 8d9b90ca794ffabf151719c2edebe9278a2d3f36 (diff) | |
download | tellico-26f93a7d9105483b49ae930545ddb2873156fa8e.tar.gz tellico-26f93a7d9105483b49ae930545ddb2873156fa8e.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/counteditem.cpp | 4 | ||||
-rw-r--r-- | src/gui/fieldwidget.cpp | 4 | ||||
-rw-r--r-- | src/gui/imagewidget.cpp | 2 | ||||
-rw-r--r-- | src/gui/lineedit.cpp | 10 | ||||
-rw-r--r-- | src/gui/listview.cpp | 14 | ||||
-rw-r--r-- | src/gui/listview.h | 2 | ||||
-rw-r--r-- | src/gui/ratingwidget.cpp | 2 | ||||
-rw-r--r-- | src/gui/tablefieldwidget.cpp | 6 |
8 files changed, 22 insertions, 22 deletions
diff --git a/src/gui/counteditem.cpp b/src/gui/counteditem.cpp index 9f9da7a..536d08e 100644 --- a/src/gui/counteditem.cpp +++ b/src/gui/counteditem.cpp @@ -73,7 +73,7 @@ void CountedItem::paintCell(TQPainter* p_, const TQColorGroup& cg_, } TQFontMetrics fm = p_->fontMetrics(); - TQString numText = TQString::fromLatin1(" (%1)").tqarg(count()); + TQString numText = TQString::fromLatin1(" (%1)").arg(count()); // don't call CountedListViewItem::width() because that includes the count already int w = ListViewItem::width(fm, listView(), column_); int countWidth = fm.width(numText); @@ -106,7 +106,7 @@ int CountedItem::width(const TQFontMetrics& fm_, const TQListView* lv_, int colu // show count is only for first column if(column_ == 0) { - TQString numText = TQString::fromLatin1(" (%1)").tqarg(count()); + TQString numText = TQString::fromLatin1(" (%1)").arg(count()); w += fm_.width(numText) + 2; // add a little pad } return w; diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp index a76b763..82ad186 100644 --- a/src/gui/fieldwidget.cpp +++ b/src/gui/fieldwidget.cpp @@ -98,7 +98,7 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n } Data::Field::Type type = field_->type(); - TQString s = i18n("Edit Label", "%1:").tqarg(field_->title()); + TQString s = i18n("Edit Label", "%1:").arg(field_->title()); if(type == Data::Field::URL) { // set URL to null for now m_label = new KURLLabel(TQString(), s, this); @@ -192,7 +192,7 @@ void FieldWidget::registerWidget() { void FieldWidget::updateField(Data::FieldPtr oldField_, Data::FieldPtr newField_) { m_field = newField_; - m_label->setText(i18n("Edit Label", "%1:").tqarg(newField_->title())); + m_label->setText(i18n("Edit Label", "%1:").arg(newField_->title())); updateGeometry(); TQWhatsThis::add(this, newField_->description()); updateFieldHook(oldField_, newField_); diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp index 67bba47..06e5fbf 100644 --- a/src/gui/imagewidget.cpp +++ b/src/gui/imagewidget.cpp @@ -179,7 +179,7 @@ void ImageWidget::mousePressEvent(TQMouseEvent* event_) { if(event_->button() == Qt::LeftButton) { // Store the position of the mouse press. // check if position is inside the label - if(m_label->tqgeometry().contains(event_->pos())) { + if(m_label->geometry().contains(event_->pos())) { m_dragStart = event_->pos(); } else { m_dragStart = TQPoint(); diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp index cca7f7d..1936795 100644 --- a/src/gui/lineedit.cpp +++ b/src/gui/lineedit.cpp @@ -34,25 +34,25 @@ LineEdit::LineEdit(TQWidget* parent_, const char* name_) : KLineEdit(parent_, na void LineEdit::clear() { KLineEdit::clear(); m_drawHint = true; - tqrepaint(); + repaint(); } void LineEdit::setText(const TQString& text_) { m_drawHint = text_.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText(text_); } void LineEdit::setHint(const TQString& hint_) { m_hint = hint_; m_drawHint = text().isEmpty(); - tqrepaint(); + repaint(); } void LineEdit::focusInEvent(TQFocusEvent* event_) { if(m_drawHint) { m_drawHint = false; - tqrepaint(); + repaint(); } KLineEdit::focusInEvent(event_); } @@ -60,7 +60,7 @@ void LineEdit::focusInEvent(TQFocusEvent* event_) { void LineEdit::focusOutEvent(TQFocusEvent* event_) { if(text().isEmpty()) { m_drawHint = true; - tqrepaint(); + repaint(); } KLineEdit::focusOutEvent(event_); } diff --git a/src/gui/listview.cpp b/src/gui/listview.cpp index c3c3998..4b8c250 100644 --- a/src/gui/listview.cpp +++ b/src/gui/listview.cpp @@ -147,7 +147,7 @@ int ListView::compare(int col, const GUI::ListViewItem* item1, GUI::ListViewItem void ListView::setShadeSortColumn(bool shade_) { if(m_shadeSortColumn != shade_) { m_shadeSortColumn = shade_; - tqrepaint(); + repaint(); } } #endif @@ -181,7 +181,7 @@ void ListView::slotUpdateColors() { } #endif Tellico::updateContrastColor(viewport()->colorGroup()); - tqrepaint(); + repaint(); } void ListView::slotSelectionChanged() { @@ -196,7 +196,7 @@ void ListView::slotSelectionChanged() { m_isClear = false; Data::EntryVec entries; - // now just find all the tqchildren or grandtqchildren that are entry items + // now just find all the children or grandchildren that are entry items for(GUI::ListViewItemListIt it(m_selectedItems); it.current(); ++it) { Data::EntryVec more = it.current()->entries(); for(Data::EntryVecIt entry = more.begin(); entry != more.end(); ++entry) { @@ -214,8 +214,8 @@ void ListView::slotDoubleClicked(TQListViewItem* item_) { return; } - // if it has tqchildren, just open it - // but some items delay tqchildren creation + // if it has children, just open it + // but some items delay children creation if(static_cast<ListViewItem*>(item_)->realChildCount() > 0) { item_->setOpen(!item_->isOpen()); } @@ -234,8 +234,8 @@ void ListView::drawContentsOffset(TQPainter* p, int ox, int oy, int cx, int cy, /* ****************** ListViewItem ********************* */ ListViewItem::~ListViewItem() { - // I think there's a bug in qt where the tqchildren of this item are deleted after the item itself - // as a result, there is no listView() pointer for the tqchildren, that obvious causes + // I think there's a bug in qt where the children of this item are deleted after the item itself + // as a result, there is no listView() pointer for the children, that obvious causes // a problem with updating the selection. So we MUST call clear() here ourselves! clear(); // be sure to remove from selected list when it's deleted diff --git a/src/gui/listview.h b/src/gui/listview.h index 06efff5..d54eab6 100644 --- a/src/gui/listview.h +++ b/src/gui/listview.h @@ -162,7 +162,7 @@ public: */ virtual TQColor backgroundColor(int column); // not virtual in KListViewItem!!! virtual void paintCell(TQPainter* painter, const TQColorGroup& colorGroup, - int column, int width, int tqalignment); + int column, int width, int alignment); ListView* listView () const { return static_cast<ListView*>(KListViewItem::listView()); } diff --git a/src/gui/ratingwidget.cpp b/src/gui/ratingwidget.cpp index f3b52ec..ae30dcd 100644 --- a/src/gui/ratingwidget.cpp +++ b/src/gui/ratingwidget.cpp @@ -43,7 +43,7 @@ const TQPixmap& RatingWidget::pixmap(const TQString& value_) { return *pixmaps[n]; } - TQString picName = TQString::fromLatin1("stars%1").tqarg(n); + TQString picName = TQString::fromLatin1("stars%1").arg(n); TQPixmap* pix = new TQPixmap(UserIcon(picName)); pixmaps.insert(n, pix); return *pix; diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp index 9c7581c..81c9dba 100644 --- a/src/gui/tablefieldwidget.cpp +++ b/src/gui/tablefieldwidget.cpp @@ -182,7 +182,7 @@ void TableFieldWidget::slotRenameColumn() { name, &ok, this); if(ok && !newName.isEmpty()) { Data::FieldPtr newField = new Data::Field(*m_field); - newField->setProperty(TQString::fromLatin1("column%1").tqarg(m_col+1), newName); + newField->setProperty(TQString::fromLatin1("column%1").arg(m_col+1), newName); if(Kernel::self()->modifyField(newField)) { m_field = newField; labelColumns(m_field); @@ -201,9 +201,9 @@ bool TableFieldWidget::emptyRow(int row_) const { void TableFieldWidget::labelColumns(Data::FieldPtr field_) { for(int i = 0; i < m_columns; ++i) { - TQString s = field_->property(TQString::fromLatin1("column%1").tqarg(i+1)); + TQString s = field_->property(TQString::fromLatin1("column%1").arg(i+1)); if(s.isEmpty()) { - s = i18n("Column %1").tqarg(i+1); + s = i18n("Column %1").arg(i+1); } m_table->horizontalHeader()->setLabel(i, s); } |