Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit ca82971624269719d487c6f7980d7237f9420036.

6 files changed, 59 insertions, 59 deletions

diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 7d0f9bb..2585c7b 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -58,7 +58,7 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
 
 ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
 {
-  topWidgetName = parent->topLevelWidget()->name();
+  topWidgetName = parent->tqtopLevelWidget()->name();
   config = new KConfig("metabarrc");
   iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
 
@@ -78,7 +78,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   TQWidget *general = new TQWidget;
   
   TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general);
-  entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  entries_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   
   TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group);
   max_entries = new KIntSpinBox(entries_group);
@@ -98,7 +98,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   
   
   TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general);
-  appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  appearance_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   
   animate = new TQCheckBox(i18n("Animate resize"), appearance_group);
   animate->setChecked(config->readBoolEntry("AnimateResize", false));
@@ -110,13 +110,13 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   showframe->setChecked(config->readBoolEntry("ShowFrame", true));
   
   TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general);
-  theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  theme_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   
   themes = new KComboBox(theme_group);
-  themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
+  themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
   
   install_theme = new KPushButton(i18n("Install New Theme..."), theme_group);
-  install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  install_theme->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme()));
   
   loadThemes();
@@ -144,7 +144,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown()));
     
   link_list = new KListView(links);
-  link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+  link_list->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
   link_list->setSorting(-1);
   link_list->setItemsMovable(TRUE);
   link_list->addColumn(i18n("Name"));
@@ -161,7 +161,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   tab->addTab(actionPage, i18n("Actions"));
   tab->addTab(links, i18n("Links"));
   
-  //layout  
+  //tqlayout  
   TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5);
   general_layout->addWidget(entries_group, 0, 0);
   general_layout->addWidget(appearance_group, 0, 1);
@@ -320,7 +320,7 @@ void ConfigDialog::createLink()
   TQLineEdit *url = new TQLineEdit("file:/", main);
   
   KIconButton *icon = new KIconButton(main);
-  icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+  icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
   icon->setIconType(KIcon::Small, KIcon::Any);
   icon->setStrictIconSize(true);
   icon->setIcon("folder");
@@ -330,19 +330,19 @@ void ConfigDialog::createLink()
   bottom_layout->addWidget(ok);
   bottom_layout->addWidget(cancel);
   
-  TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
-  layout->addMultiCellWidget(icon, 0, 1, 0, 0);
-  layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-  layout->addWidget(name, 0, 2);
-  layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-  layout->addWidget(url, 1, 2);
+  TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
+  tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
+  tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+  tqlayout->addWidget(name, 0, 2);
+  tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+  tqlayout->addWidget(url, 1, 2);
 
   TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-  main_layout->addLayout(layout);
+  main_layout->addLayout(tqlayout);
   main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
   main_layout->addLayout(bottom_layout);
   
-  main->resize(300, main->sizeHint().height());
+  main->resize(300, main->tqsizeHint().height());
   
   if(main->exec() == TQDialog::Accepted){
     TQString name_str = name->text();
@@ -403,7 +403,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
     TQLineEdit *url = new TQLineEdit(linkList[item]->url, main);
     
     KIconButton *icon = new KIconButton(main);
-    icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     icon->setIconType(KIcon::Small, KIcon::Any);
     icon->setStrictIconSize(true);
     icon->setIcon(linkList[item]->icon);
@@ -413,19 +413,19 @@ void ConfigDialog::editLink(TQListViewItem *item)
     bottom_layout->addWidget(ok);
     bottom_layout->addWidget(cancel);
     
-    TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
-    layout->addMultiCellWidget(icon, 0, 1, 0, 0);
-    layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-    layout->addWidget(name, 0, 2);
-    layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-    layout->addWidget(url, 1, 2);
+    TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
+    tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+    tqlayout->addWidget(name, 0, 2);
+    tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+    tqlayout->addWidget(url, 1, 2);
     
     TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-    main_layout->addLayout(layout);
+    main_layout->addLayout(tqlayout);
     main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     main_layout->addLayout(bottom_layout);
     
-    main->resize(300, main->sizeHint().height());
+    main->resize(300, main->tqsizeHint().height());
     
     if(main->exec() == TQDialog::Accepted){
       TQString name_str = name->text();
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index b199b58..3f2f7c9 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -104,7 +104,7 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
       }
     }
     else{
-      DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8()));
+      DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8()));
 
       if(!action.isNull()){
         if(action.call("enabled()")){
@@ -156,7 +156,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
         KDesktopFile desktop(url.path(), TRUE);
         
         if(desktop.hasApplicationType ()){                    
-          MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
+          MetabarWidget::addEntry(innerHTML, i18n("Run %1").tqarg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
           
           m_functions->show("open");
         }
@@ -364,12 +364,12 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
   buffer.open(IO_WriteOnly);
   pix.save(&buffer, "PNG");
   
-  TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());  
+  TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());  
   bool media = item->mimetype().startsWith("video/");
 
   DOM::DOMString innerHTML;
   
-  innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15);
+  innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").tqarg(pix.height() + 15);
   
   if(media){
     innerHTML += " href=\"preview:///\"";
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index bbfb9e2..aa09cd3 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -107,7 +107,7 @@ bool HTTPPlugin::handleRequest(const KURL &url)
       KURL url("http://www.google.com/search");
       url.addQueryItem("q", keyword);
       
-      DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
+      DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->tqtopLevelWidget()->name());
       DCOPReply reply = ref.call("openURL", url.url());
     }
     
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index 1aaf9e8..f7bc152 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -81,7 +81,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList children = node.childNodes();
+    DOM::NodeList tqchildren = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
       }
     }
     else{
-      style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
     }
   }
 }
@@ -117,7 +117,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList children = node.childNodes();
+    DOM::NodeList tqchildren = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
         }
       }
       else{
-        style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
+        style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
       }
     }
   }
@@ -176,7 +176,7 @@ void MetabarFunctions::animate()
       }
       
       int change = currentHeight < height ? changeValue : -changeValue;
-      style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY);
       doc.updateRendering();
     }
   }
@@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
 int MetabarFunctions::getHeight(DOM::HTMLElement &element)
 {
   int height = 0;
-  DOM::NodeList children = element.childNodes();
-  for(uint i = 0; i < children.length(); i++){
-    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i));
+  DOM::NodeList tqchildren = element.childNodes();
+  for(uint i = 0; i < tqchildren.length(); i++){
+    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i));
     DOM::CSSStyleDeclaration style = node.style();
     
     DOM::DOMString css_height = style.getPropertyValue("height");
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index a8c2b69..0439c98 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -27,10 +27,10 @@
 #include "httpplugin.h"
 
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvaluelist.h>
 #include <tqurl.h>
 #include <tqbuffer.h>
@@ -94,7 +94,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   html->setCaretVisible(false);
   html->setDNDEnabled(false);
   html->setJavaEnabled(false);
-  html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+  html->view()->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
   html->view()->hide();
   
   connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &)));
@@ -114,11 +114,11 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   plugins.insert("http", httpPlugin);
   plugins.insert("https", httpPlugin);
   
-  TQVBoxLayout *layout = new TQVBoxLayout(this);
-  layout->addWidget(html->view());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  tqlayout->addWidget(html->view());
   
   popup = new KPopupMenu(0);
-  KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+  KAction *configAction = new KAction(i18n("Configure %1...").tqarg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
   configAction->plug(popup);
   
   KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
@@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check)
 
 TQString MetabarWidget::getCurrentURL()
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
   DCOPReply reply = ref.call("currentURL()");
     
   if (reply.isValid()) {
@@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL()
 
 void MetabarWidget::openURL(const TQString &url)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
   DCOPReply reply = ref.call("openURL", url);
 }
 
 void MetabarWidget::openTab(const TQString &url)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
   DCOPReply reply = ref.call("newTab", url);
 }
 
 void MetabarWidget::callAction(const TQString &action)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8());
+  DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->name()).append("/action/").append(action)).utf8());
   if(ref.call("enabled()")){
     ref.call("activate()");
   }
@@ -289,7 +289,7 @@ void MetabarWidget::loadCompleted()
       if(node.hasAttribute("image")){
         TQString icon = node.getAttribute("image").string();
         TQString url = getIconPath(icon);
-        TQString style = TQString("background-image: url(%1);").arg(url);
+        TQString style = TQString("background-image: url(%1);").tqarg(url);
         
         node.setAttribute("style", style);
       }
@@ -308,7 +308,7 @@ void MetabarWidget::loadCompleted()
   }
 
   config->setGroup("General");
-  TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default")));
+  TQString file = locate("data", TQString("metabar/themes/%1/default.css").tqarg(config->readEntry("Theme", "default")));
   if(file.isNull()){
     file = locate("data", TQString("metabar/themes/default/default.css"));
   }
@@ -393,7 +393,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
         skip = true; //needed to prevent some weired reload
       
         DOM::DOMString innerHTML;
-        innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height());
+        innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").tqarg(image.width(), image.height());
         innerHTML += "<object class=\"preview\" type=\"";
         innerHTML += item->mimetype();
         innerHTML += "\" data=\"";
@@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
     }
     
     if(element.id().string().startsWith("hidden")){
-      TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
+      TQString style = TQString("background-image: url(%1);").tqarg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
       element.setInnerText( showMore ? i18n("More") : i18n("Less") );
       element.setAttribute("style", style);
     }
@@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
   buffer.open(IO_WriteOnly);
   icon.save(&buffer, "PNG");
   
-  return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
+  return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
 }
 
 void MetabarWidget::slotShowSharingDialog()
@@ -584,7 +584,7 @@ void MetabarWidget::setTheme()
   loadComplete = false;
 
   config->setGroup("General");
-  TQString file = locate("data", TQString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default")));
+  TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").tqarg(config->readEntry("Theme", "default")));
   
   html->openURL(KURL(file));
 }
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 8daf5ba..333aab5 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
     TQBuffer buffer(data);
     buffer.open(IO_WriteOnly);
     pix.save(&buffer, "PNG");
-    TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
+    TQString icondata = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
     
     icon.setSrc(icondata);
   }
@@ -81,7 +81,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
       name.setInnerText(m_items.getFirst()->name());
     }
     else{
-      name.setInnerText(i18n("%1 Elements").arg(m_items.count()));
+      name.setInnerText(i18n("%1 Elements").tqarg(m_items.count()));
     }
   }
   
@@ -105,7 +105,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
         }
       }
 
-      type.setInnerText(i18n("%1 Folders, %2 Files").arg(dirs).arg(files));
+      type.setInnerText(i18n("%1 Folders, %2 Files").tqarg(dirs).tqarg(files));
     }