diff options
Diffstat (limited to 'kcontrol/samba')
-rw-r--r-- | kcontrol/samba/AUTHORS | 2 | ||||
-rw-r--r-- | kcontrol/samba/kcmsambastatistics.cpp | 4 | ||||
-rw-r--r-- | kcontrol/samba/ksmbstatus.cpp | 18 | ||||
-rw-r--r-- | kcontrol/samba/ksmbstatus.h | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/kcontrol/samba/AUTHORS b/kcontrol/samba/AUTHORS index 0bebeaa06..08f2ff61b 100644 --- a/kcontrol/samba/AUTHORS +++ b/kcontrol/samba/AUTHORS @@ -6,7 +6,7 @@ Conversion to kcontrol applet: Matthias Hoelzer <hoelzer@physik.uni-wuerzburg.de> -Use of KProcess instead of popen, and more error checking +Use of TDEProcess instead of popen, and more error checking David Faure <David.Faure@insa-lyon.fr> diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index 431e0f51a..1e3fa2175 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -126,8 +126,8 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec dataList=list; filesCount=nrOfFiles; connectionsCount=nrOfConnections; - connectionsL->setText(i18n("Connections: %1").arg(KGlobal::locale()->formatNumber(connectionsCount, 0))); - filesL->setText(i18n("File accesses: %1").arg(KGlobal::locale()->formatNumber(filesCount, 0))); + connectionsL->setText(i18n("Connections: %1").arg(TDEGlobal::locale()->formatNumber(connectionsCount, 0))); + filesL->setText(i18n("File accesses: %1").arg(TDEGlobal::locale()->formatNumber(filesCount, 0))); clearStatistics(); } diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index bf775deab..effd67312 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -130,7 +130,7 @@ void NetMon::processSambaLine(char *bufline, int) // called when we get some data from smbstatus // can be called for any size of buffer (one line, several lines, // half of one ...) -void NetMon::slotReceivedData(KProcess *, char *buffer, int ) +void NetMon::slotReceivedData(TDEProcess *, char *buffer, int ) { //kdDebug()<<"received stuff"<<endl; char s[250],*start,*end; @@ -161,7 +161,7 @@ void NetMon::slotReceivedData(KProcess *, char *buffer, int ) void NetMon::update() { - KProcess * process = new KProcess(); + TDEProcess * process = new TDEProcess(); memset(&lo, 0, sizeof(lo)); list->clear(); @@ -175,10 +175,10 @@ void NetMon::update() nrpid=0; process->setEnvironment("PATH", path); connect(process, - TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotReceivedData(KProcess *, char *, int))); + TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); *process << "smbstatus"; - if (!process->start(KProcess::Block,KProcess::Stdout)) + if (!process->start(TDEProcess::Block,TDEProcess::Stdout)) version->setText(i18n("Error: Unable to run smbstatus")); else if (rownumber==0) // empty result version->setText(i18n("Error: Unable to open configuration file \"smb.conf\"")); @@ -197,16 +197,16 @@ void NetMon::update() readingpart=nfs; delete showmountProc; - showmountProc=new KProcess(); + showmountProc=new TDEProcess(); showmountProc->setEnvironment("PATH", path); *showmountProc<<"showmount"<<"-a"<<"localhost"; - connect(showmountProc,TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),TQT_SLOT(slotReceivedData(KProcess *, char *, int))); + connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); //without this timer showmount hangs up to 5 minutes //if the portmapper daemon isn't running TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount())); //kdDebug()<<"starting kill timer with 5 seconds"<<endl; - connect(showmountProc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(killShowmount())); - if (!showmountProc->start(KProcess::NotifyOnExit,KProcess::Stdout)) // run showmount + connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount())); + if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount { delete showmountProc; showmountProc=0; diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index a38eca897..e256de067 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -30,7 +30,7 @@ class TQListView; class TQListViewItem; -class KProcess; +class TDEProcess; class NetMon : public TQWidget { @@ -41,7 +41,7 @@ public: void loadSettings() {}; private: KConfig *configFile; - KProcess *showmountProc; + TDEProcess *showmountProc; TQListView *list; TQLabel *version; TQTimer *timer; @@ -59,7 +59,7 @@ private: private slots: void killShowmount(); void update(); - void slotReceivedData(KProcess *proc, char *buffer, int buflen); + void slotReceivedData(TDEProcess *proc, char *buffer, int buflen); }; #endif // main_included |