diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 330c33ab6f97b279737bf9527c9add7bb1475450 (patch) | |
tree | 85cb998d3077ae295d65944ebb4d0189fc660ead /src/newui | |
parent | 093de0db4fea89b3f94a2359c6981f353d035eb7 (diff) | |
download | tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.tar.gz tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/newui')
-rw-r--r-- | src/newui/button.cpp | 6 | ||||
-rw-r--r-- | src/newui/buttonbar.cpp | 6 | ||||
-rw-r--r-- | src/newui/ddockwindow.cpp | 2 | ||||
-rw-r--r-- | src/newui/dmainwindow.cpp | 20 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 1795b18a..1e28a827 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -78,7 +78,7 @@ Button::~Button() if (r.search(m_realText) > -1) { TQString text = m_realText; - if (text.tqcontains(r2)) + if (text.contains(r2)) text.remove(r2); config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1)); } @@ -304,7 +304,7 @@ void Button::contextMenuEvent(TQContextMenuEvent *e) TQPopupMenu menu; m_assignAccelAction->plug(&menu); - if (m_realText.tqcontains(TQRegExp("^&[0-9]\\s"))) + if (m_realText.contains(TQRegExp("^&[0-9]\\s"))) m_clearAccelAction->plug(&menu); emit contextMenu( &menu ); @@ -340,7 +340,7 @@ TQString Button::realTextWithoutAccel() const { TQString text = m_realText; TQRegExp r("^&[0-9]\\s"); - if (text.tqcontains(r)) + if (text.contains(r)) text.remove(r); return text; } diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp index 342e3491..55f55fb4 100644 --- a/src/newui/buttonbar.cpp +++ b/src/newui/buttonbar.cpp @@ -249,7 +249,7 @@ void ButtonBar::deshrink(int preferredDimension, int actualDimension) int i = 0; for (TQValueList<uint>::iterator it = texts.begin(); it != texts.end(); ++it, i++) { - if (m_buttons[i]->text().tqcontains("...")) + if (m_buttons[i]->text().contains("...")) (*it)++; newTextLength += *it; } @@ -309,7 +309,7 @@ Button *ButtonBar::firstButton() Button *ButtonBar::nextTo(Button *button) { - ButtonList::iterator it = m_buttons.tqfind(button); + ButtonList::iterator it = m_buttons.find(button); Button *next = 0; if ((*it) == m_buttons.last()) next = m_buttons.first(); @@ -326,7 +326,7 @@ Button *ButtonBar::nextTo(Button *button) Button *ButtonBar::prevTo(Button *button) { - ButtonList::iterator it = m_buttons.tqfind(button); + ButtonList::iterator it = m_buttons.find(button); Button *prev = 0; if (it == m_buttons.begin()) prev = m_buttons.last(); diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 95b36eab..8394b00f 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -404,7 +404,7 @@ void DDockWindow::moveToDockBottom() void DDockWindow::moveToDock(DDockWindow::Position position ) { - if ( m_widgets.tqcontains( m_lastContextMenuButton ) ) + if ( m_widgets.contains( m_lastContextMenuButton ) ) { mainWindow()->moveWidget( position, m_widgets[ m_lastContextMenuButton ], m_lastContextMenuButton->realTextWithoutAccel() ); } diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 2343b044..68e8883d 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -116,10 +116,10 @@ void DMainWindow::addWidget(DTabWidget *tab, TQWidget *widget, const TQString &t void DMainWindow::removeWidget(TQWidget *widget) { - if (!m_widgets.tqcontains(widget)) + if (!m_widgets.contains(widget)) return; //not a widget in main window - if (m_widgetTabs.tqcontains(widget)) + if (m_widgetTabs.contains(widget)) { DTabWidget *tab = m_widgetTabs[widget]; if (tab->indexOf(widget) >= 0) @@ -188,12 +188,12 @@ void DMainWindow::invalidateActiveTabWidget() kdDebug(9000) << "tqinvalidate: " << focused << endl; if (focused == 0) return; - if (!m_widgets.tqcontains(focused)) + if (!m_widgets.contains(focused)) { kdDebug(9000) << " focused is not in m_widgets" << endl; return; } - if (m_widgetTabs.tqcontains(focused)) + if (m_widgetTabs.contains(focused)) { kdDebug(9000) << " focused is in m_widgets and m_widgetTabs" << endl; DTabWidget *tab = m_widgetTabs[focused]; @@ -218,7 +218,7 @@ DTabWidget *DMainWindow::createTab() bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev) { TQWidget *w = (TQWidget*)obj; - if (!m_widgets.tqcontains(w)) + if (!m_widgets.contains(w)) return KParts::MainWindow::eventFilter(obj, ev); if ((m_currentWidget != w) && (ev->type() == TQEvent::FocusIn)) @@ -228,7 +228,7 @@ bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev) } else if (ev->type() == TQEvent::IconChange) { - if (m_widgetTabs.tqcontains(w)) + if (m_widgetTabs.contains(w)) { DTabWidget *tab = m_widgetTabs[w]; tab->setTabIconSet(w, w->icon() ? (*(w->icon())) : TQPixmap()); @@ -261,7 +261,7 @@ void DMainWindow::closeTab(TQWidget *) void DMainWindow::moveWidget(DDockWindow::Position position, TQWidget * view, const TQString & title) { - if (m_docks.tqcontains(view)) + if (m_docks.contains(view)) { toolWindow(m_docks[view])->removeWidget(view); @@ -285,7 +285,7 @@ void DMainWindow::removeDockWidget(TQWidget *view) bool DMainWindow::hasDockWidget(TQWidget *view) { - return m_docks.tqcontains(view); + return m_docks.contains(view); } DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) @@ -297,7 +297,7 @@ void DMainWindow::widgetDestroyed() { TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); - if (m_docks.tqcontains(w)) + if (m_docks.contains(w)) { kdError() << "Widget destroyed before being removed from UI!" << endl; m_docks.remove(w); @@ -306,4 +306,4 @@ void DMainWindow::widgetDestroyed() #include "dmainwindow.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on |