summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/cppsymbolviewer/cpp_parser.cpp54
-rw-r--r--kate/cppsymbolviewer/tcl_parser.cpp4
-rw-r--r--kate/filetemplates/plugin/filetemplates.cpp32
-rw-r--r--kate/filetemplates/plugin/filetemplates.h2
-rw-r--r--kate/filetemplates/plugin/katetemplate.xml2
-rw-r--r--kate/filetemplates/templates/language.xml.katetemplate2
-rw-r--r--kate/htmltools/plugin_katehtmltools.cpp2
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.cpp4
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.h2
-rw-r--r--kate/kjswrapper/bindings.cpp2
-rw-r--r--kate/kpybrowser/kpybrowser.cpp10
-rw-r--r--kate/kpybrowser/pybrowse_part.cpp4
-rw-r--r--kate/make/plugin_katemake.cpp12
-rw-r--r--kate/modeline/ModelinePlugin.cpp10
-rw-r--r--kate/openheader/plugin_kateopenheader.cpp4
-rw-r--r--kate/snippets/plugin_katesnippets.cpp6
-rw-r--r--kate/textfilter/plugin_katetextfilter.cpp6
-rw-r--r--kate/textfilter/plugin_katetextfilter.h2
-rw-r--r--kate/xmlcheck/plugin_katexmlcheck.cpp12
-rw-r--r--kate/xmltools/kde-docbook.dtd.xml2
-rw-r--r--kate/xmltools/plugin_katexmltools.cpp14
-rw-r--r--kate/xmltools/plugin_katexmltools.h2
-rw-r--r--kate/xmltools/pseudo_dtd.cpp22
-rw-r--r--kate/xmltools/pseudo_dtd.h2
24 files changed, 107 insertions, 107 deletions
diff --git a/kate/cppsymbolviewer/cpp_parser.cpp b/kate/cppsymbolviewer/cpp_parser.cpp
index c99d455..b66c7fc 100644
--- a/kate/cppsymbolviewer/cpp_parser.cpp
+++ b/kate/cppsymbolviewer/cpp_parser.cpp
@@ -67,21 +67,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void)
cl = cl.stripWhiteSpace();
func_close = 0;
if(cl.at(0) == '/' && cl.at(1) == '/') continue;
- if(cl.tqfind("/*") == 0 && (cl.tqfind("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :(
- if(cl.tqfind("/*") >= 0 && graph == 0) comment = 1;
- if(cl.tqfind("*/") >= 0 && graph == 0) comment = 0;
- if(cl.tqfind("#") >= 0 && graph == 0 ) macro = 1;
+ if(cl.find("/*") == 0 && (cl.find("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :(
+ if(cl.find("/*") >= 0 && graph == 0) comment = 1;
+ if(cl.find("*/") >= 0 && graph == 0) comment = 0;
+ if(cl.find("#") >= 0 && graph == 0 ) macro = 1;
if (comment != 1)
{
/* *********************** MACRO PARSING *****************************/
if(macro == 1)
{
- //macro_pos = cl.tqfind("#");
+ //macro_pos = cl.find("#");
for (j = 0; j < cl.length(); j++)
{
if(cl.at(j)=='/' && cl.at(j+1)=='/') { macro = 4; break; }
- if( (uint)cl.tqfind("define") == j &&
- !((uint)cl.tqfind("defined") == j))
+ if( (uint)cl.find("define") == j &&
+ !((uint)cl.find("defined") == j))
{
macro = 2;
j += 6; // skip the word "define"
@@ -99,7 +99,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void)
if(j == cl.length() && macro == 1) macro = 0;
if(macro == 4)
{
- //stripped.tqreplace(0x9, " ");
+ //stripped.replace(0x9, " ");
stripped = stripped.stripWhiteSpace();
if (macro_on == true)
{
@@ -129,7 +129,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void)
/* ******************************************************************** */
- if ((cl.tqfind("class") >= 0 && graph == 0 && block == 0))
+ if ((cl.find("class") >= 0 && graph == 0 && block == 0))
{
mclass = 1;
for (j = 0; j < cl.length(); j++)
@@ -158,19 +158,19 @@ void KatePluginSymbolViewerView::parseCppSymbols(void)
}
if (mclass == 3)
{
- if (cl.tqfind('{') >= 0)
+ if (cl.find('{') >= 0)
{
- cl = cl.right(cl.tqfind('{'));
+ cl = cl.right(cl.find('{'));
mclass = 4;
}
}
- if(cl.tqfind("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2)
+ if(cl.find("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2)
{ structure = false; block = 1; }
- if((cl.tqfind("typedef") >= 0 || cl.tqfind("struct") >= 0) &&
+ if((cl.find("typedef") >= 0 || cl.find("struct") >= 0) &&
graph == 0 && block == 0)
{ structure = true; block = 2; stripped = ""; }
- //if(cl.tqfind(";") >= 0 && graph == 0)
+ //if(cl.find(";") >= 0 && graph == 0)
// block = 0;
if(block > 0 && mclass != 1 )
@@ -216,21 +216,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void)
break;
}
- if(cl.at(j)=='{' && structure == false && cl.tqfind(";") < 0 ||
- cl.at(j)=='{' && structure == false && cl.tqfind('}') > (int)j)
+ if(cl.at(j)=='{' && structure == false && cl.find(";") < 0 ||
+ cl.at(j)=='{' && structure == false && cl.find('}') > (int)j)
{
- stripped.tqreplace(0x9, " ");
+ stripped.replace(0x9, " ");
if(func_on == true)
{
if (types_on == false)
{
- while (stripped.tqfind('(') >= 0)
- stripped = stripped.left(stripped.tqfind('('));
- while (stripped.tqfind("::") >= 0)
- stripped = stripped.mid(stripped.tqfind("::") + 2);
+ while (stripped.find('(') >= 0)
+ stripped = stripped.left(stripped.find('('));
+ while (stripped.find("::") >= 0)
+ stripped = stripped.mid(stripped.find("::") + 2);
stripped = stripped.stripWhiteSpace();
- while (stripped.tqfind(0x20) >= 0)
- stripped = stripped.mid(stripped.tqfind(0x20, 0) + 1);
+ while (stripped.find(0x20) >= 0)
+ stripped = stripped.mid(stripped.find(0x20, 0) + 1);
}
//kdDebug(13000)<<"Function -- Inserted: "<<stripped<<" at row: "<<tmpPos<<" mclass: "<<(uint)mclass<<endl;
if (treeMode)
@@ -290,9 +290,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void)
{
if(cl.at(j) == ';')
{
- //stripped.tqreplace(0x9, " ");
+ //stripped.replace(0x9, " ");
stripped.remove('{');
- stripped.tqreplace('}', " ");
+ stripped.replace('}', " ");
if(struct_on == true)
{
if (treeMode)
@@ -319,9 +319,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void)
} // BLOCK > 0
if (mclass == 4 && block == 0 && func_close == 0)
{
- if (cl.tqfind('}') >= 0)
+ if (cl.find('}') >= 0)
{
- cl = cl.right(cl.tqfind('}'));
+ cl = cl.right(cl.find('}'));
mclass = 0;
}
}
diff --git a/kate/cppsymbolviewer/tcl_parser.cpp b/kate/cppsymbolviewer/tcl_parser.cpp
index fca2a5d..3402b67 100644
--- a/kate/cppsymbolviewer/tcl_parser.cpp
+++ b/kate/cppsymbolviewer/tcl_parser.cpp
@@ -80,8 +80,8 @@ void KatePluginSymbolViewerView::parseTclSymbols(void)
{
stripped = currline.right(currline.length() - 3);
stripped = stripped.simplifyWhiteSpace();
- int fnd = stripped.tqfind(' ');
- //fnd = stripped.tqfind(";");
+ int fnd = stripped.find(' ');
+ //fnd = stripped.find(";");
if(fnd > 0) stripped = stripped.left(fnd);
if (treeMode)
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 33639ce..2bae5f8 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -192,7 +192,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d)
TQString fname = (*it).section( '/', -1 );
// skip if hidden
- if ( hidden.tqcontains( fname ) )
+ if ( hidden.contains( fname ) )
continue;
// Read the first line of the file, to get the group/name
@@ -284,7 +284,7 @@ TQStringList KateFileTemplates::groups()
for ( uint i = 0; i < m_templates.count(); i++ )
{
s = m_templates.at( i )->group;
- if ( ! l.tqcontains( s ) )
+ if ( ! l.contains( s ) )
l.append( s );
}
@@ -332,7 +332,7 @@ void KateFileTemplates::refreshMenu( PluginView *v )
w.prepend( "<p>" );
if ( ! w.isEmpty() )
- submenus[m_templates.at( i )->group]->tqfindItem( i )->setWhatsThis( w );
+ submenus[m_templates.at( i )->group]->findItem( i )->setWhatsThis( w );
}
}
@@ -412,7 +412,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
if ( reName.search( tmp ) > -1 )
{
docname = reName.cap( 1 );
- docname = docname.tqreplace( "%N", "%1" );
+ docname = docname.replace( "%N", "%1" );
doneheader |= 1;
}
}
@@ -458,7 +458,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
if ( ! isTemplate )
{
- int d = filename.tqfindRev('.');
+ int d = filename.findRev('.');
docname = i18n("Untitled %1");
if ( d > 0 ) docname += filename.mid( d );
} else if ( docname.isEmpty() )
@@ -467,8 +467,8 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
// check for other documents matching this naming scheme,
// and do a count before chosing a name for this one
TQString p = docname;
- p.tqreplace( "%1", "\\d+" );
- p.tqreplace( ".", "\\." );
+ p.replace( "%1", "\\d+" );
+ p.replace( ".", "\\." );
p.prepend( "^" );
p.append( "$" );
TQRegExp reName( p );
@@ -478,7 +478,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
if ( ( reName.search ( application()->documentManager()->document( i )->docName() ) > -1 ) )
count++;
- if ( docname.tqcontains( "%1" ) )
+ if ( docname.contains( "%1" ) )
docname = docname.tqarg( count );
doc->setDocName( docname );
@@ -578,7 +578,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *tqparent, TemplateInfo
l->setBuddy( leDocumentName );
TQWhatsThis::add( leDocumentName, i18n("<p>This string will be used to set a name "
"for the new document, to display in the title bar and file list.</p>"
- "<p>If the string tqcontains '%N', that will be replaced with a number "
+ "<p>If the string contains '%N', that will be replaced with a number "
"increasing with each similarly named file.</p><p> For example, if the "
"Document Name is 'New shellscript (%N).sh', the first document will be "
"named 'New shellscript (1).sh', the second 'New shellscipt (2).sh', and "
@@ -908,7 +908,7 @@ void KateTemplateWizard::accept()
else
suggestion = kti->leTemplate->text();
- suggestion.tqreplace(" ", "");
+ suggestion.replace(" ", "");
if ( ! suggestion.endsWith(".katetemplate") )
suggestion.append(".katetemplate");
@@ -1005,16 +1005,16 @@ void KateTemplateWizard::accept()
{
// 3) if the file is not already a template, escape any "%" and "^" in it,
// and try do do some replacement of the authors username, name and email.
- tmp.tqreplace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" );
- tmp.tqreplace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" );
- //tmp.tqreplace( "^", "\\^" );
+ tmp.replace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" );
+ tmp.replace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" );
+ //tmp.replace( "^", "\\^" );
if ( cbRRealname->isChecked() && ! sFullname.isEmpty() )
- tmp.tqreplace( sFullname, "%{realname}" );
+ tmp.replace( sFullname, "%{realname}" );
if ( cbREmail->isChecked() && ! sEmail.isEmpty() )
- tmp.tqreplace( sEmail, "%{email}" );
+ tmp.replace( sEmail, "%{email}" );
}
str += tmp;
@@ -1249,6 +1249,6 @@ void KateTemplateManager::slotDownload()
//END KateTemplateManager
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
#include "filetemplates.moc"
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index e6fef30..ec3134c 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -260,4 +260,4 @@ class KateTemplateManager : public TQWidget
};
#endif // _PLUGIN_KATE_FILETEMPLATES_H_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/filetemplates/plugin/katetemplate.xml b/kate/filetemplates/plugin/katetemplate.xml
index 78647d4..0748481 100644
--- a/kate/filetemplates/plugin/katetemplate.xml
+++ b/kate/filetemplates/plugin/katetemplate.xml
@@ -84,4 +84,4 @@
<keywords casesensitive="0"/>
</general>
</language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/filetemplates/templates/language.xml.katetemplate b/kate/filetemplates/templates/language.xml.katetemplate
index 65d677a..420ba84 100644
--- a/kate/filetemplates/templates/language.xml.katetemplate
+++ b/kate/filetemplates/templates/language.xml.katetemplate
@@ -57,4 +57,4 @@ katetemplate: Description=This template will create the basics of a kate highlig
-->
</general>
</language>
-<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; indent-mode xml; -->
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; indent-mode xml; -->
diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp
index a71c91c..ba7c530 100644
--- a/kate/htmltools/plugin_katehtmltools.cpp
+++ b/kate/htmltools/plugin_katehtmltools.cpp
@@ -142,7 +142,7 @@ void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, TQString text) //
// when we try to reselect. TODO: fix those bugs, and we can
// un-break this if...
- if (preDeleteLine == line && -1 == marked.tqfind ('\n'))
+ if (preDeleteLine == line && -1 == marked.find ('\n'))
if (preDeleteLine == line && preDeleteCol == col)
{
view.setCursorPosition (line, col + pre.length () + marked.length () - 1);
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index 2b8e80e..74f857e 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -173,7 +173,7 @@ void PluginKateInsertCommand::slotInsertCommand()
sh->start( KProcess::NotifyOnExit, KProcess::All );
// add command to history
- if ( cmdhist.tqcontains( d->command() ) ) {
+ if ( cmdhist.contains( d->command() ) ) {
cmdhist.remove( d->command() );
}
cmdhist.prepend( d->command() );
@@ -414,4 +414,4 @@ void InsertCommandConfigPage::apply()
emit configPageApplyRequest( this );
}
//END InsertCommandConfigPage
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h
index 5765a9b..9a33cbe 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.h
+++ b/kate/insertcommand/plugin_kateinsertcommand.h
@@ -170,4 +170,4 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage
};
#endif // _PLUGIN_KATE_INSERT_COMMAND_H_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp
index aeddbbc..bf6ec28 100644
--- a/kate/kjswrapper/bindings.cpp
+++ b/kate/kjswrapper/bindings.cpp
@@ -390,7 +390,7 @@ void Kate::JS::RefCountedObjectDict::decRef() {
}
KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQObject *obj, KJSEmbed::JSObjectProxy *proxy) {
- ObjectEntry *oe=tqfind(obj);
+ ObjectEntry *oe=find(obj);
if (oe==0) {
oe=new ObjectEntry;
oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy);
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index 483a677..e69205f 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -290,7 +290,7 @@ KPyBrowser::parseText (TQString & pytext)
//strip out the beginning class and ending colon
class_sig = line->stripWhiteSpace ().mid (6);
class_sig = class_sig.left (class_sig.length () - 1);
- paren_i = class_sig.tqfind ("(");
+ paren_i = class_sig.find ("(");
class_name = class_sig.left (paren_i);
last_class_node =
@@ -305,8 +305,8 @@ KPyBrowser::parseText (TQString & pytext)
{
//strip off the leading def and the ending colon
method_sig = line->stripWhiteSpace ().mid (4);
- method_sig = method_sig.left (method_sig.tqfind (":"));
- paren_i = method_sig.tqfind ("(");
+ method_sig = method_sig.left (method_sig.find (":"));
+ paren_i = method_sig.find ("(");
method_name = method_sig.left (paren_i);
last_method_node =
new PyBrowseNode (last_class_node, method_name, method_sig,
@@ -320,8 +320,8 @@ KPyBrowser::parseText (TQString & pytext)
{
//KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no));
function_sig = line->stripWhiteSpace ().mid (4);
- function_sig = function_sig.left (function_sig.tqfind (":"));
- paren_i = function_sig.tqfind ("(");
+ function_sig = function_sig.left (function_sig.find (":"));
+ paren_i = function_sig.find ("(");
function_name = function_sig.left (paren_i);
last_function_node =
new PyBrowseNode (function_root, function_name, function_sig,
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index bd9f791..1cff538 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -82,7 +82,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line)
done = 1;
if (forward_line < numlines)
{
- if (doc->textLine(forward_line).tqfind(name) > -1)
+ if (doc->textLine(forward_line).find(name) > -1)
{
apiline = forward_line;
break;
@@ -92,7 +92,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line)
}
if (backward_line > -1)
{
- if (doc->textLine(backward_line).tqfind(name) > -1)
+ if (doc->textLine(backward_line).find(name) > -1)
{
apiline = backward_line;
break;
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index 73f61cb..f61cfe0 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -132,7 +132,7 @@ public:
(lineno > 0 ? TQString::number(lineno) : TQString()),
message)
{
- m_isError = !message.tqcontains(TQString::tqfromLatin1("warning"));
+ m_isError = !message.contains(TQString::tqfromLatin1("warning"));
m_lineno = lineno;
m_serial = s_serial++;
}
@@ -403,21 +403,21 @@ void PluginKateMakeView::processLine(const TQString &l)
kdDebug() << "Got line " << l ;
- if (!filenameDetector && l.tqfind(source_prefix)!=0)
+ if (!filenameDetector && l.find(source_prefix)!=0)
{
/* ErrorMessage *e = */ (void) new ErrorMessage(this,l);
return;
}
- if (filenameDetector && l.tqfind(*filenameDetector)<0)
+ if (filenameDetector && l.find(*filenameDetector)<0)
{
ErrorMessage *e = new ErrorMessage(this,l);
kdDebug() << "Got message(1) #" << e->serial() << endl;
return;
}
- int ofs1 = l.tqfind(':');
- int ofs2 = l.tqfind(':',ofs1+1);
+ int ofs1 = l.find(':');
+ int ofs2 = l.find(':',ofs1+1);
//
TQString m = l.mid(ofs2+1);
m.remove('\n');
@@ -452,7 +452,7 @@ void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int le
output_line += l;
int nl_p = -1;
- while ((nl_p = output_line.tqfind('\n')) > 1)
+ while ((nl_p = output_line.find('\n')) > 1)
{
processLine(output_line.left(nl_p+1));
output_line.remove(0,nl_p+1);
diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp
index e3d22a1..3cf73c4 100644
--- a/kate/modeline/ModelinePlugin.cpp
+++ b/kate/modeline/ModelinePlugin.cpp
@@ -97,25 +97,25 @@ void ModelinePlugin::applyModeline()
options = vim2.cap(1);
} else if( doc->searchText( 0, 0, vim1, &foundAtLine, &foundAtCol, &matchLen ) ) {
options = vim1.cap(1);
- options.tqreplace( TQRegExp( ":" ), " " );
+ options.replace( TQRegExp( ":" ), " " );
}
uint configFlags = doc->configFlags();
kdDebug() << "Found modeline: " << options << endl;
- if( options.tqfind( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) {
+ if( options.find( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) {
kdDebug() << "Clearing replace tabs" << endl;
configFlags &= ~Kate::Document::cfReplaceTabs;
- } else if( options.tqfind( TQRegExp( "\\bet\\b" ) ) >= 0 ) {
+ } else if( options.find( TQRegExp( "\\bet\\b" ) ) >= 0 ) {
kdDebug() << "Setting replace tabs" << endl;
configFlags |= Kate::Document::cfReplaceTabs;
}
TQRegExp ts( "ts=(\\d+)" );
- if( options.tqfind( ts ) >= 0 ) {
+ if( options.find( ts ) >= 0 ) {
uint tabWidth = ts.cap(1).toUInt();
kdDebug() << "Setting tab width " << tabWidth << endl;
view->setTabWidth( tabWidth );
}
TQRegExp tw( "tw=(\\d+)" );
- if( options.tqfind( tw ) >= 0 ) {
+ if( options.find( tw ) >= 0 ) {
uint textWidth = tw.cap(1).toUInt();
kdDebug() << "Setting text width " << textWidth << endl;
doc->setWordWrap( true );
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index 15dbb77..eade8e8 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -91,9 +91,9 @@ void PluginKateOpenHeader::slotOpenHeader ()
TQStringList headers( TQStringList() << "h" << "H" << "hh" << "hpp" );
TQStringList sources( TQStringList() << "c" << "cpp" << "cc" << "cp" << "cxx" );
- if( sources.tqfind( extension ) != sources.end() ) {
+ if( sources.find( extension ) != sources.end() ) {
tryOpen( url, headers );
- } else if ( headers.tqfind( extension ) != headers.end() ) {
+ } else if ( headers.find( extension ) != headers.end() ) {
tryOpen( url, sources );
}
}
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index 8e0d6cb..018faf8 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -170,9 +170,9 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) {
kv->keyDelete();
}
- sText.tqreplace( TQRegExp("<mark/>"), sSelection );
- sText.tqreplace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) );
- sText.tqreplace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) );
+ sText.replace( TQRegExp("<mark/>"), sSelection );
+ sText.replace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) );
+ sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) );
kv->insertText ( sText );
}
kv->setFocus();
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index c003beb..0b53f45 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -95,7 +95,7 @@ splitString (TQString q, char c, TQStringList &list) // PCP
int pos;
TQString item;
- while ( (pos = q.tqfind(c)) >= 0)
+ while ( (pos = q.find(c)) >= 0)
{
item = q.left(pos);
list.append(item);
@@ -130,7 +130,7 @@ slipInNewText (Kate::View & view, TQString pre, TQString marked, TQString post,
// TODO: fix OnceAndOnlyOnce between this module and plugin_katehtmltools.cpp
- if (reselect && preDeleteLine == line && -1 == marked.tqfind ('\n'))
+ if (reselect && preDeleteLine == line && -1 == marked.find ('\n'))
if (preDeleteLine == line && preDeleteCol == col)
{
view.setCursorPosition (line, col + pre.length () + marked.length () - 1);
@@ -333,4 +333,4 @@ bool PluginKateTextFilter::exec( Kate::View *v, const TQString &cmd, TQString &m
return true;
}
//END
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h
index a3aed2c..772a30d 100644
--- a/kate/textfilter/plugin_katetextfilter.h
+++ b/kate/textfilter/plugin_katetextfilter.h
@@ -63,4 +63,4 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa
};
#endif // _PLUGIN_KANT_TEXTFILTER_H
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 2f94759..1345d46 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -189,10 +189,10 @@ void PluginKateXMLCheckView::slotProcExited(KProcess*)
for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) {
TQString line = *it;
line_count++;
- int semicolon_1 = line.tqfind(':');
- int semicolon_2 = line.tqfind(':', semicolon_1+1);
- int semicolon_3 = line.tqfind(':', semicolon_2+2);
- int caret_pos = line.tqfind('^');
+ int semicolon_1 = line.find(':');
+ int semicolon_2 = line.find(':', semicolon_1+1);
+ int semicolon_3 = line.find(':', semicolon_2+2);
+ int caret_pos = line.find('^');
if( semicolon_1 != -1 && semicolon_2 != -1 && semicolon_3 != -1 ) {
linenumber = line.mid(semicolon_1+1, semicolon_2-semicolon_1-1).stripWhiteSpace();
linenumber = linenumber.rightJustify(6, ' '); // for sorting numbers
@@ -317,7 +317,7 @@ bool PluginKateXMLCheckView::slotValidate()
// and needs to be ignored then):
TQRegExp re("<!--.*-->");
re.setMinimal(true);
- text_start.tqreplace(re, "");
+ text_start.replace(re, "");
TQRegExp re_doctype("<!DOCTYPE\\s+(.*)\\s+(?:PUBLIC\\s+[\"'].*[\"']\\s+[\"'](.*)[\"']|SYSTEM\\s+[\"'](.*)[\"'])", false);
re_doctype.setMinimal(true);
@@ -336,7 +336,7 @@ bool PluginKateXMLCheckView::slotValidate()
m_validating = true;
*m_proc << "--valid";
}
- } else if( text_start.tqfind("<!DOCTYPE") != -1 ) {
+ } else if( text_start.find("<!DOCTYPE") != -1 ) {
// DTD is inside the XML file
m_validating = true;
*m_proc << "--valid";
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 06b7a1e..e1611e9 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -845,7 +845,7 @@
<entity name="ulcorn" type="gen">
<text-expanded>&amp;#x231C;</text-expanded>
</entity>
-<entity name="ktqfind" type="gen">
+<entity name="kfind" type="gen">
<text-expanded>
<application>KFind</application>
</text-expanded>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index b3eea59..e8936b8 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -440,8 +440,8 @@ void PluginKateXMLTools::getDTD()
else if ( doctype == "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" )
filename = "kde-docbook.dtd.xml";
}
- else if( documentStart.tqfind("<xsl:stylesheet" ) != -1 &&
- documentStart.tqfind( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 )
+ else if( documentStart.find("<xsl:stylesheet" ) != -1 &&
+ documentStart.find( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 )
{
/* XSLT doesn't have a doctype/DTD. We look for an xsl:stylesheet tag instead.
Example:
@@ -528,7 +528,7 @@ void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data )
void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc )
{
- m_docDtds.tqreplace( doc->documentNumber(), dtd );
+ m_docDtds.replace( doc->documentNumber(), dtd );
connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ),
this, TQT_SLOT(keyEvent(int,int,const TQString&)) );
@@ -579,7 +579,7 @@ void PluginKateXMLTools::slotInsertElement()
if ( dtd && dtd->allowedAttributes(list[0]).count() )
adjust++; // the ">"
- if ( dtd && dtd->allowedElements(list[0]).tqcontains("__EMPTY") )
+ if ( dtd && dtd->allowedElements(list[0]).contains("__EMPTY") )
{
pre = "<" + text + "/>";
if ( adjust )
@@ -708,7 +708,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, T
// anders: if the tag is marked EMPTY, insert in form <tagname/>
TQString str;
int docNumber = kv->document()->documentNumber();
- bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).tqcontains( "__EMPTY" );
+ bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).contains( "__EMPTY" );
if ( isEmptyTag )
str = "/>";
else
@@ -1076,7 +1076,7 @@ TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) {
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
TQString str = *it;
- if( mapList.tqcontains(str.lower()) )
+ if( mapList.contains(str.lower()) )
{
// do not override a previous value, e.g. "Auml" and "auml" are two different
// entities, but they should be sorted next to each other.
@@ -1138,4 +1138,4 @@ TQString InsertElement::showDialog( TQStringList &completions )
return TQString();
}
//END InsertElement dialog
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h
index e3a6c51..892a142 100644
--- a/kate/xmltools/plugin_katexmltools.h
+++ b/kate/xmltools/plugin_katexmltools.h
@@ -149,4 +149,4 @@ class InsertElement : public KDialogBase
};
#endif // _PLUGIN_KANT_XMLTOOLS_H
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index e0376d4..51d1fe3 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -169,7 +169,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress )
TQDomElement subElem = subNode.toElement();
if( !subElem.isNull() )
{
- TQMap<TQString,bool>::Iterator it = subelementList.tqfind( subElem.attribute( "name" ) );
+ TQMap<TQString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) );
if( it != subelementList.end() )
subelementList.remove(it);
}
@@ -208,7 +208,7 @@ TQStringList PseudoDTD::allowedElements( TQString parentElement )
return it.data();
}
}
- else if( m_elementsList.tqcontains(parentElement) )
+ else if( m_elementsList.contains(parentElement) )
return m_elementsList[parentElement];
return TQStringList();
@@ -275,7 +275,7 @@ TQStringList PseudoDTD::allowedAttributes( TQString element )
}
}
}
- else if( m_attributesList.tqcontains(element) )
+ else if( m_attributesList.contains(element) )
return m_attributesList[element].optionalAttributes + m_attributesList[element].requiredAttributes;
return TQStringList();
@@ -292,7 +292,7 @@ TQStringList PseudoDTD::requiredAttributes( const TQString &element ) const
return it.data().requiredAttributes;
}
}
- else if( m_attributesList.tqcontains(element) )
+ else if( m_attributesList.contains(element) )
return m_attributesList[element].requiredAttributes;
return TQStringList();
@@ -369,10 +369,10 @@ TQStringList PseudoDTD::attributeValues( TQString element, TQString attribute )
}
}
}
- else if( m_attributevaluesList.tqcontains(element) )
+ else if( m_attributevaluesList.contains(element) )
{
TQMap<TQString,TQStringList> attrVals = m_attributevaluesList[element];
- if( attrVals.tqcontains(attribute) )
+ if( attrVals.contains(attribute) )
return attrVals[attribute];
}
@@ -411,14 +411,14 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress )
TQString exp = expandedElem.text();
// TODO: support more than one &#...; in the expanded text
/* TODO include do this when the tqunicode font problem is solved:
- if( exp.tqcontains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
+ if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
// hexadecimal numbers, e.g. "&#x236;"
- uint end = exp.tqfind( ";" );
+ uint end = exp.find( ";" );
exp = exp.mid( 3, end-3 );
exp = TQChar();
- } else if( exp.tqcontains(TQRegExp("^&#[0-9]+;$")) ) {
+ } else if( exp.contains(TQRegExp("^&#[0-9]+;$")) ) {
// decimal numbers, e.g. "&#236;"
- uint end = exp.tqfind( ";" );
+ uint end = exp.find( ";" );
exp = exp.mid( 2, end-2 );
exp = TQChar( exp.toInt() );
}
@@ -463,4 +463,4 @@ TQStringList PseudoDTD::entities( TQString start )
return entities;
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h
index 912ec4b..5da444c 100644
--- a/kate/xmltools/pseudo_dtd.h
+++ b/kate/xmltools/pseudo_dtd.h
@@ -73,4 +73,4 @@ class PseudoDTD
};
#endif // _PLUGIN_KANT_XMLTOOLS_DTD_H
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 06:03:34 +0000