summaryrefslogtreecommitdiffstats
path: root/kdf
diff options
context:
space:
mode:
Diffstat (limited to 'kdf')
-rw-r--r--kdf/disklist.cpp12
-rw-r--r--kdf/disklist.h4
-rw-r--r--kdf/disks.cpp12
-rw-r--r--kdf/disks.h2
-rw-r--r--kdf/kdfwidget.cpp6
-rw-r--r--kdf/kwikdisk.cpp4
-rw-r--r--kdf/mntconfig.cpp2
7 files changed, 21 insertions, 21 deletions
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 9d57a84..18a00c3 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -52,10 +52,10 @@ DiskList::DiskList(TQObject *parent, const char *name)
disks->setAutoDelete(TRUE);
// BackgroundProcesses ****************************************
- dfProc = new KProcess(); TQ_CHECK_PTR(dfProc);
- connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ),
- this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) );
- connect(dfProc,TQT_SIGNAL(processExited(KProcess *) ),
+ dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc);
+ connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+ this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
+ connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ),
this, TQT_SLOT(dfDone() ) );
readingDFStdErrOut=FALSE;
@@ -231,7 +231,7 @@ TQFile f(FSTAB);
/***************************************************************************
* is called, when the df-command writes on StdOut or StdErr
**/
-void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len )
+void DiskList::receivedDFStdErrOut(TDEProcess *, char *data, int len )
{
kdDebug() << k_funcinfo << endl;
@@ -263,7 +263,7 @@ int DiskList::readDF()
dfStringErrOut=""; // yet no data received
dfProc->clearArguments();
(*dfProc) << "env" << "LC_ALL=POSIX" << DF_COMMAND << DF_ARGS;
- if (!dfProc->start( KProcess::NotifyOnExit, KProcess::AllOutput ))
+ if (!dfProc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ))
tqFatal(i18n("could not execute [%s]").local8Bit().data(), DF_COMMAND);
return 1;
}
diff --git a/kdf/disklist.h b/kdf/disklist.h
index 122e59c..821af53 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -119,14 +119,14 @@ public slots:
void applySettings();
private slots:
- void receivedDFStdErrOut(KProcess *, char *data, int len);
+ void receivedDFStdErrOut(TDEProcess *, char *data, int len);
void dfDone();
private:
void replaceDeviceEntry(DiskEntry *disk);
Disks *disks;
- KProcess *dfProc;
+ TDEProcess *dfProc;
TQString dfStringErrOut;
bool readingDFStdErrOut;
KConfig *config;
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index 25c8213..c8a19d4 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -56,10 +56,10 @@ void DiskEntry::init()
// BackgroundProcesses ****************************************
sysProc = new KShellProcess(); TQ_CHECK_PTR(sysProc);
- connect( sysProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ),
- this, TQT_SLOT (receivedSysStdErrOut(KProcess *, char *, int)) );
- connect( sysProc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int) ),
- this, TQT_SLOT (receivedSysStdErrOut(KProcess *, char *, int)) );
+ connect( sysProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+ this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
+ connect( sysProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int) ),
+ this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
readingSysStdErrOut=FALSE;
@@ -229,7 +229,7 @@ int DiskEntry::sysCall(const TQString & command)
sysStringErrOut=i18n("Called: %1\n\n").arg(command); // put the called command on ErrOut
sysProc->clearArguments();
(*sysProc) << command;
- if (!sysProc->start( KProcess::Block, KProcess::AllOutput ))
+ if (!sysProc->start( TDEProcess::Block, TDEProcess::AllOutput ))
kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl;
if (sysProc->exitStatus()!=0) emit sysCallError(this, sysProc->exitStatus());
@@ -241,7 +241,7 @@ int DiskEntry::sysCall(const TQString & command)
/***************************************************************************
* is called, when the Sys-command writes on StdOut or StdErr
**/
-void DiskEntry::receivedSysStdErrOut(KProcess *, char *data, int len)
+void DiskEntry::receivedSysStdErrOut(TDEProcess *, char *data, int len)
{
TQString tmp = TQString::fromLocal8Bit(data, len);
sysStringErrOut.append(tmp);
diff --git a/kdf/disks.h b/kdf/disks.h
index 06b768f..2b6329b 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -119,7 +119,7 @@ public slots:
TQString guessIconName();
private slots:
- void receivedSysStdErrOut(KProcess *, char *data, int len);
+ void receivedSysStdErrOut(TDEProcess *, char *data, int len);
private:
void init();
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index 3c36b9d..c6e05af 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -332,7 +332,7 @@ void KDFWidget::updateDFDone( void ){
TQString size, percent;
if( disk->kBSize() > 0 )
{
- percent = KGlobal::locale()->formatNumber(disk->percentFull(), 1) + '%';
+ percent = TDEGlobal::locale()->formatNumber(disk->percentFull(), 1) + '%';
size = disk->prettyKBSize();
}
else
@@ -518,11 +518,11 @@ void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p )
int pos = cmd.find("%m");
if( pos > 0 )
{
- cmd = cmd.replace( pos, 2, KProcess::quote(disk->mountPoint()) ) + " &";
+ cmd = cmd.replace( pos, 2, TDEProcess::quote(disk->mountPoint()) ) + " &";
}
else
{
- cmd += " " + KProcess::quote(disk->mountPoint()) +" &";
+ cmd += " " + TDEProcess::quote(disk->mountPoint()) +" &";
}
system( TQFile::encodeName(cmd) );
}
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index efdbbb2..b65f7a0 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -267,11 +267,11 @@ void KwikDisk::toggleMount(int item)
int pos = cmd.find("%m");
if( pos > 0 )
{
- cmd = cmd.replace( pos, 2, KProcess::quote(disk->mountPoint()) ) + " &";
+ cmd = cmd.replace( pos, 2, TDEProcess::quote(disk->mountPoint()) ) + " &";
}
else
{
- cmd += " " + KProcess::quote(disk->mountPoint()) +" &";
+ cmd += " " + TDEProcess::quote(disk->mountPoint()) +" &";
}
system( TQFile::encodeName(cmd) );
}
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index d016b47..8d7c1a8 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -273,7 +273,7 @@ void MntConfigWidget::iconChanged(const TQString &iconName)
{
disk->setIconName(iconName);
mIconLineEdit->setText(iconName);
- KIconLoader &loader = *KGlobal::iconLoader();
+ KIconLoader &loader = *TDEGlobal::iconLoader();
item->setPixmap( ICONCOL, loader.loadIcon( iconName, KIcon::Small));
}
break;