From 84c989c19db5daab602a67f47ca0f5fd7a2b53d2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 12:01:04 -0600 Subject: Remove additional unneeded tq method conversions --- kommander/widgets/buttongroup.cpp | 4 ++-- kommander/widgets/checkbox.cpp | 4 ++-- kommander/widgets/combobox.cpp | 4 ++-- kommander/widgets/datepicker.cpp | 4 ++-- kommander/widgets/dialog.cpp | 4 ++-- kommander/widgets/execbutton.cpp | 4 ++-- kommander/widgets/groupbox.cpp | 4 ++-- kommander/widgets/label.cpp | 4 ++-- kommander/widgets/lineedit.cpp | 4 ++-- kommander/widgets/listbox.cpp | 4 ++-- kommander/widgets/pixmaplabel.cpp | 4 ++-- kommander/widgets/popupmenu.cpp | 6 +++--- kommander/widgets/progressbar.cpp | 4 ++-- kommander/widgets/radiobutton.cpp | 4 ++-- kommander/widgets/richtexteditor.cpp | 8 ++++---- kommander/widgets/spinboxint.cpp | 4 ++-- kommander/widgets/table.cpp | 6 +++--- kommander/widgets/textedit.cpp | 4 ++-- kommander/widgets/toolbox.cpp | 4 ++-- kommander/widgets/treewidget.cpp | 10 +++++----- 20 files changed, 47 insertions(+), 47 deletions(-) (limited to 'kommander/widgets') diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp index e0c8b6ed..a110889a 100644 --- a/kommander/widgets/buttongroup.cpp +++ b/kommander/widgets/buttongroup.cpp @@ -109,7 +109,7 @@ void ButtonGroup::contextMenuEvent( TQContextMenuEvent * e ) bool ButtonGroup::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); + return f == DCOP::text || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); } @@ -133,7 +133,7 @@ TQString ButtonGroup::handleDCOP(int function, const TQStringList& args) case BG_selectedId: return TQString::number(this->selectedId() ); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp index 696a9b2b..61ab0aff 100644 --- a/kommander/widgets/checkbox.cpp +++ b/kommander/widgets/checkbox.cpp @@ -102,7 +102,7 @@ void CheckBox::showEvent(TQShowEvent* e) bool CheckBox::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; + return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } void CheckBox::contextMenuEvent( TQContextMenuEvent * e ) @@ -125,7 +125,7 @@ TQString CheckBox::handleDCOP(int function, const TQStringList& args) case DCOP::setChecked: setChecked(args[0] != "false" && args[0] != "0"); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp index 844220c1..d33a5147 100644 --- a/kommander/widgets/combobox.cpp +++ b/kommander/widgets/combobox.cpp @@ -121,7 +121,7 @@ bool ComboBox::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::item || f == DCOP::removeItem || f == DCOP::insertItem || f == DCOP::insertItems || - f == DCOP::addUniqueItem || f == DCOP::clear || f == DCOP::count || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); + f == DCOP::addUniqueItem || f == DCOP::clear || f == DCOP::count || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); } TQString ComboBox::handleDCOP(int function, const TQStringList& args) @@ -192,7 +192,7 @@ TQString ComboBox::handleDCOP(int function, const TQStringList& args) case popupList: TQComboBox::popup(); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp index ffaebcae..40b29de6 100644 --- a/kommander/widgets/datepicker.cpp +++ b/kommander/widgets/datepicker.cpp @@ -101,7 +101,7 @@ void DatePicker::contextMenuEvent( TQContextMenuEvent * e ) bool DatePicker::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::hasFocus ; + return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || f == DCOP::hasFocus ; } TQString DatePicker::handleDCOP(int function, const TQStringList& args) @@ -112,7 +112,7 @@ TQString DatePicker::handleDCOP(int function, const TQStringList& args) case DCOP::setText: setDate(TQDate::fromString(args[0], Qt::ISODate)); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp index f7a3fb9b..21a3f7c1 100644 --- a/kommander/widgets/dialog.cpp +++ b/kommander/widgets/dialog.cpp @@ -193,7 +193,7 @@ void Dialog::contextMenuEvent( TQContextMenuEvent * e ) bool Dialog::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction); + return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || (f > FirstFunction && f < LastFunction); } TQString Dialog::handleDCOP(int function, const TQStringList& args) @@ -204,7 +204,7 @@ TQString Dialog::handleDCOP(int function, const TQStringList& args) case DCOP::setText: setWidgetText(args[0]); break; - case DCOP::tqgeometry: + case DCOP::geometry: return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); break; case D_focusWidget: diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index a5d9a716..3d6df7c3 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -180,7 +180,7 @@ void ExecButton::contextMenuEvent( TQContextMenuEvent * e ) bool ExecButton::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); + return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); } TQString ExecButton::handleDCOP(int function, const TQStringList& args) @@ -215,7 +215,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args) } break; } - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp index aef8042d..7d4f43e8 100644 --- a/kommander/widgets/groupbox.cpp +++ b/kommander/widgets/groupbox.cpp @@ -108,7 +108,7 @@ void GroupBox::contextMenuEvent( TQContextMenuEvent * e ) bool GroupBox::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; + return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; // || (f >= FirstFunction && f <= LastFunction); } @@ -126,7 +126,7 @@ TQString GroupBox::handleDCOP(int function, const TQStringList& args) case DCOP::setText: setTitle(args[0]); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp index 6c6eb787..2f4b0dea 100644 --- a/kommander/widgets/label.cpp +++ b/kommander/widgets/label.cpp @@ -88,7 +88,7 @@ void Label::showEvent(TQShowEvent *e) bool Label::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; + return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } TQString Label::handleDCOP(int function, const TQStringList& args) @@ -102,7 +102,7 @@ TQString Label::handleDCOP(int function, const TQStringList& args) case DCOP::clear: setWidgetText(""); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp index 07a852b7..884e8b16 100644 --- a/kommander/widgets/lineedit.cpp +++ b/kommander/widgets/lineedit.cpp @@ -124,7 +124,7 @@ void LineEdit::contextMenuEvent( TQContextMenuEvent * e ) bool LineEdit::isFunctionSupported(int f) { return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || - f == DCOP::clear || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ; + f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ; } TQString LineEdit::handleDCOP(int function, const TQStringList& args) @@ -146,7 +146,7 @@ TQString LineEdit::handleDCOP(int function, const TQStringList& args) case DCOP::setEditable: setReadOnly(args[0] == "false" || args[0] == "0"); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index 8612dea2..5f9fdf02 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -96,7 +96,7 @@ bool ListBox::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::insertItems || f == DCOP::insertItem || f == DCOP::removeItem || f == DCOP::clear || f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::item || f == DCOP::addUniqueItem || - f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; + f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } void ListBox::contextMenuEvent( TQContextMenuEvent * e ) @@ -197,7 +197,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args) strings += item(i)->text(); return strings.join("\n"); } - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp index 4bac254e..4ccf921b 100644 --- a/kommander/widgets/pixmaplabel.cpp +++ b/kommander/widgets/pixmaplabel.cpp @@ -103,7 +103,7 @@ void PixmapLabel::contextMenuEvent( TQContextMenuEvent * e ) bool PixmapLabel::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::tqgeometry; + return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry; } TQString PixmapLabel::handleDCOP(int function, const TQStringList& args) @@ -117,7 +117,7 @@ TQString PixmapLabel::handleDCOP(int function, const TQStringList& args) break; case DCOP::text: return text(); - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index ab52aac6..65bbdc7a 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -114,7 +114,7 @@ void PopupMenu::popup(int x, int y) void PopupMenu::slotMenuItemActivated(int id) { TQString widget = m_associations[id]; - KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").tqarg(widget).tqarg(id)); + KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").arg(widget).arg(id)); } void PopupMenu::populate() @@ -138,7 +138,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid bool PopupMenu::isFunctionSupported(int f) { - return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::tqgeometry; + return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::geometry; } TQString PopupMenu::handleDCOP(int function, const TQStringList& args) @@ -229,7 +229,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args) case DCOP::count: return TQString::number(m_menu->count()); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp index 19e89903..8d2a51e2 100644 --- a/kommander/widgets/progressbar.cpp +++ b/kommander/widgets/progressbar.cpp @@ -94,7 +94,7 @@ void ProgressBar::showEvent(TQShowEvent *e) bool ProgressBar::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction); + return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::geometry || (f > FirstFunction && f < LastFunction); } TQString ProgressBar::handleDCOP(int function, const TQStringList& args) @@ -111,7 +111,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args) case DCOP::setMaximum: setTotalSteps(args[0].toUInt()); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp index 317263e4..d6306c80 100644 --- a/kommander/widgets/radiobutton.cpp +++ b/kommander/widgets/radiobutton.cpp @@ -101,7 +101,7 @@ void RadioButton::contextMenuEvent( TQContextMenuEvent * e ) bool RadioButton::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; + return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } TQString RadioButton::handleDCOP(int function, const TQStringList& args) @@ -117,7 +117,7 @@ TQString RadioButton::handleDCOP(int function, const TQStringList& args) break; case DCOP::checked: return TQString::number(isOn()); - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index 0aebf718..1faa12b4 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -196,13 +196,13 @@ void RichTextEditor::fontChanged(const TQFont &a_font) m_buttonTextUnder->setOn(a_font.underline()); } -void RichTextEditor::alignmentChanged(int a_tqalignment) +void RichTextEditor::alignmentChanged(int a_alignment) { - if((a_tqalignment == AlignAuto) || (a_tqalignment & AlignLeft)) + if((a_alignment == AlignAuto) || (a_alignment & AlignLeft)) m_buttonTextLeft->setOn(true); - else if(a_tqalignment & AlignHCenter) + else if(a_alignment & AlignHCenter) m_buttonTextCenter->setOn(true); - else if(a_tqalignment & AlignRight) + else if(a_alignment & AlignRight) m_buttonTextRight->setOn(true); } diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp index cc264f34..72991376 100644 --- a/kommander/widgets/spinboxint.cpp +++ b/kommander/widgets/spinboxint.cpp @@ -101,7 +101,7 @@ void SpinBoxInt::focusInEvent( TQFocusEvent * e) bool SpinBoxInt::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum || f == DCOP::tqgeometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; + return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum || f == DCOP::geometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } TQString SpinBoxInt::handleDCOP(int function, const TQStringList& args) @@ -115,7 +115,7 @@ TQString SpinBoxInt::handleDCOP(int function, const TQStringList& args) case DCOP::setMaximum: setMaxValue(args[0].toUInt()); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp index 7d974994..862bb17a 100644 --- a/kommander/widgets/table.cpp +++ b/kommander/widgets/table.cpp @@ -114,7 +114,7 @@ void Table::setWidgetText(const TQString&) TQString Table::selectedArea() { TQTableSelection sel = selection(currentSelection()); - return TQString("%1,%2,%3,%4").tqarg(sel.topRow()).tqarg(sel.leftCol()).tqarg(sel.bottomRow()).tqarg(sel.rightCol()); + return TQString("%1,%2,%3,%4").arg(sel.topRow()).arg(sel.leftCol()).arg(sel.bottomRow()).arg(sel.rightCol()); } @@ -123,7 +123,7 @@ bool Table::isFunctionSupported(int f) return f == DCOP::currentColumn || f == DCOP::currentRow || f == DCOP::insertColumn || f == DCOP::insertRow || f == DCOP::cellText || f == DCOP::setCellText || f == DCOP::setCellWidget || f == DCOP::cellWidget || f == DCOP::columnCount || f == DCOP::removeRow || f == DCOP::removeColumn || f == DCOP::setColumnCaption || - f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); + f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); } void Table::setCellWidget(int row, int col, const TQString & _widgetName) @@ -354,7 +354,7 @@ TQString Table::handleDCOP(int function, const TQStringList& args) return "No row at index "+args[0]; break; } - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index 2c210696..2a2c5171 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -143,7 +143,7 @@ void TextEdit::contextMenuEvent( TQContextMenuEvent * e ) bool TextEdit::isFunctionSupported(int f) { - return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction); + return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction); } TQString TextEdit::handleDCOP(int function, const TQStringList& args) @@ -210,7 +210,7 @@ TQString TextEdit::handleDCOP(int function, const TQStringList& args) case TE_VAnormalScript: TQTextEdit::setVerticalAlignment(AlignNormal); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index a3249bd0..c2d37ff4 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -121,7 +121,7 @@ void ToolBox::contextMenuEvent( TQContextMenuEvent * e ) bool ToolBox::isFunctionSupported(int f) { - return f == DCOP::count || f == DCOP::tqgeometry || (f >= FIRST_FUNCTION && f <= LAST_FUNCTION) ; + return f == DCOP::count || f == DCOP::geometry || (f >= FIRST_FUNCTION && f <= LAST_FUNCTION) ; } TQString ToolBox::handleDCOP(int function, const TQStringList& args) @@ -176,7 +176,7 @@ TQString ToolBox::handleDCOP(int function, const TQStringList& args) } case DCOP::count: return TQString::number(count()); - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index c77d4b8e..914d6b7c 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -208,8 +208,8 @@ TQString TreeWidget::itemsText() if (path.isEmpty()) items.append(itemText(it.current())); else - items.append(TQString("%1%2%3").tqarg(path).tqarg(m_pathSeparator) - .tqarg(itemText(it.current()))); + items.append(TQString("%1%2%3").arg(path).arg(m_pathSeparator) + .arg(itemText(it.current()))); ++it; } return items.join("\n"); @@ -307,7 +307,7 @@ bool TreeWidget::isFunctionSupported(int f) return f == DCOP::insertItem || f == DCOP::text || f == DCOP::setText || f == DCOP::insertItems || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::removeItem || f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::findItem || f == DCOP::item || - f == DCOP::itemPath || f == DCOP::itemDepth || f == DCOP::setPixmap || f == DCOP::setColumnCaption || f == DCOP::removeColumn || f == DCOP::columnCount || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f > FirstFunction && f < LastFunction) || (f >= TW_FUNCTION && f <= TW_LAST_FUNCTION); + f == DCOP::itemPath || f == DCOP::itemDepth || f == DCOP::setPixmap || f == DCOP::setColumnCaption || f == DCOP::removeColumn || f == DCOP::columnCount || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f > FirstFunction && f < LastFunction) || (f >= TW_FUNCTION && f <= TW_LAST_FUNCTION); } TQString TreeWidget::handleDCOP(int function, const TQStringList& args) @@ -342,7 +342,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args) { if (it.current()->isSelected()) { - selection.append(TQString("%1\n").tqarg(itemToIndexSafe(it.current()))); + selection.append(TQString("%1\n").arg(itemToIndexSafe(it.current()))); } ++it; } @@ -494,7 +494,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args) case TW_childCount: return TQString::number(childCount()); break; - case DCOP::tqgeometry: + case DCOP::geometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; -- cgit v1.2.1