rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 30 insertions, 30 deletions

diff --git a/kxsldbg/data/testdoc.xsl b/kxsldbg/data/testdoc.xsl
index a25a14d2..da6447f3 100644
--- a/kxsldbg/data/testdoc.xsl
+++ b/kxsldbg/data/testdoc.xsl
@@ -23,9 +23,9 @@ version="1.0">
 	</xsl:call-template>
 
 	<xsl:variable name="localvariable" select="'bar'"/>
-	<xsl:text>Global variable tqcontains </xsl:text><xsl:value-of select="$globalvariable"/><xsl:text>
+	<xsl:text>Global variable contains </xsl:text><xsl:value-of select="$globalvariable"/><xsl:text>
 </xsl:text>
-	<xsl:text>Local variable tqcontains </xsl:text><xsl:value-of select="$localvariable"/><xsl:text>
+	<xsl:text>Local variable contains </xsl:text><xsl:value-of select="$localvariable"/><xsl:text>
 </xsl:text>    
 
 	<!-- test import of xsl file -->
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 62d40250..8d156990 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -116,7 +116,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/,
                         actionCollection(), "configureCmd" );
    
     (void) new KAction( i18n("Inspect..."),
-                        "tqfind", Key_I,
+                        "find", Key_I,
                         this, TQT_SLOT(inspectorCmd_activated()),
                         actionCollection(), "inspectCmd" );
 
@@ -374,13 +374,13 @@ void KXsldbgPart::lookupSystemID( TQString systemID)
 #if KDE_IS_VERSION(3, 1, 90)
      systemID = KInputDialog::getText(
 			      i18n( "Lookup SystemID" ),
-			      i18n( "Please enter SystemID to tqfind:" ),
+			      i18n( "Please enter SystemID to find:" ),
 			      TQString(), &ok,
 			      mainView);
 #else
      systemID = TQInputDialog::getText(
 			      i18n( "Lookup SystemID" ),
-			      i18n( "Please enter SystemID to tqfind:" ),
+			      i18n( "Please enter SystemID to find:" ),
 			      TQLineEdit::Normal, TQString(), &ok,
 			      mainView);
 #endif
@@ -406,12 +406,12 @@ void KXsldbgPart::lookupPublicID(TQString publicID)
 #if KDE_IS_VERSION(3, 1, 90)
      publicID = KInputDialog::getText(
 			      i18n( "Lookup PublicID" ),
-			      i18n( "Please enter PublicID to tqfind:" ),
+			      i18n( "Please enter PublicID to find:" ),
 			      TQString(), &ok, mainView );
 #else
      publicID = TQInputDialog::getText(
 			      i18n( "Lookup PublicID" ),
-			      i18n( "Please enter PublicID to tqfind:" ),
+			      i18n( "Please enter PublicID to find:" ),
 			      TQLineEdit::Normal, TQString(), &ok, mainView );
 #endif
    }else{
@@ -821,7 +821,7 @@ void  KXsldbgPart::breakpointItem(TQString fileName, int lineNumber ,
     }
   }else{
 /*
-    if (!fileName.tqcontains("://")){
+    if (!fileName.contains("://")){
 	// relative path ? must handle this special case
 	KURL url;
 	url.setFileName(fileName);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
index ff3fd47c..a301aa8a 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
@@ -210,7 +210,7 @@ validateSource(xmlChar ** url, long *lineNo)
                 result = 1;
             }
         } else{
-            xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name tqcontains %1.\n").tqarg(xsldbgUrl(*url)));
+            xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name contains %1.\n").tqarg(xsldbgUrl(*url)));
 	    if (lineNo){
 	      xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
 	    }
@@ -301,7 +301,7 @@ validateData(xmlChar ** url, long *lineNo)
 	  if (lineNo){
              xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
 	  } else{
-             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name tqcontains %1.\n").tqarg(xsldbgUrl(*url)));
+             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name contains %1.\n").tqarg(xsldbgUrl(*url)));
 	  }
             result = 1;
         } else {
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
index 9d6bd217..7b098220 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
@@ -119,7 +119,7 @@ static TQString langLookupDir( const TQString &fname )
     TQStringList::Iterator it;
     for (it = search.begin(); it != search.end(); ++it)
     {
-	TQString baseDir = (*it).left((*it).tqfindRev('/')) ;
+	TQString baseDir = (*it).left((*it).findRev('/')) ;
 	TQFileInfo info(baseDir + "/"+ fname);
 	if (info.exists() && info.isFile() && info.isReadable())
 	  return baseDir;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 70a68570..241d9730 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -672,7 +672,7 @@ xsldbgMain(int argc, char **argv)
 	for ( it = xslParams.begin(); it != xslParams.end(); ++it){
 	    param = (*it);
 	    paramOK = true;
-	    separatorIdx = param.tqfind(':');
+	    separatorIdx = param.find(':');
 	    if (separatorIdx > 0){
 		paramName = param.left((uint)separatorIdx);
 		paramValue = param.mid((uint)separatorIdx + 1);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
index 92117282..e75c8419 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
@@ -64,13 +64,13 @@ public:
     XsldbgEventData *takeNode( TQLNode *n )         { return (XsldbgEventData *)TQGList::takeNode(n); }
     void  clear(void)                       { TQGList::clear(); }
     void  sort(void)                        { TQGList::sort(); }
-    int   tqfind( const XsldbgEventData *d )         { return TQGList::tqfind((TQPtrCollection::Item)d); }
-    int   findNext( const XsldbgEventData *d )     { return TQGList::tqfind((TQPtrCollection::Item)d,FALSE); }
-    int   tqfindRef( const XsldbgEventData *d )      { return TQGList::tqfindRef((TQPtrCollection::Item)d); }
-    int   findNextRef( const XsldbgEventData *d ){ return TQGList::tqfindRef((TQPtrCollection::Item)d,FALSE);}
-    uint  tqcontains( const XsldbgEventData *d ) const { return TQGList::tqcontains((TQPtrCollection::Item)d); }
+    int   find( const XsldbgEventData *d )         { return TQGList::find((TQPtrCollection::Item)d); }
+    int   findNext( const XsldbgEventData *d )     { return TQGList::find((TQPtrCollection::Item)d,FALSE); }
+    int   findRef( const XsldbgEventData *d )      { return TQGList::findRef((TQPtrCollection::Item)d); }
+    int   findNextRef( const XsldbgEventData *d ){ return TQGList::findRef((TQPtrCollection::Item)d,FALSE);}
+    uint  contains( const XsldbgEventData *d ) const { return TQGList::contains((TQPtrCollection::Item)d); }
     uint  containsRef( const XsldbgEventData *d ) const
-                                        { return TQGList::tqcontainsRef((TQPtrCollection::Item)d); }
+                                        { return TQGList::containsRef((TQPtrCollection::Item)d); }
     XsldbgEventData *at( uint i )                  { return (XsldbgEventData *)TQGList::at(i); }
     int   at(void) const                    { return TQGList::at(); }
     XsldbgEventData *current(void)  const              { return (XsldbgEventData *)TQGList::get(); }
diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
index 690847e8..1cdb0293 100644
--- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
+++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
@@ -25,7 +25,7 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *tqparent, KURL url)
 	KURL cleanUrl;
 	// convert paths relative to PWD into a absolute path
 	TQString relUrl = url.prettyURL();
-	if (!relUrl.tqcontains(":/")){
+	if (!relUrl.contains(":/")){
 	    if (!(relUrl.left(1) == "/"))
 		relUrl.prepend(TQDir::currentDirPath() + "/");
 	    cleanUrl.setFileName(relUrl); 
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
index 0292e282..db15bc1d 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
@@ -70,26 +70,26 @@ void XsldbgOutputView::slotProcShowMessage(TQString  msg)
   bool processed = FALSE;
   // Is this a result of an evaluate command
   if ((msg[0] == TQChar('=')) && (msg[1] == TQChar(' '))){
-    int endPosition = msg.tqfind(TQChar('\n'));
+    int endPosition = msg.find(TQChar('\n'));
     if (endPosition >= 0){
       processed = TRUE;
       showDialog(TQMessageBox::Information, i18n("Result of evaluation"),
 		 msg.mid(endPosition + 1));
     }
   }else  /* Is there some sort of error message in msg */
-    if ((msg.tqfind("Error:") != -1) ||
-	(msg.tqfind("Warning:") != -1) ||
-	(msg.tqfind("Request to xsldbg failed") != -1) ||
+    if ((msg.find("Error:") != -1) ||
+	(msg.find("Warning:") != -1) ||
+	(msg.find("Request to xsldbg failed") != -1) ||
          /* the following errors are libxml or libxslt generated */
-	(msg.tqfind("error:") != -1) ||
-	(msg.tqfind("xmlXPathEval:") != -1) ||
-	(msg.tqfind("runtime error")  != -1)) {
+	(msg.find("error:") != -1) ||
+	(msg.find("xmlXPathEval:") != -1) ||
+	(msg.find("runtime error")  != -1)) {
       /* OK we've found an error but ingore any errors about
 	 data or source files */
-      if ((msg.tqfind("Error: No XSL source file supplied") == -1) &&
-	  (msg.tqfind("Error: No XML data file supplied") == -1) &&
-	  (msg.tqfind("Load of source deferred") == -1) &&
-	  (msg.tqfind("Load of data deferred") == -1) )
+      if ((msg.find("Error: No XSL source file supplied") == -1) &&
+	  (msg.find("Error: No XML data file supplied") == -1) &&
+	  (msg.find("Load of source deferred") == -1) &&
+	  (msg.find("Load of data deferred") == -1) )
 	showDialog(TQMessageBox::Warning, i18n("Request Failed "),
 		 msg);
       processed = TRUE;