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

19 files changed, 60 insertions, 60 deletions

diff --git a/src/core.cpp b/src/core.cpp
index 6dc493bf..c189fcf8 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -46,7 +46,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client)
       if (tooltip.isEmpty())
         tooltip = action->text().remove('&');
       else {
-        int i = tooltip.tqfindRev('(');
+        int i = tooltip.findRev('(');
         if (i > 0) tooltip = tooltip.left(i).stripWhiteSpace();
       }
 
@@ -109,8 +109,8 @@ namespace MainWindowUtils{
 TQString beautifyToolTip(const TQString& text)
 {
     TQString temp = text;
-    temp.tqreplace(TQRegExp("&"), "");
-    temp.tqreplace(TQRegExp("\\.\\.\\."), "");
+    temp.replace(TQRegExp("&"), "");
+    temp.replace(TQRegExp("\\.\\.\\."), "");
     return temp;
 }
 }
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index 0cf0e3f1..345af582 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -163,9 +163,9 @@ void EditorProxy::popupAboutToShow()
 	for (int index=popup->count()-1; index >= 0; --index)
 	{
 		int id = popup->idAt(index);
-		if (m_popupIds.tqcontains(id) == 0)
+		if (m_popupIds.contains(id) == 0)
 		{
-			TQMenuItem *item = popup->tqfindItem(id);
+			TQMenuItem *item = popup->findItem(id);
 			if ( item && item->popup() )
 				delete item->popup();
 			else
@@ -182,7 +182,7 @@ void EditorProxy::popupAboutToShow()
 
 	TQString wordstr;
 	TQString selection = KDevEditorUtil::currentSelection( doc );
-	if ( !selection.isEmpty() && selection.tqcontains('\n') != 0 )
+	if ( !selection.isEmpty() && selection.contains('\n') != 0 )
 	{
 		wordstr = selection;
 	}
@@ -201,7 +201,7 @@ void EditorProxy::popupAboutToShow()
 	for( uint i = 0; i < popup->count(); ) 
 	{
 		int id = popup->idAt( i );
-		if( lastWasSeparator && popup->tqfindItem( id )->isSeparator() ) 
+		if( lastWasSeparator && popup->findItem( id )->isSeparator() ) 
 		{
 			popup->removeItem( id );
 			// Since we removed an item, don't increment i
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index e2af092e..b21f4c3a 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -120,7 +120,7 @@ void LanguageSelectWidget::readProjectConfig()
         if (la == language)
             continue;
         LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-KDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() );
-        item->setOn(languages.tqcontains(la));
+        item->setOn(languages.contains(la));
     }
 
     TQListViewItem * first = _pluginList->firstChild();
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index 4960d870..404a0bae 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -84,7 +84,7 @@ KParts::Part *MultiBuffer::activeBuffer( ) const
 
 bool MultiBuffer::hasURL( const KURL &url ) const
 {
-    return m_buffers.tqcontains( url );
+    return m_buffers.contains( url );
 }
 
 int MultiBuffer::numberOfBuffers() const
@@ -124,7 +124,7 @@ KParts::Part* MultiBuffer::openURL( const KURL &url )
 
 bool MultiBuffer::closeURL( const KURL &url )
 {
-    if ( !m_buffers.tqcontains( url ) )
+    if ( !m_buffers.contains( url ) )
         return false;
 
     bool result = false;
@@ -256,7 +256,7 @@ void MultiBuffer::setOrientation( Qt::Orientation orientation )
 
 void MultiBuffer::activePartChanged( const KURL &url )
 {
-    if ( !m_buffers.tqcontains( url ) )
+    if ( !m_buffers.contains( url ) )
         return ;
 
     m_activeBuffer = m_buffers[ url ];
@@ -300,4 +300,4 @@ void MultiBuffer::updateUrlForPart(KParts::Part *part, KURL url)
 
 #include "multibuffer.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
diff --git a/src/multibuffer.h b/src/multibuffer.h
index f6f40ea6..e3cabcf0 100644
--- a/src/multibuffer.h
+++ b/src/multibuffer.h
@@ -87,4 +87,4 @@ private:
 
 #endif
 
-// 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
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
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index a14417eb..4c9c6c6f 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -210,7 +210,7 @@ KURL PartController::findURLInProject(const KURL& url)
 {
   TQStringList fileList = API::getInstance()->project()->allFiles();
 
-  bool filenameOnly = (url.url().tqfind('/') == -1);
+  bool filenameOnly = (url.url().find('/') == -1);
   TQString filename = filenameOnly ? "/" : "";
   filename += url.url();
 
@@ -442,7 +442,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	config->setGroup("General");
 
 	TQStringList texttypeslist = config->readListEntry( "TextTypes" );
-	if ( texttypeslist.tqcontains( MimeType->name() ) )
+	if ( texttypeslist.contains( MimeType->name() ) )
 	{
 		m_openNextAsText = true;
 	}
@@ -830,7 +830,7 @@ void PartController::updatePartURL( KParts::ReadOnlyPart * ro_part )
 
 bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part )
 {
-	if ( _partURLMap.tqcontains( ro_part ) && !ro_part->url().isEmpty() )
+	if ( _partURLMap.contains( ro_part ) && !ro_part->url().isEmpty() )
 	{
 		if ( _partURLMap[ ro_part ] != ro_part->url() )
 		{
@@ -842,7 +842,7 @@ bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part )
 
 KURL PartController::storedURLForPart( KParts::ReadOnlyPart * ro_part )
 {
-	if ( _partURLMap.tqcontains( ro_part ) )
+	if ( _partURLMap.contains( ro_part ) )
 	{
 		return _partURLMap[ ro_part ];
 	}
@@ -1216,7 +1216,7 @@ bool PartController::closeFilesDialog( KURL::List const & ignoreList )
 	while ( KParts::Part* part = it.current() )
 	{
 		KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart*>( part );
-		if ( ro_part && !ignoreList.tqcontains( ro_part->url() ) || !ro_part )
+		if ( ro_part && !ignoreList.contains( ro_part->url() ) || !ro_part )
 		{
 			closePart( part );
 		}
@@ -1426,7 +1426,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload )
 
 	if ( reason > 0 )
 	{
-		if ( !_dirtyDocuments.tqcontains( doc ) )
+		if ( !_dirtyDocuments.contains( doc ) )
 		{
 			_dirtyDocuments.append( doc );
 		}
@@ -1455,7 +1455,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload )
 
 bool PartController::isDirty( KURL const & url )
 {
-	return _dirtyDocuments.tqcontains( static_cast<KTextEditor::Document*>( partForURL( url ) ) );
+	return _dirtyDocuments.contains( static_cast<KTextEditor::Document*>( partForURL( url ) ) );
 }
 
 bool PartController::reactToDirty( KURL const & url, unsigned char reason )
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 85d0b068..3c75fd89 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -144,7 +144,7 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis
     TQString name = (*it)->desktopEntryName();
 
     // Check if it is already loaded or shouldn't be
-    if( m_parts[ name ] != 0 || ignorePlugins.tqcontains( name ) )
+    if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) )
       continue;
 
     emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName()));
diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp
index 18eef37d..e6973d79 100644
--- a/src/pluginselectdialog.cpp
+++ b/src/pluginselectdialog.cpp
@@ -137,7 +137,7 @@ void PluginSelectDialog::init( )
 		TQString Comment = (*it)->comment();
 		TQRegExp re("\\bhttp://[\\S]*");
 		re.search( Comment );
-		Comment.tqreplace( re, "" );
+		Comment.replace( re, "" );
 
 		TQString url;
 		if ( re.pos() > -1 )
@@ -146,9 +146,9 @@ void PluginSelectDialog::init( )
 		}
 
 		PluginItem *item = new PluginItem( plugin_list, (*it)->desktopEntryName(), (*it)->genericName(), Comment, url );
-		item->setOn( loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) );
+		item->setOn( loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) );
 
-		kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl;
+		kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl;
 	}
 
 	TQListViewItem * first = plugin_list->firstChild();
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index 0e3fb5d4..ca6b6633 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -122,7 +122,7 @@ void ProfileEditor::refreshPropertyCombo()
         TQStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList();
         for (TQStringList::const_iterator p = currProps.constBegin(); 
                 p != currProps.constEnd(); ++p)
-            if (!props.tqcontains(*p))
+            if (!props.contains(*p))
                 props.append(*p);
     }
     props.sort();
@@ -271,8 +271,8 @@ void ProfileEditor::removeProfile()
 void ProfileEditor::addProperty()
 {
     if ( (!propertyCombo->currentText().isEmpty()) &&
-        (ownPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) &&
-        (derivedPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) )
+        (ownPropertiesBox->findItem(propertyCombo->currentText()) == 0) &&
+        (derivedPropertiesBox->findItem(propertyCombo->currentText()) == 0) )
     {
         ownPropertiesBox->insertItem(propertyCombo->currentText());
         
@@ -322,9 +322,9 @@ void ProfileEditor::addEnabled()
         text = allList->currentItem()->text(0);
     }
     
-    if (enabledList->tqfindItem(text, 0) != 0)
+    if (enabledList->findItem(text, 0) != 0)
         return;
-    if (disabledList->tqfindItem(text, 0) != 0)
+    if (disabledList->findItem(text, 0) != 0)
     {
         KMessageBox::error(this, i18n("This plugin is already contained in the list of disabled plugins."),
             i18n("Enable Plugin"));
@@ -368,9 +368,9 @@ void ProfileEditor::addDisabled()
         text = allList->currentItem()->text(0);
     }
     
-    if (disabledList->tqfindItem(text, 0) != 0)
+    if (disabledList->findItem(text, 0) != 0)
         return;
-    if (enabledList->tqfindItem(text, 0) != 0)
+    if (enabledList->findItem(text, 0) != 0)
     {
         KMessageBox::error(this, i18n("This plugin is already contained in the list of enabled plugins."),
             i18n("Disable Plugin"));
diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp
index 5c94d566..a5ad5803 100644
--- a/src/profileengine/lib/profile.cpp
+++ b/src/profileengine/lib/profile.cpp
@@ -119,7 +119,7 @@ Profile::EntryList Profile::list(List type)
 void Profile::addEntry(List type, const TQString &value)
 {
     TQStringList &list = listByType(type);
-    if (!list.tqcontains(value))
+    if (!list.contains(value))
         list.append(value);
 }
 
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index 7a6d65d8..896d8080 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -57,7 +57,7 @@ void ProfileEngine::processDir(const TQString &dir, const TQString &currPath, TQ
         {
             TQString dirName = *eit;
             Profile *profile = 0;
-            if (passedPaths.tqcontains(currPath + dirName))
+            if (passedPaths.contains(currPath + dirName))
                 profile = passedPaths[currPath + dirName];
             else
             {
@@ -127,7 +127,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
     Profile::EntryList enableList = profile->list(Profile::ExplicitEnable);
     for (Profile::EntryList::const_iterator it = enableList.begin(); it != enableList.end(); ++it)
     {
-        if (names.tqcontains((*it).name))
+        if (names.contains((*it).name))
             continue;
         TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
         constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name);
@@ -229,7 +229,7 @@ void ProfileEngine::diffProfiles(OfferType offerType, const TQString &profile1,
         it != offers1List.constEnd(); ++it)
     {
 //         kdDebug() << "checking: " << *it << endl;
-        if (offers2List.tqcontains(*it))
+        if (offers2List.contains(*it))
         {
 //             kdDebug() << "    keep" << endl;
             offers2.remove(offers2List[*it]);
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 42e5337d..58cbaaef 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -648,7 +648,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
 //     for (TQStringList::const_iterator it = profileKeywords.constBegin();
 //         it != profileKeywords.constEnd(); ++it)
 //     {
-//         if (keywords.tqcontains(*it))
+//         if (keywords.contains(*it))
 //         {
 //             idx = profileKeywords.findIndex(*it);
 //             break;
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index cddf5d77..c471366f 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -112,7 +112,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
 		TQString pluginName = pPlugin->instance()->instanceName();
 		TQDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement();
 		if (!pluginEl.isNull()) {
-			// now plugin, load what you tqfind!
+			// now plugin, load what you find!
 			pPlugin->restorePartialProjectSession(&pluginEl);
 		}
 		++it;
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index cbbb1543..1f2c4dd5 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -182,7 +182,7 @@ void SimpleMainWindow::contextMenu(TQPopupMenu *popupMenu, const Context *contex
             bool isOpen = true;
             for (KURL::List::const_iterator it = m_splitURLs.begin(); it != m_splitURLs.end(); ++it)
             {
-                if (!PartController::getInstance()->openURLs().tqcontains(*it) && (*it).isValid())
+                if (!PartController::getInstance()->openURLs().contains(*it) && (*it).isValid())
                 {
                     isOpen = false;
                     break;
@@ -217,7 +217,7 @@ void SimpleMainWindow::embedPartView(TQWidget *view, const TQString &title, cons
         return;
 
     TQString shortName = title;
-    shortName = shortName.right( shortName.length() - (shortName.tqfindRev('/') +1));
+    shortName = shortName.right( shortName.length() - (shortName.findRev('/') +1));
 
     addWidget(view, title);
     view->show();
@@ -338,7 +338,7 @@ void SimpleMainWindow::raiseView(TQWidget *view)
         DDockWindow *dock = toolWindow(dockWidgetPosition(view));
         dock->raiseWidget(view);
     }
-    else if (m_widgets.tqcontains(view) && m_widgetTabs.tqcontains(view))
+    else if (m_widgets.contains(view) && m_widgetTabs.contains(view))
         m_widgetTabs[view]->showPage(view);
 }
 
@@ -943,7 +943,7 @@ void SimpleMainWindow::switchToNextTabWidget()
     TQValueList<DTabWidget*>::iterator it = tabWidgets.begin();
     while ( it != tabWidgets.end() )
     {
-        if ( !reduced.tqcontains( *it ) )
+        if ( !reduced.contains( *it ) )
         {
             reduced << *it;
         }
@@ -1008,4 +1008,4 @@ void SimpleMainWindow::projectClosed()
 
 #include "simplemainwindow.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
diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h
index 11180edb..19ef20b2 100644
--- a/src/simplemainwindow.h
+++ b/src/simplemainwindow.h
@@ -136,6 +136,6 @@ private:
     KURL::List m_splitURLs;
 };
 
-// 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
 
 #endif