Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 36 insertions, 36 deletions

diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp
index 2e775fcb..e8cbd4a6 100644
--- a/lib/kross/main/scriptaction.cpp
+++ b/lib/kross/main/scriptaction.cpp
@@ -164,7 +164,7 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement&
     TDEAction::setIcon(icon);
 
     // connect signal
-    connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activate()));
+    connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(activate()));
 }
 
 ScriptAction::~ScriptAction()
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index e96c4a90..75e2c2b0 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -76,10 +76,10 @@ ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent)
     setInstance( ScriptGUIClient::instance() );
 
     // action to execute a scriptfile.
-    new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile");
+    new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile");
 
     // acion to show the ScriptManagerGUI dialog.
-    new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts");
+    new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts");
 
     // The predefined ScriptActionCollection's this ScriptGUIClient provides.
     d->collections.replace("installedscripts",
@@ -250,11 +250,11 @@ bool ScriptGUIClient::loadScriptConfigDocument(const TQString& scriptconfigfile,
             installedcollection->attach( action );
         }
 
-        connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ),
-                this, TQT_SLOT( executionFailed(const TQString&, const TQString&) ));
-        connect(action.data(), TQT_SIGNAL( success() ),
-                this, TQT_SLOT( successfullyExecuted() ));
-        connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*)));
+        connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ),
+                this, TQ_SLOT( executionFailed(const TQString&, const TQString&) ));
+        connect(action.data(), TQ_SIGNAL( success() ),
+                this, TQ_SLOT( successfullyExecuted() ));
+        connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*)));
     }
     emit collectionChanged(installedcollection);
     return true;
@@ -329,11 +329,11 @@ bool ScriptGUIClient::loadScriptFile()
         ScriptActionCollection* loadedcollection = d->collections["loadedscripts"];
         if(loadedcollection) {
             ScriptAction::Ptr action = new ScriptAction( url.path() );
-            connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ),
-                    this, TQT_SLOT( executionFailed(const TQString&, const TQString&) ));
-            connect(action.data(), TQT_SIGNAL( success() ),
-                    this, TQT_SLOT( successfullyExecuted() ));
-            connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*)));
+            connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ),
+                    this, TQ_SLOT( executionFailed(const TQString&, const TQString&) ));
+            connect(action.data(), TQ_SIGNAL( success() ),
+                    this, TQ_SLOT( successfullyExecuted() ));
+            connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*)));
 
             loadedcollection->detach(action);
             loadedcollection->attach(action);
@@ -361,11 +361,11 @@ bool ScriptGUIClient::executeScriptFile(const TQString& file)
 
 bool ScriptGUIClient::executeScriptAction(ScriptAction::Ptr action)
 {
-    connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ),
-            this, TQT_SLOT( executionFailed(const TQString&, const TQString&) ));
-    connect(action.data(), TQT_SIGNAL( success() ),
-            this, TQT_SLOT( successfullyExecuted() ));
-    connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*)));
+    connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ),
+            this, TQ_SLOT( executionFailed(const TQString&, const TQString&) ));
+    connect(action.data(), TQ_SIGNAL( success() ),
+            this, TQ_SLOT( successfullyExecuted() ));
+    connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*)));
     action->activate();
     bool ok = action->hadException();
     action->finalize(); // execution is done.
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 50a0101f..d04f8d9d 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -135,45 +135,45 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     slotFillScriptsList();
 
     slotSelectionChanged(0);
-    connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+    connect(scriptsList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
 
     btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "application-x-executable", TDEIcon::MainToolbar, 16 ));
-    connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript()));
+    connect(btnExec, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript()));
     btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "document-open", TDEIcon::MainToolbar, 16 ));
-    connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript()));
+    connect(btnLoad, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript()));
     btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 ));
-    connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript()));
+    connect(btnUnload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript()));
     btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", TDEIcon::MainToolbar, 16 ));
-    connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript()));
+    connect(btnInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 ));
-    connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
+    connect(btnUninstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
 #ifdef KROSS_SUPPORT_NEWSTUFF
     btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 ));
-    connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
+    connect(btnNewStuff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
 #endif
 /*
     toolBar->setIconText( TDEToolBar::IconTextRight );
 
     toolBar->insertButton("application-x-executable", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute"));
-    toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript()));
+    toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript()));
     toolBar->insertLineSeparator();
     toolBar->insertButton("document-open", WdgScriptsManagerPrivate::LoadBtn, true, i18n("Load"));
-    toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript()));
+    toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript()));
     toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UnloadBtn, false, i18n("Unload"));
-    toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript()));
+    toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript()));
     toolBar->insertLineSeparator();
     toolBar->insertButton("fileimport", WdgScriptsManagerPrivate::InstallBtn, true, i18n("Install"));
-    toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript()));
+    toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall"));
-    toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
+    toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
 #ifdef KROSS_SUPPORT_NEWSTUFF
     toolBar->insertLineSeparator();
     toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts"));
-    toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
+    toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
 #endif
 */
-    connect(scr, TQT_SIGNAL( collectionChanged(ScriptActionCollection*) ),
-            this, TQT_SLOT( slotFillScriptsList() ));
+    connect(scr, TQ_SIGNAL( collectionChanged(ScriptActionCollection*) ),
+            this, TQ_SLOT( slotFillScriptsList() ));
 }
 
 WdgScriptsManager::~WdgScriptsManager()
@@ -325,7 +325,7 @@ void WdgScriptsManager::slotGetNewScript()
 
     if(! d->newstuff) {
         d->newstuff = new ScriptNewStuff(d->m_scripguiclient, type);
-        connect(d->newstuff, TQT_SIGNAL(installFinished()), this, TQT_SLOT(slotResourceInstalled()));
+        connect(d->newstuff, TQ_SIGNAL(installFinished()), this, TQ_SLOT(slotResourceInstalled()));
     }
 
     KNS::Engine *engine = new KNS::Engine(d->newstuff, type, this);
@@ -333,8 +333,8 @@ void WdgScriptsManager::slotGetNewScript()
     d->setType(type);
 
     KNS::ProviderLoader *p = new KNS::ProviderLoader(this);
-    TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)),
-                     d, TQT_SLOT(slotProviders(Provider::List*)));
+    TQObject::connect(p, TQ_SIGNAL(providersLoaded(Provider::List*)),
+                     d, TQ_SLOT(slotProviders(Provider::List*)));
 
     p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml");
     d->exec();