Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 46 insertions, 46 deletions

diff --git a/src/torkview.cpp b/src/torkview.cpp
index ce32aea..1b9c9dc 100644
--- a/src/torkview.cpp
+++ b/src/torkview.cpp
@@ -166,7 +166,7 @@ torkView::torkView(TQWidget *parent)
     chart->setMinimumWidth(ChartFrame->width());
     chart->setMinimumHeight(ChartFrame->height());
 
-    connect(this, SIGNAL(updateStats()), chart, SLOT(update()));
+    connect(this, TQ_SIGNAL(updateStats()), chart, TQ_SLOT(update()));
 
 
     m_osd = new StreamOSD(this, true);
@@ -568,11 +568,11 @@ void torkView::toggleAnonymizerTork(bool state)
 
     welcomeitem->setEnabled(true);
 
-    disconnect(welcomeitem->icon, SIGNAL(leftClickedURL()), this, SIGNAL(startEverything()));
-    disconnect(welcomeitem->icon, SIGNAL(leftClickedURL()), this, SIGNAL(stopEverything()));
+    disconnect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), this, TQ_SIGNAL(startEverything()));
+    disconnect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), this, TQ_SIGNAL(stopEverything()));
 
     if (state){
-        connect(welcomeitem->icon, SIGNAL(leftClickedURL()), SIGNAL(stopEverything()));
+        connect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(stopEverything()));
         welcomeheaderLabel->setText(i18n("Welcome to the Tor Network!"));
         welcomeitem->setIcon("tork_stop");
         welcomeitem->setDescriptionText("<qt>"+i18n("- <b>You are %1.</b><br>"
@@ -594,7 +594,7 @@ void torkView::toggleAnonymizerTork(bool state)
         }
 
     }else{
-        connect(welcomeitem->icon, SIGNAL(leftClickedURL()), SIGNAL(startEverything()));
+        connect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(startEverything()));
         welcomeitem->setIcon("tork_pressplay");
         welcomeheaderLabel->setText(i18n("Press 'Play' to get started!"));
         welcomeitem->setDescriptionText("<qt>"+i18n("- <b>Press 'Play' to connect to Tor. (You can also use the toolbar icons.)</b><br>"
@@ -1522,20 +1522,20 @@ void torkView::populateMenu()
     KURLLabel *buttonStart = new KURLLabel(welcomeitem);
     buttonStart->setPixmap(SmallIcon("application-vnd.tde.info"));
     welcomeitem->insertHitWidget(0,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTor()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTor()));
 
     buttonStart = new KURLLabel(welcomeitem);
     buttonStart->setText(i18n("What You Need To Know When Using TorK!"));
     welcomeitem->insertHitWidget(1,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTor()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTor()));
 
     paranoidmodeicon = new KURLLabel(welcomeitem);
     welcomeitem->insertHitWidget(2,paranoidmodeicon);
-    connect(paranoidmodeicon, SIGNAL(leftClickedURL()), SIGNAL(aboutParanoidMode()));
+    connect(paranoidmodeicon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutParanoidMode()));
 
     paranoidmodetext = new KURLLabel(welcomeitem);
     welcomeitem->insertHitWidget(3,paranoidmodetext);
-    connect(paranoidmodetext, SIGNAL(leftClickedURL()), SIGNAL(aboutParanoidMode()));
+    connect(paranoidmodetext, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutParanoidMode()));
 
 
     paranoidmodeicon->setPixmap(SmallIcon("tork_penguin"));
@@ -1549,10 +1549,10 @@ void torkView::populateMenu()
 
     welcomeitem->score->setCurrentItem(TorkConfig::quickConfigure());
 
-    connect(welcomeitem->score, SIGNAL(activated(int)), SLOT(changeQuickConfigure(int)));
+    connect(welcomeitem->score, TQ_SIGNAL(activated(int)), TQ_SLOT(changeQuickConfigure(int)));
 
     Anonymizer->insertItem(welcomeitem);
-    connect(welcomeitem->icon, SIGNAL(leftClickedURL()), SIGNAL(startEverything()));
+    connect(welcomeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(startEverything()));
 
 
     TQLabel *headerLabel;
@@ -1586,15 +1586,15 @@ void torkView::populateMenu()
         buttonStart = new KURLLabel(firefoxitem);
         buttonStart->setPixmap(SmallIcon("application-vnd.tde.info"));
         firefoxitem->insertHitWidget(0,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadTorButton()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadTorButton()));
 
         buttonStart = new KURLLabel(firefoxitem);
         buttonStart->setText(i18n("Install TorButton First (Recommended)"));
         firefoxitem->insertHitWidget(1,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadTorButton()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadTorButton()));
 
         Anonymizer->insertItem(firefoxitem);
-        connect(firefoxitem->icon, SIGNAL(leftClickedURL()), SLOT(anonymousFirefox()));
+        connect(firefoxitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(anonymousFirefox()));
     }
     //Kopete
 #endif
@@ -1627,32 +1627,32 @@ void torkView::populateMenu()
 //     mixminionitem->score->setHidden(false);
 //     mixminionitem->score->insertStringList(shellsAvailable);
 //     mixminionitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-//     connect(mixminionitem->score, SIGNAL(activated(int)),mixminionitem,
-//             SLOT(changeTerminalUrl(int)));
+//     connect(mixminionitem->score, TQ_SIGNAL(activated(int)),mixminionitem,
+//             TQ_SLOT(changeTerminalUrl(int)));
 
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setPixmap(SmallIcon("application-vnd.tde.info"));
     mixminionitem->insertHitWidget(0,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadMixminion()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadMixminion()));
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setText(i18n("Install Mixminion"));
     mixminionitem->insertHitWidget(1,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SLOT(downloadMixminion()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(downloadMixminion()));
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setPixmap(SmallIcon("konqueror"));
     mixminionitem->insertHitWidget(2,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(mixminionHome()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(mixminionHome()));
 
     buttonStart = new KURLLabel(mixminionitem);
     buttonStart->setText(i18n("Visit the Mixminion Project page."));
     mixminionitem->insertHitWidget(3,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(mixminionHome()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(mixminionHome()));
 
     Anonymizer->insertItem(mixminionitem);
-    connect(mixminionitem->icon, SIGNAL(leftClickedURL()), SLOT(sendAnonymousEmail()));
+    connect(mixminionitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(sendAnonymousEmail()));
 
     konqitem=0L;
     //Konqueror
@@ -1684,25 +1684,25 @@ void torkView::populateMenu()
       buttonStart = new KURLLabel(konqitem);
       buttonStart->setPixmap(SmallIcon("configure"));
       konqitem->insertHitWidget(0,buttonStart);
-      connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(showMyKonqueror()));
+      connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(showMyKonqueror()));
 
       buttonStart = new KURLLabel(konqitem);
       buttonStart->setText(i18n("Configure Anonymous Konqueror"));
       konqitem->insertHitWidget(1,buttonStart);
-      connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(showMyKonqueror()));
+      connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(showMyKonqueror()));
 
       configurePriv = new KURLLabel(konqitem);
       configurePriv->setPixmap(SmallIcon("configure"));
       konqitem->insertHitWidget(2,configurePriv);
-      connect(configurePriv, SIGNAL(leftClickedURL()), SIGNAL(configurePrivoxy()));
+      connect(configurePriv, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(configurePrivoxy()));
 
       configurePrivText = new KURLLabel(konqitem);
       configurePrivText->setText(i18n("Configure Privoxy"));
       konqitem->insertHitWidget(3,configurePrivText);
-      connect(configurePrivText, SIGNAL(leftClickedURL()), SIGNAL(configurePrivoxy()));
+      connect(configurePrivText, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(configurePrivoxy()));
 
       Anonymizer->insertItem(konqitem);
-      connect(konqitem->icon, SIGNAL(leftClickedURL()), SIGNAL(konqWithTor()));
+      connect(konqitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(konqWithTor()));
     }
     
 #endif
@@ -1730,7 +1730,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         operaitem->icon->setURL("opera");
         Anonymizer->insertItem(operaitem);
-        connect(operaitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(anonymizedOpera(const TQString&)));
+        connect(operaitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(anonymizedOpera(const TQString&)));
     }
 #endif
 
@@ -1754,15 +1754,15 @@ void torkView::populateMenu()
     buttonStart = new KURLLabel(hiddenservicesitem);
     buttonStart->setPixmap(SmallIcon("konqueror"));
     hiddenservicesitem->insertHitWidget(0,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(hiddenServices()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(hiddenServices()));
 
     buttonStart = new KURLLabel(hiddenservicesitem);
     buttonStart->setText(i18n("Search Hidden Services"));
     hiddenservicesitem->insertHitWidget(1,buttonStart);
-    connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(hiddenServices()));
+    connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(hiddenServices()));
 
     Anonymizer->insertItem(hiddenservicesitem);
-    connect(hiddenservicesitem->icon, SIGNAL(leftClickedURL()), SIGNAL(showMyHiddenServices()));
+    connect(hiddenservicesitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(showMyHiddenServices()));
 
 
     //Kopete
@@ -1787,7 +1787,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         kopeteitem->icon->setURL("kopete  --caption 'Anonymous IM Session - Launched From TorK'");
         Anonymizer->insertItem(kopeteitem);
-        connect(kopeteitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(kopeteitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Gaim
@@ -1811,7 +1811,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         gaimitem->icon->setURL("gaim");
         Anonymizer->insertItem(gaimitem);
-        connect(gaimitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(gaimitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Pidgin
@@ -1836,7 +1836,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         pidginitem->icon->setURL("pidgin");
         Anonymizer->insertItem(pidginitem);
-        connect(pidginitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(pidginitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Gaim
@@ -1862,7 +1862,7 @@ void torkView::populateMenu()
                                 )+"</qt>");
         konversationitem->icon->setURL("konversation");
         Anonymizer->insertItem(konversationitem);
-        connect(konversationitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(konversationitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //KSIRC
@@ -1888,7 +1888,7 @@ void torkView::populateMenu()
 
         ksircitem->icon->setURL("ksirc  --caption 'Anonymous IRC Shell - Launched From TorK'");
         Anonymizer->insertItem(ksircitem);
-        connect(ksircitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(ksircitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 
 #endif
@@ -1936,12 +1936,12 @@ void torkView::populateMenu()
         buttonStart = new KURLLabel(sshitem);
         buttonStart->setPixmap(SmallIcon("help"));
         sshitem->insertHitWidget(0,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTorify()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTorify()));
         
         buttonStart = new KURLLabel(sshitem);
         buttonStart->setText(i18n("How can I be sure this is working?"));
         sshitem->insertHitWidget(1,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(aboutTorify()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(aboutTorify()));
 
         sshitem->shellTitles["konsole"] = " --caption 'Anonymous SSH Shell - Launched From TorK'";
         sshitem->shellTitles["yakuake"] = " --caption 'Anonymous SSH Shell - Launched From TorK'";
@@ -1954,10 +1954,10 @@ void torkView::populateMenu()
         sshitem->score->setHidden(false);
         sshitem->score->insertStringList(shellsAvailable);
         sshitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-        connect(sshitem->score, SIGNAL(activated(int)),sshitem, SLOT(changeTerminalUrl(int)));
+        connect(sshitem->score, TQ_SIGNAL(activated(int)),sshitem, TQ_SLOT(changeTerminalUrl(int)));
 
         Anonymizer->insertItem(sshitem);
-        connect(sshitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(sshitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //Telnet
@@ -1986,12 +1986,12 @@ void torkView::populateMenu()
         buttonStart = new KURLLabel(telnetitem);
         buttonStart->setPixmap(SmallIcon("help"));
         telnetitem->insertHitWidget(0,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(riskySession()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(riskySession()));
         
         buttonStart = new KURLLabel(telnetitem);
         buttonStart->setText(i18n("Why is anonymous telnet risky?"));
         telnetitem->insertHitWidget(1,buttonStart);
-        connect(buttonStart, SIGNAL(leftClickedURL()), SIGNAL(riskySession()));
+        connect(buttonStart, TQ_SIGNAL(leftClickedURL()), TQ_SIGNAL(riskySession()));
 
         telnetitem->shellTitles["konsole"] = " --caption 'Anonymous Telnet Session - Launched From TorK'";
         telnetitem->shellTitles["yakuake"] = " --caption 'Anonymous Telnet Session - Launched From TorK'";
@@ -2004,10 +2004,10 @@ void torkView::populateMenu()
         telnetitem->score->setHidden(false);
         telnetitem->score->insertStringList(shellsAvailable);
         telnetitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-        connect(telnetitem->score, SIGNAL(activated(int)),telnetitem, SLOT(changeTerminalUrl(int)));
+        connect(telnetitem->score, TQ_SIGNAL(activated(int)),telnetitem, TQ_SLOT(changeTerminalUrl(int)));
 
         Anonymizer->insertItem(telnetitem);
-        connect(telnetitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(telnetitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
     //GPG
 #endif
@@ -2048,10 +2048,10 @@ void torkView::populateMenu()
         gpgitem->score->setHidden(false);
         gpgitem->score->insertStringList(hkpShellsAvailable);
         gpgitem->score->setPalette(TQPalette(TQt::white,TQt::white));
-        connect(gpgitem->score, SIGNAL(activated(int)),gpgitem, SLOT(changeTerminalUrl(int)));
+        connect(gpgitem->score, TQ_SIGNAL(activated(int)),gpgitem, TQ_SLOT(changeTerminalUrl(int)));
 
         Anonymizer->insertItem(gpgitem);
-        connect(gpgitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&)));
+        connect(gpgitem->icon, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(torify(const TQString&)));
     }
 #endif
     //All Purpose Shell
@@ -2082,7 +2082,7 @@ void torkView::populateMenu()
 
 
         Anonymizer->insertItem(allpurposeitem);
-        connect(allpurposeitem->icon, SIGNAL(leftClickedURL()), SLOT(privoxiedBash()));
+        connect(allpurposeitem->icon, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(privoxiedBash()));
     }
 #endif