summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/app/kateapp.cpp2
-rw-r--r--kate/app/katedocmanager.cpp4
-rw-r--r--kate/app/kateexternaltools.cpp10
-rw-r--r--kate/app/katefileselector.cpp4
-rw-r--r--kate/app/kategrepdialog.cpp12
-rw-r--r--kate/app/katemdi.cpp6
-rw-r--r--kate/app/kateviewmanager.cpp2
-rw-r--r--kate/app/kateviewspacecontainer.cpp14
-rw-r--r--kate/app/kwritemain.cpp4
9 files changed, 29 insertions, 29 deletions
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 3518c6308..9d9c7ba15 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -375,7 +375,7 @@ KateMainWindow *KateApp::activeMainWindow ()
if (m_mainWindows.isEmpty())
return 0;
- int n = m_mainWindows.tqfindIndex ((KateMainWindow *)activeWindow());
+ int n = m_mainWindows.findIndex ((KateMainWindow *)activeWindow());
if (n < 0)
n=0;
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 7674935b4..5ef081de7 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -194,7 +194,7 @@ const KateDocumentInfo *KateDocManager::documentInfo (Kate::Document *doc)
int KateDocManager::findDocument (Kate::Document *doc)
{
- return m_docList.tqfind (doc);
+ return m_docList.find (doc);
}
uint KateDocManager::documents ()
@@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber);
}
- if ( closeURL && m_tempFiles.tqcontains( documentNumber ) )
+ if ( closeURL && m_tempFiles.contains( documentNumber ) )
{
TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() );
if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*||
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 1a2d60a53..4ed9c3d95 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -127,7 +127,7 @@ bool KateExternalTool::checkExec()
bool KateExternalTool::valid( const TQString &mt ) const
{
- return mimetypes.isEmpty() || mimetypes.tqcontains( mt );
+ return mimetypes.isEmpty() || mimetypes.contains( mt );
}
//END KateExternalTool
@@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload()
bool sepadded = false;
for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
{
- if ( ! tools.tqcontains( *itg ) &&
- ! removed.tqcontains( *itg ) )
+ if ( ! tools.contains( *itg ) &&
+ ! removed.contains( *itg ) )
{
if ( ! sepadded )
{
@@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
if ( action )
{
l = action->tool->mimetypes;
- b = ( ! l.count() || l.tqcontains( mt ) );
+ b = ( ! l.count() || l.contains( mt ) );
action->setEnabled( b );
}
}
@@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew()
// This is sticky, it does not change again, so that shortcuts sticks
// TODO check for dups
- t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" );
+ t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );
new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index fb1a3187b..3a01cda28 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -692,13 +692,13 @@ void KFSConfigPage::init()
KAction *ac;
TQListBox *lb;
for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) {
- lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
+ lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
if ( *it == "bookmarks" || *it == "sync_dir" )
ac = fileSelector->actionCollection()->action( (*it).latin1() );
else
ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() );
if ( ac )
- new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it );
+ new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
}
// sync
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 943dff495..ebc461618 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -286,11 +286,11 @@ void GrepTool::itemSelected(const TQString& item)
TQString filename, linenumber;
TQString str = item;
- if ( (pos = str.tqfind(':')) != -1)
+ if ( (pos = str.find(':')) != -1)
{
filename = str.left(pos);
str = str.mid(pos+1);
- if ( (pos = str.tqfind(':')) != -1)
+ if ( (pos = str.find(':')) != -1)
{
filename = m_workingDir + TQDir::separator() + filename;
linenumber = str.left(pos);
@@ -302,7 +302,7 @@ void GrepTool::itemSelected(const TQString& item)
void GrepTool::processOutput()
{
int pos;
- while ( (pos = buf.tqfind('\n')) != -1)
+ while ( (pos = buf.find('\n')) != -1)
{
TQString item = buf.mid(2,pos-2);
if (!item.isEmpty())
@@ -329,7 +329,7 @@ void GrepTool::slotSearch()
return;
}
- if ( ! leTemplate->text().tqcontains("%s") )
+ if ( ! leTemplate->text().contains("%s") )
{
leTemplate->setFocus();
return;
@@ -347,9 +347,9 @@ void GrepTool::slotSearch()
TQString s = cmbPattern->currentText();
if ( ! cbRegex->isChecked() )
- s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
+ s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
TQString pattern = leTemplate->text();
- pattern.tqreplace( "%s", s );
+ pattern.replace( "%s", s );
childproc = new KProcess();
childproc->setWorkingDirectory( m_workingDir );
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index c2b490fd9..9a809c374 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -340,7 +340,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
bool Sidebar::removeWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
removeTab(m_widgetToId[widget]);
@@ -370,7 +370,7 @@ bool Sidebar::removeWidget (ToolView *widget)
bool Sidebar::showWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
// hide other non-persistent views
@@ -395,7 +395,7 @@ bool Sidebar::showWidget (ToolView *widget)
bool Sidebar::hideWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
bool anyVis = false;
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index b7cb1f360..6d95efbb0 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -215,7 +215,7 @@ void KateViewManager::slotCloseTab()
if (m_viewSpaceContainerList.count() <= 1) return;
if (!m_currentContainer) return;
- int pos = m_viewSpaceContainerList.tqfind (m_currentContainer);
+ int pos = m_viewSpaceContainerList.find (m_currentContainer);
if (pos == -1)
return;
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index afd92fc55..d3a834629 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -275,7 +275,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
}
setActiveView (view);
- m_viewList.tqfindRef (view);
+ m_viewList.findRef (view);
mainWindow()->toolBar ()->tqsetUpdatesEnabled (false);
@@ -337,7 +337,7 @@ void KateViewSpaceContainer::slotViewChanged()
void KateViewSpaceContainer::activateNextView()
{
- uint i = m_viewSpaceList.tqfind (activeViewSpace())+1;
+ uint i = m_viewSpaceList.find (activeViewSpace())+1;
if (i >= m_viewSpaceList.count())
i=0;
@@ -348,7 +348,7 @@ void KateViewSpaceContainer::activateNextView()
void KateViewSpaceContainer::activatePrevView()
{
- int i = m_viewSpaceList.tqfind (activeViewSpace())-1;
+ int i = m_viewSpaceList.find (activeViewSpace())-1;
if (i < 0)
i=m_viewSpaceList.count()-1;
@@ -521,7 +521,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// Figure out where to put views that are still needed
KateViewSpace* next;
- if (m_viewSpaceList.tqfind(viewspace) == 0)
+ if (m_viewSpaceList.find(viewspace) == 0)
next = m_viewSpaceList.next();
else
next = m_viewSpaceList.prev();
@@ -684,12 +684,12 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx,
TQString n; // name for child list, see below
// For KateViewSpaces, ask them to save the file list.
if ( obj->isA("KateViewSpace") ) {
- n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.tqfind((KateViewSpace*)obj) );
- ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.tqfind((KateViewSpace*)obj), viewConfGrp);
+ n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.find((KateViewSpace*)obj) );
+ ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.find((KateViewSpace*)obj), viewConfGrp);
// save active viewspace
if ( ((KateViewSpace*)obj)->isActiveSpace() ) {
config->setGroup(viewConfGrp);
- config->writeEntry("Active Viewspace", m_viewSpaceList.tqfind((KateViewSpace*)obj) );
+ config->writeEntry("Active Viewspace", m_viewSpaceList.find((KateViewSpace*)obj) );
}
}
// For KateSplitters, recurse
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 947f97067..98a64ed67 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -458,7 +458,7 @@ void KWrite::readProperties(KConfig *config)
void KWrite::saveProperties(KConfig *config)
{
writeConfig(config);
- config->writeEntry("DocumentNumber",docList.tqfind(m_view->document()) + 1);
+ config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1);
if (KTextEditor::sessionConfigInterface(m_view))
KTextEditor::sessionConfigInterface(m_view)->writeSessionConfig(config);
@@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
TQString buf = TQString("Window %1").arg(z);
config->setGroup(buf);
- config->writeEntry("DocumentNumber",docList.tqfind(winList.tqat(z-1)->view()->document()) + 1);
+ config->writeEntry("DocumentNumber",docList.find(winList.tqat(z-1)->view()->document()) + 1);
}
}