6 files changed, 14 insertions, 14 deletions
diff --git a/konq-plugins/sidebar/metabar/Doxyfile b/konq-plugins/sidebar/metabar/Doxyfile
index 4dfd560..586093d 100644
--- a/konq-plugins/sidebar/metabar/Doxyfile
+++ b/konq-plugins/sidebar/metabar/Doxyfile
@@ -17,7 +17,7 @@ ABBREVIATE_BRIEF       = "The $name class" \
                          is \
                          provides \
                          specifies \
-                         tqcontains \
+                         contains \
                          represents \
                          a \
                          an \
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index ebcf170..e6acdbd 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -222,7 +222,7 @@ ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqpa
       
         ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network"));
         
-        TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch);
+        TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, TQt::ExactMatch);
         if(avItem){
           delete avItem;
         }
@@ -236,7 +236,7 @@ ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqpa
       
       ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon));
       
-      TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch);
+      TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, TQt::ExactMatch);
       if(avItem){
         delete avItem;
       }
@@ -576,7 +576,7 @@ void ConfigDialog::loadThemes()
     theme_list.remove("..");
     themes->insertStringList(theme_list);
     
-    if(theme_list.tqfind(theme) != theme_list.end()){
+    if(theme_list.find(theme) != theme_list.end()){
       foundTheme = true;
     }
   }
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 5839a64..3f2f7c9 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -418,7 +418,7 @@ bool DefaultPlugin::handleRequest(const KURL &url)
   if(protocol == "exec"){
     int id = url.host().toInt();
         
-    TQMap<int,KService::Ptr>::Iterator it = runMap.tqfind(id);
+    TQMap<int,KService::Ptr>::Iterator it = runMap.find(id);
     if(it != runMap.end()){
     
       KFileItem *item = m_items.getFirst();
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index b90852d..aa09cd3 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -60,10 +60,10 @@ void HTTPPlugin::killJobs()
 void HTTPPlugin::loadInformation(DOM::HTMLElement node)
 {  
   /*DOM::DOMString innerHTML;
-  innerHTML += "<form action=\"tqfind:///\" method=\"GET\">";
+  innerHTML += "<form action=\"find:///\" method=\"GET\">";
   innerHTML += "<ul>";
   innerHTML += i18n("Keyword");
-  innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"tqfind\" id=\"find_text\" value=\"";
+  innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"find\" id=\"find_text\" value=\"";
   innerHTML += i18n("Web search");
   innerHTML += "\"></ul>";
   innerHTML += "<ul><input type=\"submit\" id=\"find_button\" value=\"";
@@ -99,8 +99,8 @@ void HTTPPlugin::loadBookmarks(DOM::HTMLElement node)
 
 bool HTTPPlugin::handleRequest(const KURL &url)
 {
-  if(url.protocol() == "tqfind"){
-    TQString keyword = url.queryItem("tqfind");
+  if(url.protocol() == "find"){
+    TQString keyword = url.queryItem("find");
     TQString type = url.queryItem("type");
 
     if(!keyword.isNull() && !keyword.isEmpty()){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 965319e..2b01a02 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -319,7 +319,7 @@ void MetabarWidget::loadCompleted()
     TQString tmp = stream.read();
     cssfile.close();
     
-    tmp.tqreplace("./", KURL::fromPathOrURL(file).directory(false));    
+    tmp.replace("./", KURL::fromPathOrURL(file).directory(false));    
     html->setUserStyleSheet(tmp);
   }
   
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index c9ac8b4..8ef445c 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -52,7 +52,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
   
   KURL url = item.url();
   TQString mimeType = item.mimetype();
-  TQString mimeGroup = mimeType.left(mimeType.tqfind('/'));
+  TQString mimeGroup = mimeType.left(mimeType.find('/'));
   
   urlList.clear();
   urlList.append(url);
@@ -96,7 +96,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
 
       if(cfg.hasKey("X-KDE-Require")){
         const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" );
-        if (capabilities.tqcontains( "Write" )){
+        if (capabilities.contains( "Write" )){
           continue;
         }
       }
@@ -123,7 +123,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
 
             // if we have a mimetype, see if we have an exact or a type globbed match
             if(!ok && (!mimeType.isEmpty() && *it == mimeType) ||
-              (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).tqfind('/')) == mimeGroup)))
+              (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).find('/')) == mimeGroup)))
             {
               checkTheMimetypes = true;
             }
@@ -132,7 +132,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
               ok = true;
               
               for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){
-                if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) ||
+                if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) ||
                     ((*itex) == mimeType))
                 {
                   ok = false;