Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

7 files changed, 68 insertions, 68 deletions

diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 6d89c3219..6604a5a08 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -49,7 +49,7 @@
 #include "searchproviderdlg.h"
 
 
-class SearchProviderItem : public QCheckListItem
+class SearchProviderItem : public TQCheckListItem
 {
 public:
     SearchProviderItem(TQListView *parent, SearchProvider *provider)
@@ -459,7 +459,7 @@ SearchProviderItem *FilterOptions::displaySearchProvider(SearchProvider *p, bool
 
     item = new SearchProviderItem(m_dlg->lvSearchProviders, p);
 
-    if (m_favoriteEngines.find(p->desktopEntryName())!=m_favoriteEngines.end())
+    if (m_favoriteEngines.tqfind(p->desktopEntryName())!=m_favoriteEngines.end())
        item->setOn(true);
 
     for (itemCount = 1; itemCount < totalCount; itemCount++)
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index fdeeb27ca..f9afe187c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>FilterOptionsUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FilterOptionsUI</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>cbEnableShortcuts</cstring>
             </property>
@@ -32,7 +32,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo
 &lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout10</cstring>
             </property>
@@ -40,7 +40,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>lbDelimiter</cstring>
                     </property>
@@ -62,7 +62,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo
                         <string>Choose the delimiter that separates the keyword from the phrase or word to be searched.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>lbDefaultEngine</cstring>
                     </property>
@@ -112,7 +112,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>pbChange</cstring>
                     </property>
@@ -126,7 +126,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
                         <string>Modify a search provider.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="2">
+                <widget class="TQPushButton" row="2" column="2">
                     <property name="name">
                         <cstring>pbDelete</cstring>
                     </property>
@@ -140,7 +140,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
                         <string>Delete the selected search provider.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="2">
+                <widget class="TQPushButton" row="0" column="2">
                     <property name="name">
                         <cstring>pbNew</cstring>
                     </property>
@@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>21</width>
                             <height>170</height>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 9f3a245fc..0e800a36c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -64,7 +64,7 @@ TQString KURISearchFilterEngine::webShortcutQuery( const TQString& typedString )
   if (m_bWebShortcutsEnabled)
   {
     TQString search = typedString;
-    int pos = search.find(m_cKeywordDelimiter);
+    int pos = search.tqfind(m_cKeywordDelimiter);
 
     TQString key;
     if (pos > -1)
@@ -98,7 +98,7 @@ TQString KURISearchFilterEngine::autoWebSearchQuery( const TQString& typedString
   if (m_bWebShortcutsEnabled && !m_defaultSearchEngine.isEmpty())
   {
     // Make sure we ignore supported protocols, e.g. "smb:", "http:"
-    int pos = typedString.find(':');
+    int pos = typedString.tqfind(':');
 
     if (pos == -1 || !KProtocolInfo::isKnownProtocol(typedString.left(pos)))
     {
@@ -147,7 +147,7 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
       int i = 0;
       int n = 0;
       TQString s = userquery.mid (pos, qsexpr.matchedLength());
-      while ((i = s.find(" ")) != -1)
+      while ((i = s.tqfind(" ")) != -1)
       {
         s = s.replace (i, 1, "%20");
         n++;
@@ -163,11 +163,11 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
   // Back-substitute quoted strings (%20 -> " "):
   {
     int i = 0;
-    while ((i = userquery.find("%20")) != -1)
-      userquery = userquery.replace(i, 3, " ");
+    while ((i = userquery.tqfind("%20")) != -1)
+      userquery = userquery.tqreplace(i, 3, " ");
 
     for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it )
-      *it = (*it).replace("%20", " ");
+      *it = (*it).tqreplace("%20", " ");
   }
 
   PIDDBG << "Generating substitution map:\n";
@@ -187,23 +187,23 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
       v = l[i-1];
 
     // Back-substitute quoted strings (%20 -> " "):
-    while ((j = v.find("%20")) != -1)
-      v = v.replace(j, 3, " ");
+    while ((j = v.tqfind("%20")) != -1)
+      v = v.tqreplace(j, 3, " ");
 
     // Insert partial queries (referenced by \1 ... \n) to map:
-    map.replace(TQString::number(i), v);
+    map.tqreplace(TQString::number(i), v);
     PDVAR ("  map['" + nr + "']", map[nr]);
 
     // Insert named references (referenced by \name) to map:
     j = 0;
-    if ((i>0) && (pos = v.find("=")) > 0)
+    if ((i>0) && (pos = v.tqfind("=")) > 0)
     {
       TQString s = v.mid(pos + 1);
       TQString k = v.left(pos);
 
       // Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0')
-      while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\");
-      map.replace(k, s);
+      while ((j = s.tqfind("%5C")) != -1) s = s.tqreplace(j, 3, "\\");
+      map.tqreplace(k, s);
       PDVAR ("  map['" + k + "']", map[k]);
     }
   }
@@ -231,12 +231,12 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
   // Check, if old style '\1' is found and replace it with \{@} (compatibility mode):
   {
     int pos = -1;
-    if ((pos = newurl.find("\\1")) >= 0)
+    if ((pos = newurl.tqfind("\\1")) >= 0)
     {
       PIDDBG << "WARNING: Using compatibility mode for newurl='" << newurl
              << "'. Please replace old style '\\1' with new style '\\{0}' "
                 "in the query definition.\n";
-      newurl = newurl.replace(pos, 2, "\\{@}");
+      newurl = newurl.tqreplace(pos, 2, "\\{@}");
     }
   }
 
@@ -275,7 +275,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
         // Substitute a range of keywords
         if (range.search(rlitem, 0) >= 0)
         {
-          int pos = rlitem.find("-");
+          int pos = rlitem.tqfind("-");
           int first = rlitem.left(pos).toInt();
           int last  = rlitem.right(rlitem.length()-pos-1).toInt();
 
@@ -307,7 +307,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
           v = encodeString(s, encodingMib);
           PDVAR ("    default", s);
         }
-        else if (map.contains(rlitem))
+        else if (map.tqcontains(rlitem))
         {
           // Use value from substitution map:
           found = true;
@@ -340,7 +340,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
 
           // Encode '+', otherwise it would be interpreted as space in the resulting url:
           int vpos = 0;
-          while ((vpos = v.find('+')) != -1)
+          while ((vpos = v.tqfind('+')) != -1)
             v = v.replace (vpos, 1, "%2B");
 
         }
@@ -353,7 +353,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
         i++;
       }
 
-      newurl = newurl.replace(pos, reflist.matchedLength(), v);
+      newurl = newurl.tqreplace(pos, reflist.matchedLength(), v);
     }
 
     // Special handling for \{@};
@@ -370,7 +370,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
 
       // Substitute \{@} with list of unmatched query strings
       int vpos = 0;
-      while ((vpos = newurl.find("\\@")) != -1)
+      while ((vpos = newurl.tqfind("\\@")) != -1)
         newurl = newurl.replace (vpos, 2, v);
     }
   }
@@ -397,7 +397,7 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
 {
   // Return nothing if userquery is empty and it contains
   // substitution strings...
-  if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0)
+  if (query.isEmpty() && url.tqfind(TQRegExp(TQRegExp::escape("\\{"))) > 0)
     return TQString::null;
 
   // Debug info of map:
@@ -427,13 +427,13 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
   PDVAR ("query definition", url);
 
   // Add charset indicator for the query to substitution map:
-  map.replace("ikw_charset", cseta);
+  map.tqreplace("ikw_charset", cseta);
 
   // Add charset indicator for the fallback query to substitution map:
   TQString csetb = cset2;
   if (csetb.isEmpty())
     csetb = "iso-8859-1";
-  map.replace("wsc_charset", csetb);
+  map.tqreplace("wsc_charset", csetb);
 
   TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum());
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index 586f947ff..183d2a288 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -60,7 +60,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
         m_dlg->leName->setText(m_provider->name());
         m_dlg->leQuery->setText(m_provider->query());
         m_dlg->leShortcut->setText(m_provider->keys().join(","));
-        m_dlg->cbCharset->setCurrentItem(m_provider->charset().isEmpty() ? 0 : charsets.findIndex(m_provider->charset()));
+        m_dlg->cbCharset->setCurrentItem(m_provider->charset().isEmpty() ? 0 : charsets.tqfindIndex(m_provider->charset()));
         m_dlg->leName->setEnabled(false);
         m_dlg->leQuery->setFocus();
     }
@@ -81,7 +81,7 @@ void SearchProviderDialog::slotChanged()
 
 void SearchProviderDialog::slotOk()
 {
-    if ((m_dlg->leQuery->text().find("\\{") == -1)
+    if ((m_dlg->leQuery->text().tqfind("\\{") == -1)
         && KMessageBox::warningContinueCancel(0,
             i18n("The URI does not contain a \\{...} placeholder for the user query.\n"
                  "This means that the same page is always going to be visited, "
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
index 1a507c0ff..458de9394 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SearchProviderDlgUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SearchProviderDlgUI</cstring>
     </property>
@@ -27,7 +27,7 @@
                 <string>Enter the human readable name of the search provider here.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>lbCharset</cstring>
             </property>
@@ -41,7 +41,7 @@
                 <string>Select the character set that will be used to encode your search query</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>lbQuery</cstring>
             </property>
@@ -58,7 +58,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the
 &lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>lbName</cstring>
             </property>
@@ -82,7 +82,7 @@ The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For exampl
 &lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>lbShortcut</cstring>
             </property>
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index f0986c188..a893e9f3a 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -41,7 +41,7 @@ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,
     : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ),
       DCOPObject( "LocalDomainURIFilterIface" ),
       last_time( 0 ),
-      m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) )
+      m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) )
 {
     configure();
 }
@@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
     if( m_hostPortPattern.exactMatch( cmd ) && 
         isLocalDomainHost( cmd ) )
     {
-        cmd.prepend( TQString::fromLatin1("http://") );
+        cmd.prepend( TQString::tqfromLatin1("http://") );
         setFilteredURI( data, KURL( cmd ) );
         setURIType( data, KURIFilterData::NET_PROTOCOL );
         
@@ -71,12 +71,12 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
 bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
 {
     // find() returns -1 when no match -> left()/truncate() are noops then
-    TQString host( cmd.left( cmd.find( '/' ) ) );
-    host.truncate( host.find( ':' ) ); // Remove port number
+    TQString host( cmd.left( cmd.tqfind( '/' ) ) );
+    host.truncate( host.tqfind( ':' ) ); // Remove port number
 
     if( !(host == last_host && last_time > time( NULL ) - 5 ) ) {
 
-        TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" ));
+        TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "klocaldomainurifilterhelper" ));
         if( helper.isEmpty())
             return last_result = false;
 
@@ -95,7 +95,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
         last_result = proc.wait( 1 ) && proc.normalExit() && !proc.exitStatus();
 
         if( !m_fullname.isEmpty() )
-            cmd.replace( 0, host.length(), m_fullname );
+            cmd.tqreplace( 0, host.length(), m_fullname );
     }
 
     return last_result;
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index 9d15802f1..40d97e29d 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -43,7 +43,7 @@
 #define IPv6_PATTERN    "^\\[.*\\]"
 #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*"
 
-#define QFL1(x) TQString::fromLatin1(x)
+#define QFL1(x) TQString::tqfromLatin1(x)
 
  /**
   * IMPORTANT:
@@ -66,7 +66,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
 
   // Match FQDN_PATTERN
   exp.setPattern( QFL1(FQDN_PATTERN) );
-  if ( cmd.contains( exp ) )
+  if ( cmd.tqcontains( exp ) )
   {
     if (verbose)
       kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -85,7 +85,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
 
   // Match IPv4 addresses
   exp.setPattern( QFL1(IPv4_PATTERN) );
-  if ( cmd.contains( exp ) )
+  if ( cmd.tqcontains( exp ) )
   {
     if (verbose)
       kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -95,7 +95,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
 
   // Match IPv6 addresses
   exp.setPattern( QFL1(IPv6_PATTERN) );
-  if ( cmd.contains( exp ) )
+  if ( cmd.tqcontains( exp ) )
   {
     if (verbose)
       kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -121,7 +121,7 @@ static TQString removeArgs( const TQString& _cmd )
 
     do
     {
-      spacePos = cmd.find( ' ', spacePos+1 );
+      spacePos = cmd.tqfind( ' ', spacePos+1 );
     } while ( spacePos > 1 && cmd[spacePos - 1] == '\\' );
 
     if( spacePos > 0 )
@@ -164,13 +164,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
 
   if (!isMalformed &&
       (url.protocol().length() == 4) &&
-      (url.protocol() != TQString::fromLatin1("http")) &&
+      (url.protocol() != TQString::tqfromLatin1("http")) &&
       (url.protocol()[0]=='h') &&
       (url.protocol()[1]==url.protocol()[2]) &&
       (url.protocol()[3]=='p'))
   {
      // Handle "encrypted" URLs like: h++p://www.kde.org
-     url.setProtocol( TQString::fromLatin1("http"));
+     url.setProtocol( TQString::tqfromLatin1("http"));
      setFilteredURI( data, url);
      setURIType( data, KURIFilterData::NET_PROTOCOL );
      return true;
@@ -182,7 +182,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   // You mean caching the last filtering, to try and reuse it, to save stat()s? (David)
 
   const TQString starthere_proto = QFL1("start-here:");
-  if (cmd.find(starthere_proto, 0, true) == 0 )
+  if (cmd.tqfind(starthere_proto, 0, true) == 0 )
   {
     setFilteredURI( data, KURL("system:/") );
     setURIType( data, KURIFilterData::LOCAL_DIR );
@@ -193,8 +193,8 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   const TQString man_proto = QFL1("man:");
   const TQString info_proto = QFL1("info:");
   if( cmd[0] == '#' ||
-      cmd.find( man_proto, 0, true ) == 0 ||
-      cmd.find( info_proto, 0, true ) == 0 )
+      cmd.tqfind( man_proto, 0, true ) == 0 ||
+      cmd.tqfind( info_proto, 0, true ) == 0 )
   {
     if( cmd.left(2) == QFL1("##") )
       cmd = QFL1("info:/") + cmd.mid(2);
@@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   }
 
   // Detect UNC style (aka windows SMB) URLs
-  if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) )
+  if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) )
   {
     // make sure path is unix style
-    cmd.replace('\\', '/');
-    cmd.prepend( TQString::fromLatin1( "smb:" ) );
+    cmd.tqreplace('\\', '/');
+    cmd.prepend( TQString::tqfromLatin1( "smb:" ) );
     setFilteredURI( data, KURL( cmd ));
     setURIType( data, KURIFilterData::NET_PROTOCOL );
     return true;
@@ -257,7 +257,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
 
   if( path[0] == '~' )
   {
-    int slashPos = path.find('/');
+    int slashPos = path.tqfind('/');
     if( slashPos == -1 )
       slashPos = path.length();
     if( slashPos == 1 )   // ~/
@@ -293,7 +293,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
       const char* exp = getenv( path.mid( 1, r.matchedLength() - 1 ).local8Bit().data() );
       if(exp)
       {
-        path.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) );
+        path.tqreplace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) );
         expanded = true;
       }
     }
@@ -303,7 +303,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   {
     // Look for #ref again, after $ and ~ expansion (testcase: $QTDIR/doc/html/functions.html#s)
     // Can't use KURL here, setPath would escape it...
-    int pos = path.find('#');
+    int pos = path.tqfind('#');
     if ( pos > -1 )
     {
       ref = path.mid( pos + 1 );
@@ -354,12 +354,12 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
     if ( !exists ) {
       // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter
       // If the app using this filter doesn't support it, well, it'll simply error out itself
-      int lastSlash = path.findRev( '/' );
-      if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments
+      int lastSlash = path.tqfindRev( '/' );
+      if ( lastSlash > -1 && path.tqfind( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments
       {
         TQString fileName = path.mid( lastSlash + 1 );
         TQString testPath = path.left( lastSlash + 1 );
-        if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
+        if ( ( fileName.tqfind( '*' ) != -1 || fileName.tqfind( '[' ) != -1 || fileName.tqfind( '?' ) != -1 )
            && stat( TQFile::encodeName(testPath).data(), &buff ) == 0 )
         {
           nameFilter = fileName;
@@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setRef(ref);
     u.setQuery(query);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
+    if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it's a file will get
       // an access denied error later on.
@@ -453,7 +453,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   // Okay this is the code that allows users to supply custom matches for
   // specific URLs using Qt's regexp class. This is hard-coded for now.
   // TODO: Make configurable at some point...
-  if ( !cmd.contains( ' ' ) )
+  if ( !cmd.tqcontains( ' ' ) )
   {
     TQValueList<URLHint>::ConstIterator it;
     for( it = m_urlHints.begin(); it != m_urlHints.end(); ++it )
@@ -492,7 +492,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setPath(path);
     u.setRef(ref);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
+    if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it exists and will get
       // an access denied error later on.