Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 7e9d8ea45280ad6657796da9536ccf6218111f22)

6 files changed, 29 insertions, 29 deletions

diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 35816df..f198b9e 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -66,10 +66,10 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   setIcon(SmallIcon("metabar"));
 
   ok = new KPushButton(KStdGuiItem::ok(), this);
-  connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
+  connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
   
   cancel = new KPushButton(KStdGuiItem::cancel(), this);
-  connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
+  connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
   
   TQTabWidget *tab = new TQTabWidget(this);
   
@@ -117,7 +117,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   
   install_theme = new KPushButton(i18n("Install New Theme..."), theme_group);
   install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
-  connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme()));
+  connect(install_theme, TQ_SIGNAL(clicked()), this, TQ_SLOT(installTheme()));
   
   loadThemes();
   
@@ -125,23 +125,23 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   TQWidget *links = new TQWidget;
   
   link_create = new KPushButton(i18n("New..."), links);
-  connect(link_create, TQT_SIGNAL(clicked()), this, TQT_SLOT(createLink()));
+  connect(link_create, TQ_SIGNAL(clicked()), this, TQ_SLOT(createLink()));
   
   link_delete = new KPushButton(i18n("Delete"), links);
-  connect(link_delete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLink()));
+  connect(link_delete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteLink()));
   
   link_edit = new KPushButton(i18n("Edit..."), links);
-  connect(link_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editLink()));  
+  connect(link_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editLink()));  
   
   link_up = new KPushButton(links);
   link_up->setIconSet(SmallIconSet("go-up"));
   link_up->setEnabled(false);
-  connect(link_up, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkUp()));
+  connect(link_up, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveLinkUp()));
   
   link_down = new KPushButton(links);
   link_down->setIconSet(SmallIconSet("go-down"));
   link_down->setEnabled(false);
-  connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown()));
+  connect(link_down, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveLinkDown()));
     
   link_list = new TDEListView(links);
   link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
@@ -149,8 +149,8 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   link_list->setItemsMovable(TRUE);
   link_list->addColumn(i18n("Name"));
   link_list->addColumn(i18n("Address"));
-  connect(link_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(editLink(TQListViewItem*)));
-  connect(link_list, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateArrows()));
+  connect(link_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(editLink(TQListViewItem*)));
+  connect(link_list, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateArrows()));
   
   TQWidget *actionPage = new TQWidget;
   
@@ -311,10 +311,10 @@ void ConfigDialog::createLink()
   main->setIcon(SmallIcon("metabar"));
   
   KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main);
-  connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept()));
+  connect(ok, TQ_SIGNAL(clicked()), main, TQ_SLOT(accept()));
   
   KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main);
-  connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject()));
+  connect(cancel, TQ_SIGNAL(clicked()), main, TQ_SLOT(reject()));
   
   TQLineEdit *name = new TQLineEdit(i18n("New link"), main);
   TQLineEdit *url = new TQLineEdit("file:/", main);
@@ -394,10 +394,10 @@ void ConfigDialog::editLink(TQListViewItem *item)
     main->setIcon(SmallIcon("metabar"));
     
     KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main);
-    connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept()));
+    connect(ok, TQ_SIGNAL(clicked()), main, TQ_SLOT(accept()));
     
     KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main);
-    connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject()));
+    connect(cancel, TQ_SIGNAL(clicked()), main, TQ_SLOT(reject()));
     
     TQLineEdit *name = new TQLineEdit(linkList[item]->name, main);
     TQLineEdit *url = new TQLineEdit(linkList[item]->url, main);
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 3677663..79b1ea7 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -336,9 +336,9 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node)
       
         preview_job = TDEIO::filePreview(KURL::List(url), m_html->view()->width() - 30);
           
-        connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&)));
-        connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *)));
-        connect(preview_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
+        connect(preview_job, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQ_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&)));
+        connect(preview_job, TQ_SIGNAL(failed(const KFileItem *)), this, TQ_SLOT(slotPreviewFailed(const KFileItem *)));
+        connect(preview_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobFinished(TDEIO::Job *)));
       }
       
       m_functions->show("preview");
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index 4f9cfd1..12cf134 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -35,7 +35,7 @@
 MetabarFunctions::MetabarFunctions(TDEHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html)
 {
   timer = new TQTimer(this);
-  connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate()));
+  connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate()));
 }
 
 MetabarFunctions::~MetabarFunctions()
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 0645745..c66fc19 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -84,9 +84,9 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   config = new TDEConfig("metabarrc");
   
   dir_watch = new KDirWatch();
-  connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&)));
-  connect(dir_watch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&)));
-  connect(dir_watch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteCurrentInfo(const TQString&)));
+  connect(dir_watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(slotUpdateCurrentInfo(const TQString&)));
+  connect(dir_watch, TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(slotUpdateCurrentInfo(const TQString&)));
+  connect(dir_watch, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(slotDeleteCurrentInfo(const TQString&)));
 
   html = new TDEHTMLPart(this, "metabarhtmlpart");
   html->setJScriptEnabled(true);
@@ -97,9 +97,9 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   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 &)));
-  connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted()));
-  connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &)));
+  connect(html->browserExtension(), TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQ_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &)));
+  connect(html, TQ_SIGNAL(completed()), this, TQ_SLOT(loadCompleted()));
+  connect(html, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotShowPopup(const TQString&, const TQPoint &)));
   
   functions = new MetabarFunctions(html, this);
   
@@ -118,10 +118,10 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   layout->addWidget(html->view());
   
   popup = new TDEPopupMenu(0);
-  TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+  TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQ_SLOT(slotShowConfig()), html->actionCollection(), "configure");
   configAction->plug(popup);
   
-  TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload");
+  TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQ_SLOT(setTheme()), html->actionCollection(), "reload");
   reloadAction->plug(popup);
 
   setTheme();
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index b5186ab..4749f53 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
           for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){
           
             if(usePopup){
-              TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8());
+              TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQ_SLOT(runAction()), popup, idString.utf8());
               action->plug(popup);
             }
             else{
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 48b4afc..771668f 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -58,8 +58,8 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
   
   if(url.path().endsWith("/")){
     list_job = TDEIO::listDir(url, true, false);
-    connect(list_job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
-    connect(list_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
+    connect(list_job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQ_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+    connect(list_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobFinished(TDEIO::Job *)));
   
     m_functions->show("actions");
   }