Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 40 insertions, 40 deletions

diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index 86063f4e..172f4857 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -51,7 +51,7 @@ bool convert( const KURL & uIn, const TQString & /*inputFormat*/, const KURL & u
     KoFilterManager* manager = new KoFilterManager( uIn.path() );
 
     ProgressObject progressObj;
-    TQObject::connect(manager, TQT_SIGNAL(sigProgress(int)), &progressObj, TQT_SLOT(slotProgress(int)));
+    TQObject::connect(manager, TQ_SIGNAL(sigProgress(int)), &progressObj, TQ_SLOT(slotProgress(int)));
 
     manager->setBatchMode( batch );
 
diff --git a/tools/thesaurus/main.cpp b/tools/thesaurus/main.cpp
index 2cad3320..622314c5 100644
--- a/tools/thesaurus/main.cpp
+++ b/tools/thesaurus/main.cpp
@@ -91,8 +91,8 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
     m_edit = new KHistoryCombo(m_page);
     m_edit_label = new TQLabel(m_edit, i18n("&Search for:"), m_page);
     m_search = new KPushButton(i18n("S&earch"), m_page);
-    connect(m_search, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotFindTerm()));
+    connect(m_search, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotFindTerm()));
     row1->addWidget(m_edit_label, 0);
     row1->addWidget(m_edit, 1);
     row1->addWidget(m_search, 0);
@@ -105,11 +105,11 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
     TQToolTip::add(m_forward, i18n("Forward"));
     row1->addWidget(m_forward, 0);
     m_lang = new KPushButton(i18n("Change Language..."), m_page);
-    connect(m_lang, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChangeLanguage()));
+    connect(m_lang, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeLanguage()));
     row1->addWidget(m_lang, 0);
 
-    connect(m_back, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBack()));
-    connect(m_forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotForward()));
+    connect(m_back, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBack()));
+    connect(m_forward, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotForward()));
     
     m_tab = new TQTabWidget(m_page);
     m_top_layout->addWidget(m_tab);
@@ -137,28 +137,28 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
 
     // single click -- keep display unambiguous by removing other selections:
     
-    connect(m_thes_syn, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQT_SLOT(clearSelection()));
-    connect(m_thes_syn, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQT_SLOT(clearSelection()));
-    connect(m_thes_syn, TQT_SIGNAL(selectionChanged(TQListBoxItem *)),
-        this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
+    connect(m_thes_syn, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQ_SLOT(clearSelection()));
+    connect(m_thes_syn, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQ_SLOT(clearSelection()));
+    connect(m_thes_syn, TQ_SIGNAL(selectionChanged(TQListBoxItem *)),
+        this, TQ_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
 
-    connect(m_thes_hyper, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQT_SLOT(clearSelection()));
-    connect(m_thes_hyper, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQT_SLOT(clearSelection()));
-    connect(m_thes_hyper, TQT_SIGNAL(selectionChanged(TQListBoxItem *)),
-        this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
+    connect(m_thes_hyper, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQ_SLOT(clearSelection()));
+    connect(m_thes_hyper, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQ_SLOT(clearSelection()));
+    connect(m_thes_hyper, TQ_SIGNAL(selectionChanged(TQListBoxItem *)),
+        this, TQ_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
 
-    connect(m_thes_hypo, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQT_SLOT(clearSelection()));
-    connect(m_thes_hypo, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQT_SLOT(clearSelection()));
-    connect(m_thes_hypo, TQT_SIGNAL(selectionChanged(TQListBoxItem *)),
-        this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
+    connect(m_thes_hypo, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQ_SLOT(clearSelection()));
+    connect(m_thes_hypo, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQ_SLOT(clearSelection()));
+    connect(m_thes_hypo, TQ_SIGNAL(selectionChanged(TQListBoxItem *)),
+        this, TQ_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
 
     // double click:
-    connect(m_thes_syn, TQT_SIGNAL(selected(const TQString &)),
-        this, TQT_SLOT(slotFindTerm(const TQString &)));
-    connect(m_thes_hyper, TQT_SIGNAL(selected(const TQString &)),
-        this, TQT_SLOT(slotFindTerm(const TQString &)));
-    connect(m_thes_hypo, TQT_SIGNAL(selected(const TQString &)),
-        this, TQT_SLOT(slotFindTerm(const TQString &)));
+    connect(m_thes_syn, TQ_SIGNAL(selected(const TQString &)),
+        this, TQ_SLOT(slotFindTerm(const TQString &)));
+    connect(m_thes_hyper, TQ_SIGNAL(selected(const TQString &)),
+        this, TQ_SLOT(slotFindTerm(const TQString &)));
+    connect(m_thes_hypo, TQ_SIGNAL(selected(const TQString &)),
+        this, TQ_SLOT(slotFindTerm(const TQString &)));
 
     //
     // WordNet Tab
@@ -171,18 +171,18 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
 
     m_combobox = new TQComboBox(vbox2);
     m_combobox->setEditable(false);
-    connect(m_combobox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFindTerm()));
+    connect(m_combobox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFindTerm()));
 
     m_resultbox = new TQTextBrowser(vbox2);
     m_resultbox->setTextFormat(TQt::RichText);
     // TODO?: m_resultbox->setMimeSourceFactory(...); to avoid warning
-    connect(m_resultbox, TQT_SIGNAL(linkClicked(const TQString &)),
-        this, TQT_SLOT(slotFindTerm(const TQString &)));
+    connect(m_resultbox, TQ_SIGNAL(linkClicked(const TQString &)),
+        this, TQ_SLOT(slotFindTerm(const TQString &)));
 
     // Connect for the history box
     m_edit->setTrapReturnKey(true);        // Do not use Return as default key...
-    connect(m_edit, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotFindTerm(const TQString&)));
-    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotGotoHistory(int)));
+    connect(m_edit, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotFindTerm(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotGotoHistory(int)));
 
     TQHBoxLayout *row2 = new TQHBoxLayout( m_top_layout );
     m_replace = new KLineEdit(m_page);
@@ -200,19 +200,19 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
     
     // calling the 'wn' binary
     m_wnproc = new TDEProcess;
-    connect(m_wnproc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(wnExited(TDEProcess*)));
-    connect(m_wnproc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-        this, TQT_SLOT(receivedWnStdout(TDEProcess*, char*, int)));
-    connect(m_wnproc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-        this, TQT_SLOT(receivedWnStderr(TDEProcess*, char*, int)));
+    connect(m_wnproc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(wnExited(TDEProcess*)));
+    connect(m_wnproc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+        this, TQ_SLOT(receivedWnStdout(TDEProcess*, char*, int)));
+    connect(m_wnproc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+        this, TQ_SLOT(receivedWnStderr(TDEProcess*, char*, int)));
 
     // grep'ing the text file
     m_thesproc = new TDEProcess;
-    connect(m_thesproc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(thesExited(TDEProcess*)));
-    connect(m_thesproc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-        this, TQT_SLOT(receivedThesStdout(TDEProcess*, char*, int)));
-    connect(m_thesproc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-        this, TQT_SLOT(receivedThesStderr(TDEProcess*, char*, int)));
+    connect(m_thesproc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(thesExited(TDEProcess*)));
+    connect(m_thesproc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+        this, TQ_SLOT(receivedThesStdout(TDEProcess*, char*, int)));
+    connect(m_thesproc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+        this, TQ_SLOT(receivedThesStderr(TDEProcess*, char*, int)));
 
 }
 
diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp
index 281f0430..3e298186 100644
--- a/tools/thumbnail/kofficecreator.cpp
+++ b/tools/thumbnail/kofficecreator.cpp
@@ -75,7 +75,7 @@ bool KOfficeCreator::create(const TQString &path, int width, int height, TQImage
 
     if (!m_doc) return false;
 
-    connect(m_doc, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
+    connect(m_doc, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted()));
 
     KURL url;
     url.setPath( path );