summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/hiddensrvs.ui2
-rw-r--r--src/hiddensrvs.ui.h6
-rw-r--r--src/mixminion.ui6
-rw-r--r--src/mixminion.ui.h12
-rw-r--r--src/newfirstrunwizard.ui6
-rw-r--r--src/newfirstrunwizard.ui.h30
-rw-r--r--src/tor_ioslave/torioslave.cpp6
-rw-r--r--src/tork.cpp54
-rw-r--r--src/tork.h20
-rw-r--r--src/torkview.cpp2
-rw-r--r--src/update.cpp2
-rw-r--r--src/update.h4
12 files changed, 75 insertions, 75 deletions
diff --git a/src/hiddensrvs.ui b/src/hiddensrvs.ui
index d9c2f31..ef9a575 100644
--- a/src/hiddensrvs.ui
+++ b/src/hiddensrvs.ui
@@ -218,7 +218,7 @@
</connection>
</connections>
<includes>
- <include location="global" impldecl="in declaration">kprocio.h</include>
+ <include location="global" impldecl="in declaration">tdeprocio.h</include>
<include location="local" impldecl="in implementation">hiddensrvs.ui.h</include>
</includes>
<slots>
diff --git a/src/hiddensrvs.ui.h b/src/hiddensrvs.ui.h
index df6c510..1cda611 100644
--- a/src/hiddensrvs.ui.h
+++ b/src/hiddensrvs.ui.h
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <tdeapplication.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <tdemessagebox.h>
#include <cstdlib>
@@ -120,7 +120,7 @@ void MyHidden::deleteService_clicked()
void MyHidden::startService_clicked()
{
- KProcIO* thttpdproc = new KProcIO();
+ TDEProcIO* thttpdproc = new TDEProcIO();
thttpdproc->setUseShell(TRUE);
TQString curpath = (TQString) getenv("PATH");
@@ -133,7 +133,7 @@ void MyHidden::startService_clicked()
connect( thttpdproc, TQ_SIGNAL(processExited(TDEProcess *)),
TQ_SLOT(thttpdprocExited(TDEProcess *)) );
- thttpdproc->start(KProcIO::NotifyOnExit) ;
+ thttpdproc->start(TDEProcIO::NotifyOnExit) ;
}
diff --git a/src/mixminion.ui b/src/mixminion.ui
index 8d081c7..e771bcf 100644
--- a/src/mixminion.ui
+++ b/src/mixminion.ui
@@ -153,7 +153,7 @@
<cstring>proc</cstring>
</property>
</widget>
- <widget class="KProcIO">
+ <widget class="TDEProcIO">
<property name="name">
<cstring>mixminionproc</cstring>
</property>
@@ -174,13 +174,13 @@
<tabstop>send</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in declaration">kprocio.h</include>
+ <include location="global" impldecl="in declaration">tdeprocio.h</include>
<include location="local" impldecl="in implementation">mixminion.ui.h</include>
</includes>
<slots>
<slot>send_clicked()</slot>
<slot>slotProg( )</slot>
- <slot>receivedMixminionOutput( KProcIO * mixminionproc )</slot>
+ <slot>receivedMixminionOutput( TDEProcIO * mixminionproc )</slot>
<slot>mixminionprocExited( TDEProcess * proc )</slot>
</slots>
<functions>
diff --git a/src/mixminion.ui.h b/src/mixminion.ui.h
index 00d60d2..444492d 100644
--- a/src/mixminion.ui.h
+++ b/src/mixminion.ui.h
@@ -22,7 +22,7 @@
#include <tqregexp.h>
#include <tqtimer.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <tdemessagebox.h>
#include <kprogress.h>
#include <kdebug.h>
@@ -49,7 +49,7 @@ void MixMinionClient::send_clicked()
output = "";
mailLayout->setEnabled(false);
- KProcIO* mixminionproc = new KProcIO();
+ TDEProcIO* mixminionproc = new TDEProcIO();
mixminionproc->setUseShell(TRUE);
TQString curpath = (TQString) getenv("PATH");
@@ -65,8 +65,8 @@ void MixMinionClient::send_clicked()
connect( mixminionproc, TQ_SIGNAL(processExited(TDEProcess *)),
TQ_SLOT(mixminionprocExited(TDEProcess *)) );
- connect( mixminionproc, TQ_SIGNAL(readReady(KProcIO *)),
- TQ_SLOT(receivedMixminionOutput(KProcIO *)) );
+ connect( mixminionproc, TQ_SIGNAL(readReady(TDEProcIO *)),
+ TQ_SLOT(receivedMixminionOutput(TDEProcIO *)) );
progressDialog = new KProgressDialog( this, "progress_dialog", TQString::null, "Sending Anonymous Mail Message..", false );
@@ -82,7 +82,7 @@ void MixMinionClient::send_clicked()
timer->start( 200, FALSE );
- mixminionproc->start(KProcIO::NotifyOnExit,KProcIO::All);
+ mixminionproc->start(TDEProcIO::NotifyOnExit,TDEProcIO::All);
}
@@ -93,7 +93,7 @@ void MixMinionClient::slotProg()
progressDialog->progressBar()->setProgress(progressDialog->progressBar()->progress() + 4 );
}
-void MixMinionClient::receivedMixminionOutput(KProcIO *mixminionproc)
+void MixMinionClient::receivedMixminionOutput(TDEProcIO *mixminionproc)
{
int pos;
diff --git a/src/newfirstrunwizard.ui b/src/newfirstrunwizard.ui
index 7e32e7a..bad38f7 100644
--- a/src/newfirstrunwizard.ui
+++ b/src/newfirstrunwizard.ui
@@ -2431,8 +2431,8 @@ I've configured your Privacy Proxy. Click next to continue.</string>
</connection>
</connections>
<includes>
- <include location="global" impldecl="in declaration">kprocio.h</include>
- <include location="global" impldecl="in implementation">kprocio.h</include>
+ <include location="global" impldecl="in declaration">tdeprocio.h</include>
+ <include location="global" impldecl="in implementation">tdeprocio.h</include>
<include location="local" impldecl="in implementation">newfirstrunwizard.ui.h</include>
<include location="global" impldecl="in implementation">kactivelabel.h</include>
<include location="global" impldecl="in implementation">kurlrequester.h</include>
@@ -2448,7 +2448,7 @@ I've configured your Privacy Proxy. Click next to continue.</string>
<slot>usingAnotherProxy_toggled( bool state )</slot>
<slot>torStartsAutomatically_toggled( bool state )</slot>
<slot>torStartsManually_toggled( bool state )</slot>
- <slot>processWhich( KProcIO * whichproc )</slot>
+ <slot>processWhich( TDEProcIO * whichproc )</slot>
<slot>downloadPrivoxy_clicked()</slot>
<slot>downloadTor_clicked()</slot>
<slot>accept()</slot>
diff --git a/src/newfirstrunwizard.ui.h b/src/newfirstrunwizard.ui.h
index a62d680..26a8fd3 100644
--- a/src/newfirstrunwizard.ui.h
+++ b/src/newfirstrunwizard.ui.h
@@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kurl.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <kdebug.h>
#include <dcopref.h>
#include <tdeconfig.h>
@@ -45,7 +45,7 @@
TorClient* client;
-KProcIO *whichproc;
+TDEProcIO *whichproc;
bool torRunning;
bool privoxyRunning;
TQString tor;
@@ -144,15 +144,15 @@ FirstRunWizard::init()
helpButton()->hide();
- whichproc = new KProcIO();
+ whichproc = new TDEProcIO();
whichproc->setUseShell(TRUE);
TQString whichCommand="ps -C tor;ps -C privoxy";
*whichproc<<whichCommand;
- connect( whichproc, TQ_SIGNAL(readReady(KProcIO * )),
- TQ_SLOT(processWhich(KProcIO * )) );
- whichproc->start(KProcIO::NotifyOnExit,TRUE);
+ connect( whichproc, TQ_SIGNAL(readReady(TDEProcIO * )),
+ TQ_SLOT(processWhich(TDEProcIO * )) );
+ whichproc->start(TDEProcIO::NotifyOnExit,TRUE);
}
@@ -199,7 +199,7 @@ void FirstRunWizard::torStartsManually_toggled( bool state)
setAppropriate ( TestingTor , !state );
}
-void FirstRunWizard::processWhich(KProcIO *whichproc)
+void FirstRunWizard::processWhich(TDEProcIO *whichproc)
{
TQString item = "";
int pos;
@@ -600,22 +600,22 @@ void FirstRunWizard::rootifyNetstat()
TQString newnetstat = TQString(netstat).replace("netstat","torknetstat");
- KProcIO *catproc = new KProcIO();
+ TDEProcIO *catproc = new TDEProcIO();
catproc->setUseShell(TRUE);
TQString whichCommand= TQString("tdesu -t -c 'cp %1 %2;chmod u+s %3'").arg(netstat).arg(newnetstat).arg(newnetstat);
*catproc<<whichCommand;
- catproc->start(KProcIO::NotifyOnExit,TRUE);
+ catproc->start(TDEProcIO::NotifyOnExit,TRUE);
}
void FirstRunWizard::sighupTor(const TQString& text)
{
- KProcIO *catproc = new KProcIO();
+ TDEProcIO *catproc = new TDEProcIO();
catproc->setUseShell(TRUE);
TQString whichCommand= TQString("killall -s HUP %1").arg(text);
*catproc<<whichCommand;
- catproc->start(KProcIO::NotifyOnExit,TRUE);
+ catproc->start(TDEProcIO::NotifyOnExit,TRUE);
}
@@ -645,12 +645,12 @@ void FirstRunWizard::appendControlDirective(const TQString& text)
}else{
TQString directory = KURL(text).directory();
- KProcIO *catproc = new KProcIO();
+ TDEProcIO *catproc = new TDEProcIO();
catproc->setUseShell(TRUE);
TQString whichCommand= TQString("tdesu -c \"sh -c 'mkdir -p %1;printf \\\"ControlPort 9051\\n\\\""
" >> %2;killall -s HUP tor'\"").arg(directory).arg(text);
*catproc<<whichCommand;
- catproc->start(KProcIO::NotifyOnExit,TRUE);
+ catproc->start(TDEProcIO::NotifyOnExit,TRUE);
//-c "sh -c 'printf \"ControlPort 9051\n\" >> /etc/tor/torrc'"
}
@@ -758,14 +758,14 @@ void FirstRunWizard::appendPrivoxyConfig(const TQString& text)
}else{
- KProcIO *catproc = new KProcIO();
+ TDEProcIO *catproc = new TDEProcIO();
catproc->setUseShell(TRUE);
TQString whichCommand= TQString("tdesu -c \"sh -c 'printf \\\"%1\\\""
" >> %2;killall -s HUP privoxy'\"")
.arg(privoxyConf)
.arg(text);
*catproc<<whichCommand;
- catproc->start(KProcIO::NotifyOnExit,TRUE);
+ catproc->start(TDEProcIO::NotifyOnExit,TRUE);
}
diff --git a/src/tor_ioslave/torioslave.cpp b/src/tor_ioslave/torioslave.cpp
index c3fc8b0..1577a5e 100644
--- a/src/tor_ioslave/torioslave.cpp
+++ b/src/tor_ioslave/torioslave.cpp
@@ -38,7 +38,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <krun.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <stdlib.h>
#include <math.h>
@@ -117,13 +117,13 @@ void tdeio_torProtocol::get(const KURL& url )
DCOPRef("tork*", "DCOPTork").send("toggleTDESetting");
wait = "3";
}else{
- KProcIO *whichproc = new KProcIO();
+ TDEProcIO *whichproc = new TDEProcIO();
whichproc->setUseShell(TRUE);
TQString whichCommand="tork --toggleTDE";
*whichproc<<whichCommand;
- whichproc->start(KProcIO::NotifyOnExit,TRUE);
+ whichproc->start(TDEProcIO::NotifyOnExit,TRUE);
//KRun::runCommand( "tork --toggleTDE");
wait = "10";
diff --git a/src/tork.cpp b/src/tork.cpp
index 528fe58..8357211 100644
--- a/src/tork.cpp
+++ b/src/tork.cpp
@@ -52,7 +52,7 @@
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdepopupmenu.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <tdemessagebox.h>
#include <dcopref.h>
#include <tdeconfig.h>
@@ -1275,21 +1275,21 @@ tork::configureSecurity( int id ) //SLOT
cmd += "echo run";
- filterproc = new KProcIO();
+ filterproc = new TDEProcIO();
filterproc->setUseShell(TRUE);
TQString filterCommand= TQString("tdesu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c "
"'%3'").arg(filterRequest).arg(iconstring).arg(cmd);
- connect( filterproc, TQ_SIGNAL(readReady(KProcIO * )),
- TQ_SLOT(processFilter(KProcIO * )) );
+ connect( filterproc, TQ_SIGNAL(readReady(TDEProcIO * )),
+ TQ_SLOT(processFilter(TDEProcIO * )) );
connect( filterproc, TQ_SIGNAL(processExited(TDEProcess *)),
TQ_SLOT(filterExited()) );
*filterproc<<filterCommand;
- filterproc->start(KProcIO::NotifyOnExit,TRUE);
+ filterproc->start(TDEProcIO::NotifyOnExit,TRUE);
}
-void tork::processFilter(KProcIO *filterproc)
+void tork::processFilter(TDEProcIO *filterproc)
{
TQString item = "";
int pos;
@@ -1933,7 +1933,7 @@ void tork::startTor()
sayWhatImDoing("Starting Tor..");
- childproc = new KProcIO();
+ childproc = new TDEProcIO();
childproc->setUseShell(TRUE);
TQString torConfFile = writeConf();
@@ -1944,10 +1944,10 @@ void tork::startTor()
connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)),
TQ_SLOT(childExited()) );
- connect( childproc, TQ_SIGNAL(readReady(KProcIO *)),
- TQ_SLOT(receivedOutput(KProcIO *)) );
+ connect( childproc, TQ_SIGNAL(readReady(TDEProcIO *)),
+ TQ_SLOT(receivedOutput(TDEProcIO *)) );
- childproc->start(KProcIO::NotifyOnExit) ;
+ childproc->start(TDEProcIO::NotifyOnExit) ;
}
@@ -2570,16 +2570,16 @@ bool tork::noSpecialProcessing(const TDEConfigSkeletonItem* it, TQTextStream &ts
TQString tork::doHashPassword()
{
- hashproc = new KProcIO();
+ hashproc = new TDEProcIO();
hashproc->setUseShell(TRUE);
m_hashedpassword = "";
TQString hashCommand=TQString("tor --hash-password %1").arg(TorkConfig::hashedControlPassword());
*hashproc<<hashCommand;
- connect( hashproc, TQ_SIGNAL(readReady(KProcIO * )),
- TQ_SLOT(processHashProc(KProcIO * )) );
- hashproc->start(KProcIO::NotifyOnExit,TRUE);
+ connect( hashproc, TQ_SIGNAL(readReady(TDEProcIO * )),
+ TQ_SLOT(processHashProc(TDEProcIO * )) );
+ hashproc->start(TDEProcIO::NotifyOnExit,TRUE);
while (hashproc->isRunning() && m_hashedpassword.isEmpty())
kapp->processEvents();
@@ -2587,7 +2587,7 @@ TQString tork::doHashPassword()
return m_hashedpassword;
}
-void tork::processHashProc(KProcIO *hashproc)
+void tork::processHashProc(TDEProcIO *hashproc)
{
TQString item = "";
int pos;
@@ -2754,7 +2754,7 @@ void tork::startPrivoxy()
privoxyproc = 0L;
}
- privoxyproc = new KProcIO();
+ privoxyproc = new TDEProcIO();
privoxyproc->setUseShell(TRUE);
TQString curpath = (TQString) getenv("PATH");
@@ -2775,7 +2775,7 @@ void tork::startPrivoxy()
connect( privoxyproc, TQ_SIGNAL(processExited(TDEProcess *)),
TQ_SLOT(privoxyExited()) );
- privoxyproc->start(KProcIO::NotifyOnExit) ;
+ privoxyproc->start(TDEProcIO::NotifyOnExit) ;
}
@@ -3035,7 +3035,7 @@ void tork::startFromBeginning()
}
-void tork::receivedOutput(KProcIO *)
+void tork::receivedOutput(TDEProcIO *)
{
int pos;
TQString item2;
@@ -3175,7 +3175,7 @@ void tork::reconnectWithCookie()
void tork::copyCookie()
{
- KProcIO *catproc = new KProcIO();
+ TDEProcIO *catproc = new TDEProcIO();
catproc->setUseShell(TRUE);
TQString whichCommand= TQString(
"tdesu -c '"
@@ -3189,7 +3189,7 @@ void tork::copyCookie()
.arg(getenv("USER")).arg(getenv("HOME"));
*catproc<<whichCommand;
- catproc->start(KProcIO::NotifyOnExit,TRUE);
+ catproc->start(TDEProcIO::NotifyOnExit,TRUE);
}
@@ -3944,7 +3944,7 @@ void tork::startNetStat()
|| !TorkConfig::clientOnly())
return;
- netstatproc = new KProcIO();
+ netstatproc = new TDEProcIO();
netstatproc->setUseShell(TRUE);
TQString netstatcmd = "netstat -ntucpe";
@@ -3955,10 +3955,10 @@ void tork::startNetStat()
connect( netstatproc, TQ_SIGNAL(processExited(TDEProcess *)),
TQ_SLOT(netStatExited()) );
- connect( netstatproc, TQ_SIGNAL(readReady(KProcIO *)),
- TQ_SLOT(receivedNetStatOutput(KProcIO *)) );
+ connect( netstatproc, TQ_SIGNAL(readReady(TDEProcIO *)),
+ TQ_SLOT(receivedNetStatOutput(TDEProcIO *)) );
- netstatproc->start(KProcIO::NotifyOnExit) ;
+ netstatproc->start(TDEProcIO::NotifyOnExit) ;
}
@@ -3981,7 +3981,7 @@ void tork::netStatExited()
}
-void tork::receivedNetStatOutput(KProcIO *)
+void tork::receivedNetStatOutput(TDEProcIO *)
{
int pos;
TQString item2;
@@ -4335,11 +4335,11 @@ void tork::setTorCaption(const TQString& caption)
void tork::resetTor()
{
- KProcIO *catproc = new KProcIO();
+ TDEProcIO *catproc = new TDEProcIO();
catproc->setUseShell(TRUE);
TQString whichCommand= "tdesu -c 'killall -s HUP tor'";
*catproc<<whichCommand;
- catproc->start(KProcIO::NotifyOnExit,TRUE);
+ catproc->start(TDEProcIO::NotifyOnExit,TRUE);
connect( catproc, TQ_SIGNAL(processExited(TDEProcess *)),
TQ_SLOT(resetExited()) );
diff --git a/src/tork.h b/src/tork.h
index 10e35eb..04eccf6 100644
--- a/src/tork.h
+++ b/src/tork.h
@@ -56,7 +56,7 @@ class TDEActionMenu;
class KURL;
class TrayIcon;
class TQLabel;
-class KProcIO;
+class TDEProcIO;
class TorClient;
class TQPoint;
class StatGraph;
@@ -155,9 +155,9 @@ private slots:
void changeCaption(const TQString& text);
void startController();
void stopController();
- void receivedOutput(KProcIO *);
- void processFilter(KProcIO *filterproc);
- void receivedNetStatOutput(KProcIO *);
+ void receivedOutput(TDEProcIO *);
+ void processFilter(TDEProcIO *filterproc);
+ void receivedNetStatOutput(TDEProcIO *);
void toggleTDESetting();
void enableTDE(bool enable);
void toggleTDESettingAndLaunchKonq();
@@ -172,7 +172,7 @@ private slots:
void slotHandle(/*TFunctor *functor*/);
void noClicked(/*TFunctor *functor*/);
void popUpClosed();
- void processHashProc(KProcIO *hashproc);
+ void processHashProc(TDEProcIO *hashproc);
void toggleTorMon();
void toggleTorMon2();
void toggleTorBar();
@@ -359,10 +359,10 @@ private:
TQLabel* m_statusSpeed;
StatGraph* m_graphIn;
StatGraph* m_graphOut;
- KProcIO* childproc;
- KProcIO* filterproc;
- KProcIO* netstatproc;
- KProcIO* privoxyproc;
+ TDEProcIO* childproc;
+ TDEProcIO* filterproc;
+ TDEProcIO* netstatproc;
+ TDEProcIO* privoxyproc;
TorClient* client;
bool m_servererrornag;
bool m_contactinfonag;
@@ -376,7 +376,7 @@ private:
TQStringList m_list;
TQString m_body;
display_status_t* m_msg;
- KProcIO *hashproc;
+ TDEProcIO *hashproc;
TQString m_hashedpassword;
TDEConfigSkeletonItem::List previtems;
TDEConfigSkeleton pcopy;
diff --git a/src/torkview.cpp b/src/torkview.cpp
index 1b9c9dc..3720e0c 100644
--- a/src/torkview.cpp
+++ b/src/torkview.cpp
@@ -37,7 +37,7 @@
#include <kiconloader.h>
#include <kmimetype.h>
#include <ksystemtray.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <tdemessagebox.h>
#include <krun.h>
#include <kurl.h>
diff --git a/src/update.cpp b/src/update.cpp
index c4a0e79..7e67eb2 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -37,7 +37,7 @@
#include <ksystemtray.h>
#include <ktar.h>
#include <kprogress.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <knotifyclient.h>
#include <dom/html_misc.h>
#include <tdeapplication.h>
diff --git a/src/update.h b/src/update.h
index e221ec7..662c6d1 100644
--- a/src/update.h
+++ b/src/update.h
@@ -45,7 +45,7 @@ class KURL;
class TDEProcess;
class KURLRequester;
class KProgressDialog;
-class KProcIO;
+class TDEProcIO;
class TDEHTMLPart;
/**
@@ -100,7 +100,7 @@ private:
double numericizeVersion(TQString &version);
TQString getMirror();
TDEProcess *childproc;
- KProcIO *versionproc;
+ TDEProcIO *versionproc;
TQString tempFileName;
TQString errorMessage;
TQString pidFileName;