Rename old tq methods that no longer need a unique name

5 files changed, 21 insertions, 21 deletions

diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 2585c7b..63a62a6 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -58,7 +58,7 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
 
 ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
 {
-  topWidgetName = parent->tqtopLevelWidget()->name();
+  topWidgetName = parent->topLevelWidget()->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->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  entries_group->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  appearance_group->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   
   themes = new KComboBox(theme_group);
-  themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
+  themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
   
   install_theme = new KPushButton(i18n("Install New Theme..."), theme_group);
-  install_theme->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  install_theme->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+  link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
   link_list->setSorting(-1);
   link_list->setItemsMovable(TRUE);
   link_list->addColumn(i18n("Name"));
@@ -320,7 +320,7 @@ void ConfigDialog::createLink()
   TQLineEdit *url = new TQLineEdit("file:/", main);
   
   KIconButton *icon = new KIconButton(main);
-  icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+  icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
   icon->setIconType(KIcon::Small, KIcon::Any);
   icon->setStrictIconSize(true);
   icon->setIcon("folder");
@@ -342,7 +342,7 @@ void ConfigDialog::createLink()
   main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
   main_layout->addLayout(bottom_layout);
   
-  main->resize(300, main->tqsizeHint().height());
+  main->resize(300, main->sizeHint().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->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     icon->setIconType(KIcon::Small, KIcon::Any);
     icon->setStrictIconSize(true);
     icon->setIcon(linkList[item]->icon);
@@ -425,7 +425,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
     main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     main_layout->addLayout(bottom_layout);
     
-    main->resize(300, main->tqsizeHint().height());
+    main->resize(300, main->sizeHint().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 3f2f7c9..e6c594c 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()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8()));
+      DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8()));
 
       if(!action.isNull()){
         if(action.call("enabled()")){
@@ -364,7 +364,7 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
   buffer.open(IO_WriteOnly);
   pix.save(&buffer, "PNG");
   
-  TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());  
+  TQString src = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());  
   bool media = item->mimetype().startsWith("video/");
 
   DOM::DOMString innerHTML;
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index aa09cd3..bbfb9e2 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()->tqtopLevelWidget()->name());
+      DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
       DCOPReply reply = ref.call("openURL", url.url());
     }
     
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 0439c98..700cb74 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -94,7 +94,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   html->setCaretVisible(false);
   html->setDNDEnabled(false);
   html->setJavaEnabled(false);
-  html->view()->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+  html->view()->setSizePolicy(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 &)));
@@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check)
 
 TQString MetabarWidget::getCurrentURL()
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->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->tqtopLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
   DCOPReply reply = ref.call("openURL", url);
 }
 
 void MetabarWidget::openTab(const TQString &url)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
   DCOPReply reply = ref.call("newTab", url);
 }
 
 void MetabarWidget::callAction(const TQString &action)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->name()).append("/action/").append(action)).utf8());
+  DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8());
   if(ref.call("enabled()")){
     ref.call("activate()");
   }
@@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
   buffer.open(IO_WriteOnly);
   icon.save(&buffer, "PNG");
   
-  return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+  return TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
 }
 
 void MetabarWidget::slotShowSharingDialog()
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 333aab5..1779b37 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::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+    TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
     
     icon.setSrc(icondata);
   }