summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ark/ChangeLog6
-rw-r--r--ark/ace.cpp38
-rw-r--r--ark/ace.h4
-rw-r--r--ark/ar.cpp76
-rw-r--r--ark/arch.cpp18
-rw-r--r--ark/arch.h20
-rw-r--r--ark/arj.cpp80
-rw-r--r--ark/arkwidget.cpp14
-rw-r--r--ark/arkwidget.h4
-rw-r--r--ark/compressedfile.cpp52
-rw-r--r--ark/compressedfile.h8
-rw-r--r--ark/extractiondialog.cpp2
-rw-r--r--ark/filelistview.cpp6
-rw-r--r--ark/lha.cpp66
-rw-r--r--ark/mainwindow.cpp4
-rw-r--r--ark/rar.cpp86
-rw-r--r--ark/sevenzip.cpp86
-rw-r--r--ark/sevenzip.h2
-rw-r--r--ark/tar.cpp144
-rw-r--r--ark/tar.h22
-rw-r--r--ark/zip.cpp80
-rw-r--r--ark/zoo.cpp66
-rw-r--r--charselectapplet/charselectapplet.cpp2
-rw-r--r--kcalc/kcalc.cpp2
-rw-r--r--kcalc/kcalc.kcfg2
-rw-r--r--kcalc/kcalcdisplay.cpp6
-rw-r--r--kcharselect/main.cc2
-rw-r--r--kdelirc/irkick/irkick.cpp2
-rw-r--r--kdelirc/irkick/main.cpp2
-rw-r--r--kdelirc/kcmlirc/kcmlirc.cpp4
-rw-r--r--kdelirc/kdelirc/profileserver.cpp2
-rw-r--r--kdelirc/kdelirc/remoteserver.cpp2
-rw-r--r--kdessh/kdessh.cpp2
-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
-rw-r--r--kedit/kedit.cpp8
-rw-r--r--kedit/kedit.kcfg6
-rw-r--r--kedit/ktextfiledlg.cpp6
-rw-r--r--kfloppy/floppy.cpp2
-rw-r--r--kfloppy/format.cpp46
-rw-r--r--kfloppy/format.h22
-rw-r--r--kfloppy/zip.cpp18
-rw-r--r--kfloppy/zip.h6
-rw-r--r--kgpg/keyinfowidget.cpp28
-rw-r--r--kgpg/keyinfowidget.h6
-rw-r--r--kgpg/keyservers.cpp22
-rw-r--r--kgpg/keyservers.h8
-rw-r--r--kgpg/kgpg.cpp14
-rw-r--r--kgpg/kgpg.kcfg2
-rw-r--r--kgpg/kgpgeditor.cpp2
-rw-r--r--kgpg/kgpginterface.cpp152
-rw-r--r--kgpg/kgpginterface.h48
-rw-r--r--kgpg/kgpglibrary.cpp6
-rw-r--r--kgpg/kgpgoptions.cpp6
-rw-r--r--kgpg/listkeys.cpp78
-rw-r--r--kgpg/listkeys.h6
-rw-r--r--kgpg/popuppublic.cpp6
-rw-r--r--khexedit/bitswapwidget.cc2
-rw-r--r--khexedit/chartabledialog.cc2
-rw-r--r--khexedit/fileinfodialog.cc4
-rw-r--r--khexedit/hexbuffer.cc14
-rw-r--r--khexedit/hexdrag.cc2
-rw-r--r--khexedit/hexeditorwidget.cc2
-rw-r--r--khexedit/hexeditstate.h4
-rw-r--r--khexedit/hexviewwidget.cc2
-rw-r--r--khexedit/lib/codecs/ktextcharcodec.cpp12
-rw-r--r--khexedit/lib/kbufferdrag.cpp4
-rw-r--r--khexedit/lib/khexedit.cpp2
-rw-r--r--khexedit/optiondialog.cc2
-rw-r--r--khexedit/parts/kpart/khepart.cpp2
-rw-r--r--khexedit/statusbarprogress.cc2
-rw-r--r--khexedit/stringdialog.cc2
-rw-r--r--kjots/KJotsMain.cpp4
-rw-r--r--kjots/kjots.kcfg2
-rw-r--r--klaptopdaemon/acpi.cpp6
-rw-r--r--klaptopdaemon/apm.cpp10
-rw-r--r--klaptopdaemon/battery.cpp2
-rw-r--r--klaptopdaemon/buttons.cpp2
-rw-r--r--klaptopdaemon/daemondock.cpp22
-rw-r--r--klaptopdaemon/daemondock.h2
-rw-r--r--klaptopdaemon/kpcmcia.cpp2
-rw-r--r--klaptopdaemon/krichtextlabel.cpp4
-rw-r--r--klaptopdaemon/laptop_daemon.cpp4
-rw-r--r--klaptopdaemon/pcmcia.cpp2
-rw-r--r--klaptopdaemon/portable.cpp28
-rw-r--r--klaptopdaemon/power.cpp2
-rw-r--r--klaptopdaemon/profile.cpp2
-rw-r--r--klaptopdaemon/sony.cpp6
-rw-r--r--klaptopdaemon/warning.cpp2
-rw-r--r--kmilo/generic/generic_monitor.cpp10
-rw-r--r--kmilo/generic/generic_monitor.h2
-rw-r--r--kmilo/kmilod/defaultskin.cpp2
-rw-r--r--kregexpeditor/kregexpeditorprivate.cpp2
-rw-r--r--kregexpeditor/regexpbuttons.cpp4
-rw-r--r--kregexpeditor/userdefinedregexps.cpp2
-rw-r--r--kregexpeditor/util.cpp2
-rw-r--r--ksim/ksim.cpp2
-rw-r--r--ksim/ksimsysinfo.cpp4
-rw-r--r--ksim/ksimview.cpp2
-rw-r--r--ksim/library/pluginloader.cpp4
-rw-r--r--ksim/library/themeloader.cpp8
-rw-r--r--ksim/monitorprefs.cpp2
-rw-r--r--ksim/monitors/disk/ksimdisk.cpp6
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.cpp18
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.h8
-rw-r--r--ksim/monitors/net/ksimnet.cpp8
-rw-r--r--ksim/themeprefs.cpp2
-rw-r--r--ktimer/ktimer.cpp10
-rw-r--r--ktimer/ktimer.h2
-rw-r--r--kwallet/allyourbase.cpp8
-rw-r--r--kwallet/kwalleteditor.cpp2
-rw-r--r--kwallet/kwalletmanager.cpp2
-rw-r--r--kwallet/main.cpp2
-rw-r--r--superkaramba/src/disksensor.cpp12
-rw-r--r--superkaramba/src/disksensor.h4
-rw-r--r--superkaramba/src/karamba.cpp4
-rw-r--r--superkaramba/src/karamba.h6
-rw-r--r--superkaramba/src/kwidgetlistbox.cpp12
-rw-r--r--superkaramba/src/memsensor.cpp16
-rw-r--r--superkaramba/src/memsensor.h4
-rw-r--r--superkaramba/src/misc_python.cpp18
-rw-r--r--superkaramba/src/programsensor.cpp12
-rw-r--r--superkaramba/src/programsensor.h4
-rw-r--r--superkaramba/src/sensorsensor.cpp14
-rw-r--r--superkaramba/src/sensorsensor.h4
-rw-r--r--superkaramba/src/sknewstuff.cpp2
-rw-r--r--superkaramba/src/taskbartest.cpp2
-rw-r--r--superkaramba/src/taskmanager.cpp14
-rw-r--r--superkaramba/src/themelocale.cpp2
-rw-r--r--superkaramba/src/themesdlg.cpp18
135 files changed, 937 insertions, 937 deletions
diff --git a/ark/ChangeLog b/ark/ChangeLog
index bca2e19..394ec6c 100644
--- a/ark/ChangeLog
+++ b/ark/ChangeLog
@@ -173,8 +173,8 @@
changes will be lost.)
2000-03-06: Emily Ezust <emilye@corel.com>
- * Got rid of KProcess data member in Arch - no need for it with the
- new way that KProcess does its work: we are always passing it
+ * Got rid of TDEProcess data member in Arch - no need for it with the
+ new way that TDEProcess does its work: we are always passing it
around to the functions that need it. This way we won't get
confused when there are more than one processes happening.
* Made tar more asynchronous, redid the temp file creation & updating.
@@ -199,7 +199,7 @@
2000-02-22: Emily Ezust <emilye@corel.com>
* More work on the abstract base class for archives - moved lots of
- slots dealing with the KProcess from zip.cpp to arch.cpp
+ slots dealing with the TDEProcess from zip.cpp to arch.cpp
* Some work on tar. Doesn't work yet.
2000-02-16: Emily Ezust <emilye@corel.com>
diff --git a/ark/ace.cpp b/ark/ace.cpp
index 6ad5cd0..2f29bf3 100644
--- a/ark/ace.cpp
+++ b/ark/ace.cpp
@@ -83,23 +83,23 @@ void AceArch::open()
m_header_removed = false;
m_finished = false;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_archiver_program << "v" << m_filename;
//kp->setUseShell( true );
kdDebug() << "AceArch::open(): kp->args(): " << kp->args() << endl;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotOpenExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotOpenExited(TDEProcess*) ) );
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- this, TQT_SLOT( catchMeIfYouCan(KProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ this, TQT_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigOpen( this, false, TQString(), 0 );
@@ -132,7 +132,7 @@ void AceArch::unarchFileInternal( )
return;
}
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
// extract (and maybe overwrite)
@@ -158,21 +158,21 @@ void AceArch::unarchFileInternal( )
}
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotExtractExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotExtractExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigExtract( false );
}
}
-void AceArch::catchMeIfYouCan( KProcess*, char *buffer, int buflen )
+void AceArch::catchMeIfYouCan( TDEProcess*, char *buffer, int buflen )
{
TQString myBuf = TQString::fromLatin1( buffer, buflen );
kdDebug(1601) << " Wololo!: " << myBuf << endl;
diff --git a/ark/ace.h b/ark/ace.h
index 0598682..4a1c971 100644
--- a/ark/ace.h
+++ b/ark/ace.h
@@ -27,7 +27,7 @@
#include "arch.h"
-class KProcess; // TODO: Remove me!
+class TDEProcess; // TODO: Remove me!
class AceArch : public Arch
{
@@ -47,7 +47,7 @@ class AceArch : public Arch
virtual void unarchFileInternal( );
private slots:
- void catchMeIfYouCan( KProcess*, char*, int );
+ void catchMeIfYouCan( TDEProcess*, char*, int );
private:
void setHeaders();
diff --git a/ark/ar.cpp b/ark/ar.cpp
index 3456f81..8edb2dd 100644
--- a/ark/ar.cpp
+++ b/ark/ar.cpp
@@ -87,17 +87,17 @@ void ArArch::open()
m_buffer = "";
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_archiver_program << "vt" << m_filename;
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedTOC(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedTOC(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotOpenExited(KProcess*)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotOpenExited(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigOpen(this, false, TQString(), 0 );
@@ -107,16 +107,16 @@ void ArArch::open()
void ArArch::create()
{
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "c" << m_filename;
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- if (kp->start(KProcess::Block) == false)
+ if (kp->start(TDEProcess::Block) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigCreate(this, false, m_filename,
@@ -132,7 +132,7 @@ void ArArch::create()
void ArArch::addFile( const TQStringList &urls )
{
kdDebug(1601) << "+ArArch::addFile" << endl;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -152,15 +152,15 @@ void ArArch::addFile( const TQStringList &urls )
*kp << fileURL.fileName();
}
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotAddExited(KProcess*)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotAddExited(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigAdd(false);
@@ -191,7 +191,7 @@ void ArArch::unarchFileInternal()
// I already checked the validity of the dir before coming here
Q_ASSERT(ret);
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -209,15 +209,15 @@ void ArArch::unarchFileInternal()
}
}
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotExtractExited(KProcess*)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotExtractExited(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigExtract(false);
@@ -231,7 +231,7 @@ void ArArch::remove(TQStringList *list)
if (!list)
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "d" << m_filename;
@@ -242,15 +242,15 @@ void ArArch::remove(TQStringList *list)
*kp << str;
}
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotDeleteExited(KProcess*)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotDeleteExited(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigDelete(false);
diff --git a/ark/arch.cpp b/ark/arch.cpp
index b4fc0e8..18a589a 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -88,7 +88,7 @@ Arch::~Arch()
void Arch::verifyCompressUtilityIsAvailable( const TQString &utility )
{
// see if the utility is in the PATH of the user.
- TQString cmd = KGlobal::dirs()->findExe( utility );
+ TQString cmd = TDEGlobal::dirs()->findExe( utility );
m_bArchUtilityIsAvailable = !cmd.isEmpty();
}
@@ -96,11 +96,11 @@ void Arch::verifyCompressUtilityIsAvailable( const TQString &utility )
void Arch::verifyUncompressUtilityIsAvailable( const TQString &utility )
{
// see if the utility is in the PATH of the user.
- TQString cmd = KGlobal::dirs()->findExe( utility );
+ TQString cmd = TDEGlobal::dirs()->findExe( utility );
m_bUnarchUtilityIsAvailable = !cmd.isEmpty();
}
-void Arch::slotOpenExited( KProcess* _kp )
+void Arch::slotOpenExited( TDEProcess* _kp )
{
bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
@@ -148,7 +148,7 @@ void Arch::slotOpenExited( KProcess* _kp )
_kp = m_currentProcess = 0;
}
-void Arch::slotDeleteExited( KProcess *_kp )
+void Arch::slotDeleteExited( TDEProcess *_kp )
{
bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
@@ -175,7 +175,7 @@ void Arch::slotDeleteExited( KProcess *_kp )
_kp = m_currentProcess = 0;
}
-void Arch::slotExtractExited( KProcess *_kp )
+void Arch::slotExtractExited( TDEProcess *_kp )
{
bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
@@ -234,7 +234,7 @@ void Arch::unarchFile( TQStringList *fileList, const TQString & destDir,
unarchFileInternal();
}
-void Arch::slotAddExited( KProcess *_kp )
+void Arch::slotAddExited( TDEProcess *_kp )
{
bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
@@ -261,7 +261,7 @@ void Arch::slotAddExited( KProcess *_kp )
_kp = m_currentProcess = 0;
}
-void Arch::slotReceivedOutput( KProcess*, char* data, int length )
+void Arch::slotReceivedOutput( TDEProcess*, char* data, int length )
{
char c = data[ length ];
data[ length ] = '\0';
@@ -271,7 +271,7 @@ void Arch::slotReceivedOutput( KProcess*, char* data, int length )
}
-void Arch::slotReceivedTOC( KProcess*, char* data, int length )
+void Arch::slotReceivedTOC( TDEProcess*, char* data, int length )
{
char c = data[ length ];
data[ length ] = '\0';
@@ -400,7 +400,7 @@ void Arch::test()
KMessageBox::information(0, i18n("Not implemented."));
}
-void Arch::slotTestExited( KProcess *_kp )
+void Arch::slotTestExited( TDEProcess *_kp )
{
bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
diff --git a/ark/arch.h b/ark/arch.h
index 85c6c7d..5592832 100644
--- a/ark/arch.h
+++ b/ark/arch.h
@@ -26,7 +26,7 @@
*/
/* The following class is the base class for all of the archive types.
- * In order for it to work properly with the KProcess, you have to
+ * In order for it to work properly with the TDEProcess, you have to
* connect the ProcessExited signal appropriately before spawning
* the core operations. Then the signal that the process exited can
* be intercepted by the viewer (in ark, ArkWidget) and dealt with
@@ -58,7 +58,7 @@
class TQCString;
class TQStringList;
-class KProcess;
+class TDEProcess;
class FileListView;
class ArkWidget;
@@ -156,16 +156,16 @@ class Arch : public TQObject
virtual void createPassword() {}
protected slots:
- void slotOpenExited( KProcess* );
- void slotExtractExited( KProcess* );
- void slotDeleteExited( KProcess* );
- void slotAddExited( KProcess* );
- void slotTestExited( KProcess* );
+ void slotOpenExited( TDEProcess* );
+ void slotExtractExited( TDEProcess* );
+ void slotDeleteExited( TDEProcess* );
+ void slotAddExited( TDEProcess* );
+ void slotTestExited( TDEProcess* );
- void slotReceivedOutput( KProcess *, char*, int );
+ void slotReceivedOutput( TDEProcess *, char*, int );
virtual bool processLine( const TQCString &line );
- virtual void slotReceivedTOC( KProcess *, char *, int );
+ virtual void slotReceivedTOC( TDEProcess *, char *, int );
signals:
void sigOpen( Arch * archive, bool success, const TQString &filename, int );
@@ -202,7 +202,7 @@ class Arch : public TQObject
TQPtrList<ArchColumns> m_archCols;
int m_numCols, m_dateCol, m_fixYear, m_fixMonth, m_fixDay, m_fixTime;
int m_repairYear, m_repairMonth, m_repairTime;
- KProcess *m_currentProcess;
+ TDEProcess *m_currentProcess;
TQStringList *m_fileList;
TQString m_destDir;
bool m_viewFriendly;
diff --git a/ark/arj.cpp b/ark/arj.cpp
index 95e5e98..146df76 100644
--- a/ark/arj.cpp
+++ b/ark/arj.cpp
@@ -95,7 +95,7 @@ void ArjArch::addDir( const TQString & _dirName )
void ArjArch::addFile( const TQStringList & urls )
{
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -122,14 +122,14 @@ void ArjArch::addFile( const TQStringList & urls )
*kp << url.fileName();
}
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotAddExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotAddExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigAdd( false );
@@ -186,18 +186,18 @@ void ArjArch::open()
m_header_removed = false;
m_finished = false;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_unarchiver_program << "v" << m_filename;
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotOpenExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotOpenExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigOpen( this, false, TQString::null, 0 );
@@ -214,7 +214,7 @@ void ArjArch::unarchFileInternal()
return;
}
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_unarchiver_program;
@@ -246,14 +246,14 @@ void ArjArch::unarchFileInternal()
}
}
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotExtractExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotExtractExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigExtract( false );
@@ -270,7 +270,7 @@ void ArjArch::remove( TQStringList *list )
if ( !list )
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "d" << m_filename;
@@ -282,14 +282,14 @@ void ArjArch::remove( TQStringList *list )
*kp << str;
}
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotDeleteExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotDeleteExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigDelete( false );
@@ -300,7 +300,7 @@ void ArjArch::test()
{
clearShellOutput();
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_unarchiver_program << "t";
@@ -310,14 +310,14 @@ void ArjArch::test()
*kp << m_filename;
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotTestExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotTestExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigTest( false );
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 0935e38..6a40e4a 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -1611,17 +1611,17 @@ ArkWidget::editStart()
{
kdDebug(1601) << "Edit in progress..." << endl;
KURL::List list;
- // edit will be in progress until the KProcess terminates.
+ // edit will be in progress until the TDEProcess terminates.
KOpenWithDlg l( list, i18n("Edit with:"),
TQString(), (TQWidget*)0L );
if ( l.exec() )
{
- KProcess *kp = new KProcess;
+ TDEProcess *kp = new TDEProcess;
*kp << l.text() << m_strFileToView;
- connect( kp, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotEditFinished(KProcess *)) );
- if ( kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false )
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotEditFinished(TDEProcess *)) );
+ if ( kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false )
{
KMessageBox::error(0, i18n("Trouble editing the file..."));
}
@@ -1629,7 +1629,7 @@ ArkWidget::editStart()
}
void
-ArkWidget::slotEditFinished(KProcess *kp)
+ArkWidget::slotEditFinished(TDEProcess *kp)
{
kdDebug(1601) << "+ArkWidget::slotEditFinished" << endl;
connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) );
@@ -1841,7 +1841,7 @@ ArkWidget::updateStatusSelection()
else if (m_nNumSelectedFiles != 1)
{
strInfo = i18n("%1 files selected %2")
- .arg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0))
+ .arg(TDEGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0))
.arg(KIO::convertSize(m_nSizeOfSelectedFiles));
}
else
diff --git a/ark/arkwidget.h b/ark/arkwidget.h
index fa2b68e..59d3ea7 100644
--- a/ark/arkwidget.h
+++ b/ark/arkwidget.h
@@ -45,7 +45,7 @@ class TQDragMoveEvent;
class TQDropEvent;
class KPopupMenu;
-class KProcess;
+class TDEProcess;
class KURL;
class KRun;
class KTempFile;
@@ -133,7 +133,7 @@ protected slots:
void slotExtractDone(bool);
void slotExtractRemoteDone(KIO::Job *job);
void slotAddDone(bool);
- void slotEditFinished(KProcess *);
+ void slotEditFinished(TDEProcess *);
void slotTestDone(bool);
signals:
void openURLRequest( const KURL & url );
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index 862d357..00d6a9d 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -143,7 +143,7 @@ void CompressedFile::initData()
}
if ( mimeType == "application/x-compress" )
{
- m_unarchiver_program = KGlobal::dirs()->findExe( "uncompress" ).isNull()? "gunzip" : "uncompress";
+ m_unarchiver_program = TDEGlobal::dirs()->findExe( "uncompress" ).isNull()? "gunzip" : "uncompress";
m_archiver_program = "compress";
m_defaultExtensions = ".Z";
}
@@ -184,14 +184,14 @@ void CompressedFile::open()
if ( !KIO::NetAccess::exists( target, true, NULL ) )
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_unarchiver_program << "-f" ;
if ( m_unarchiver_program == "lzop")
{
*kp << "-d";
// lzop hack, see comment in tar.cpp createTmp()
- kp->setUsePty( KProcess::Stdin, false );
+ kp->setUsePty( TDEProcess::Stdin, false );
}
// gunzip 1.3 seems not to like original names with directories in them
// testcase: https://listman.redhat.com/pipermail/valhalla-list/2006-October.txt.gz
@@ -202,14 +202,14 @@ void CompressedFile::open()
kdDebug(1601) << "Command is " << m_unarchiver_program << " " << m_tmpfile<< endl;
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotUncompressDone(KProcess*)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotUncompressDone(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigOpen(this, false, TQString(), 0 );
@@ -218,7 +218,7 @@ void CompressedFile::open()
kdDebug(1601) << "-CompressedFile::open" << endl;
}
-void CompressedFile::slotUncompressDone(KProcess *_kp)
+void CompressedFile::slotUncompressDone(TDEProcess *_kp)
{
bool bSuccess = false;
kdDebug(1601) << "normalExit = " << _kp->normalExit() << endl;
@@ -284,9 +284,9 @@ void CompressedFile::addFile( const TQStringList &urls )
TQString file;
file = url.path();
- KProcess proc;
+ TDEProcess proc;
proc << "cp" << file << m_tmpdir;
- proc.start(KProcess::Block);
+ proc.start(TDEProcess::Block);
m_tmpfile = file.right(file.length()
- file.findRev("/")-1);
@@ -296,23 +296,23 @@ void CompressedFile::addFile( const TQStringList &urls )
kdDebug(1601) << "File is " << file << endl;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
// lzop hack, see comment in tar.cpp createTmp()
if ( m_archiver_program == "lzop")
- kp->setUsePty( KProcess::Stdin, false );
+ kp->setUsePty( TDEProcess::Stdin, false );
TQString compressor = m_archiver_program;
*kp << compressor << "-c" << file;
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotAddInProgress(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotAddDone(KProcess*)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotAddInProgress(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotAddDone(TDEProcess*)));
int f_desc = KDE_open(TQFile::encodeName(m_filename), O_CREAT | O_TRUNC | O_WRONLY, 0666);
if (f_desc != -1)
@@ -320,7 +320,7 @@ void CompressedFile::addFile( const TQStringList &urls )
else
fd = NULL;
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
}
@@ -328,7 +328,7 @@ void CompressedFile::addFile( const TQStringList &urls )
kdDebug(1601) << "-CompressedFile::addFile" << endl;
}
-void CompressedFile::slotAddInProgress(KProcess*, char* _buffer, int _bufflen)
+void CompressedFile::slotAddInProgress(TDEProcess*, char* _buffer, int _bufflen)
{
// we're trying to capture the output of a command like this
// gzip -c myfile
@@ -342,7 +342,7 @@ void CompressedFile::slotAddInProgress(KProcess*, char* _buffer, int _bufflen)
}
}
-void CompressedFile::slotAddDone(KProcess *_kp)
+void CompressedFile::slotAddDone(TDEProcess *_kp)
{
fclose(fd);
slotAddExited(_kp);
@@ -361,9 +361,9 @@ void CompressedFile::unarchFileInternal()
else
dest=m_destDir;
- KProcess proc;
+ TDEProcess proc;
proc << "cp" << m_tmpfile << dest;
- proc.start(KProcess::Block);
+ proc.start(TDEProcess::Block);
}
emit sigExtract(true);
}
diff --git a/ark/compressedfile.h b/ark/compressedfile.h
index 896b0fa..16d84fb 100644
--- a/ark/compressedfile.h
+++ b/ark/compressedfile.h
@@ -28,7 +28,7 @@
class TQString;
class TQCString;
class TQStringList;
-class KProcess;
+class TDEProcess;
class KTempDir;
class Arch;
@@ -61,9 +61,9 @@ public:
TQString tempFileName(){ return m_tmpfile; }
private slots:
- void slotUncompressDone(KProcess *);
- void slotAddInProgress(KProcess*, char*, int);
- void slotAddDone(KProcess*);
+ void slotUncompressDone(TDEProcess *);
+ void slotAddInProgress(TDEProcess*, char*, int);
+ void slotAddDone(TDEProcess*);
private:
void initExtract( bool, bool, bool );
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index cf95d48..8057828 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -105,7 +105,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
KURLCompletion *comp = new KURLCompletion();
comp->setReplaceHome( true );
- comp->setCompletionMode( KGlobalSettings::CompletionAuto );
+ comp->setCompletionMode( TDEGlobalSettings::CompletionAuto );
combobox->setCompletionObject( comp );
combobox->setMaxCount( 20 );
combobox->setInsertionPolicy( TQComboBox::AtTop );
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index ca941bd..16bcf8d 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -153,7 +153,7 @@ void FileLVI::setText( int column, const TQString &text )
else
m_ratio = text.toDouble();
TQListViewItem::setText( column, i18n( "Packed Ratio", "%1 %" )
- .arg(KGlobal::locale()->formatNumber( m_ratio, 1 ) )
+ .arg(TDEGlobal::locale()->formatNumber( m_ratio, 1 ) )
);
}
else if ( colName == timeStampStrCol )
@@ -163,7 +163,7 @@ void FileLVI::setText( int column, const TQString &text )
else
{
m_timeStamp = TQDateTime::fromString( text, Qt::ISODate );
- TQListViewItem::setText( column, KGlobal::locale()->formatDateTime( m_timeStamp ) );
+ TQListViewItem::setText( column, TDEGlobal::locale()->formatDateTime( m_timeStamp ) );
}
}
else
@@ -354,7 +354,7 @@ FileListView::contentsMouseMoveEvent(TQMouseEvent *e)
{
KListView::contentsMouseMoveEvent(e);
}
- else if( ( m_presspos - e->pos() ).manhattanLength() > KGlobalSettings::dndEventDelay() )
+ else if( ( m_presspos - e->pos() ).manhattanLength() > TDEGlobalSettings::dndEventDelay() )
{
m_pressed = false; // Prevent triggering again
if(isSelectionEmpty())
diff --git a/ark/lha.cpp b/ark/lha.cpp
index 14fa68d..045be09 100644
--- a/ark/lha.cpp
+++ b/ark/lha.cpp
@@ -144,16 +144,16 @@ void LhaArch::open()
m_finished = false;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_archiver_program << "v" << m_filename;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotOpenExited(KProcess*) ) );
-
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotOpenExited(TDEProcess*) ) );
+
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigOpen( this, false, TQString(), 0 );
@@ -194,7 +194,7 @@ void LhaArch::addDir( const TQString & dirName )
void LhaArch::addFile( const TQStringList &urls )
{
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -216,14 +216,14 @@ void LhaArch::addFile( const TQStringList &urls )
*kp << fileURL.fileName();
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotAddExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotAddExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigAdd( false );
@@ -241,7 +241,7 @@ void LhaArch::unarchFileInternal()
return;
}
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "xfw=" + m_destDir << m_filename;
@@ -257,14 +257,14 @@ void LhaArch::unarchFileInternal()
}
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotExtractExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotExtractExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigExtract( false );
@@ -276,7 +276,7 @@ void LhaArch::remove( TQStringList *list )
if ( !list )
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "df" << m_filename;
@@ -287,14 +287,14 @@ void LhaArch::remove( TQStringList *list )
*kp << ( *it );
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotDeleteExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotDeleteExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigDelete( false );
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index fc26023..7096833 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -177,7 +177,7 @@ MainWindow::file_reload()
void
MainWindow::editToolbars()
{
- saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+ saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") );
KEditToolbar dlg( factory(), this );
connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
dlg.exec();
@@ -187,7 +187,7 @@ void
MainWindow::slotNewToolbarConfig()
{
createGUI( m_part );
- applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+ applyMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") );
}
void
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 67ebc16..2b015f5 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -56,9 +56,9 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )
: Arch( _gui, _fileName )
{
// Check if rar is available
- bool have_rar = !KGlobal::dirs()->findExe( "rar" ).isNull();
- bool have_unrar = !KGlobal::dirs()->findExe( "unrar" ).isNull();
- bool have_unrar_free = !KGlobal::dirs()->findExe( "unrar-free" ).isNull();
+ bool have_rar = !TDEGlobal::dirs()->findExe( "rar" ).isNull();
+ bool have_unrar = !TDEGlobal::dirs()->findExe( "unrar" ).isNull();
+ bool have_unrar_free = !TDEGlobal::dirs()->findExe( "unrar-free" ).isNull();
if ( have_rar )
{
@@ -140,7 +140,7 @@ void RarArch::open()
m_header_removed = false;
m_finished = false;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_unarchiver_program << "v" << "-c-";
if ( !m_password.isEmpty() )
@@ -150,14 +150,14 @@ void RarArch::open()
*kp << m_filename;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotOpenExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotOpenExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigOpen( this, false, TQString(), 0 );
@@ -204,7 +204,7 @@ void RarArch::addDir( const TQString & _dirName )
void RarArch::addFile( const TQStringList & urls )
{
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -234,14 +234,14 @@ void RarArch::addFile( const TQStringList & urls )
*kp << url.fileName();
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotAddExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotAddExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigAdd( false );
@@ -256,7 +256,7 @@ void RarArch::unarchFileInternal()
return;
}
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
// extract (and maybe overwrite)
@@ -291,14 +291,14 @@ void RarArch::unarchFileInternal()
*kp << m_destDir ;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotExtractExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotExtractExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigExtract( false );
@@ -315,7 +315,7 @@ void RarArch::remove( TQStringList *list )
if ( !list )
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "d" << m_filename;
@@ -327,14 +327,14 @@ void RarArch::remove( TQStringList *list )
*kp << str;
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotDeleteExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotDeleteExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigDelete( false );
@@ -345,7 +345,7 @@ void RarArch::test()
{
clearShellOutput();
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_unarchiver_program << "t";
@@ -355,14 +355,14 @@ void RarArch::test()
*kp << m_filename;
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotTestExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotTestExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigTest( false );
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index 85e1a95..3ddf02f 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -46,9 +46,9 @@ SevenZipArch::SevenZipArch( ArkWidget *gui, const TQString &filename )
: Arch( gui, filename ), m_nameColumnPos( -1 )
{
// Check if 7z is available
- bool have_7z = !KGlobal::dirs()->findExe( "7z" ).isNull();
+ bool have_7z = !TDEGlobal::dirs()->findExe( "7z" ).isNull();
// Check if 7za is available
- bool have_7za = !KGlobal::dirs()->findExe( "7za" ).isNull();
+ bool have_7za = !TDEGlobal::dirs()->findExe( "7za" ).isNull();
if ( have_7z )
m_archiver_program = m_unarchiver_program = "7z"; // Use 7z
@@ -99,17 +99,17 @@ void SevenZipArch::open()
m_header_removed = false;
m_finished = false;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_archiver_program << "l" << m_filename;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotOpenExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotOpenExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigOpen( this, false, TQString(), 0 );
@@ -130,7 +130,7 @@ void SevenZipArch::createPassword()
void SevenZipArch::addFile( const TQStringList & urls )
{
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "a" ;
@@ -150,14 +150,14 @@ void SevenZipArch::addFile( const TQStringList & urls )
*kp << url.fileName();
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotAddExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotAddExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigAdd( false );
@@ -184,7 +184,7 @@ void SevenZipArch::remove( TQStringList *list )
if ( !list )
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "d" << m_filename;
@@ -195,14 +195,14 @@ void SevenZipArch::remove( TQStringList *list )
*kp << *it;
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotDeleteExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotDeleteExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigDelete( false );
@@ -217,7 +217,7 @@ void SevenZipArch::unarchFileInternal( )
return;
}
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
// extract (and maybe overwrite)
@@ -249,14 +249,14 @@ void SevenZipArch::unarchFileInternal( )
*kp << "-o" + m_destDir ;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotExtractExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotExtractExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigExtract( false );
@@ -333,7 +333,7 @@ bool SevenZipArch::processLine( const TQCString& _line )
return true;
}
-void SevenZipArch::slotReceivedTOC( KProcess*, char* data, int length )
+void SevenZipArch::slotReceivedTOC( TDEProcess*, char* data, int length )
{
char endchar = data[ length ];
data[ length ] = '\0';
@@ -395,7 +395,7 @@ void SevenZipArch::test()
{
clearShellOutput();
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_unarchiver_program << "t";
@@ -405,14 +405,14 @@ void SevenZipArch::test()
*kp << m_filename;
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotTestExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotTestExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigTest( false );
diff --git a/ark/sevenzip.h b/ark/sevenzip.h
index de10693..8eaadc5 100644
--- a/ark/sevenzip.h
+++ b/ark/sevenzip.h
@@ -48,7 +48,7 @@ class SevenZipArch : public Arch
protected slots:
virtual bool processLine( const TQCString& line );
- virtual void slotReceivedTOC( KProcess*, char*, int );
+ virtual void slotReceivedTOC( TDEProcess*, char*, int );
private:
void setHeaders();
diff --git a/ark/tar.cpp b/ark/tar.cpp
index 1c1fac9..7e5a772 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -149,13 +149,13 @@ void TarArch::updateArch()
else
fd = NULL;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
- KProcess::Communication flag = KProcess::AllOutput;
+ TDEProcess::Communication flag = TDEProcess::AllOutput;
if ( getCompressor() == "lzop" )
{
- kp->setUsePty( KProcess::Stdin, false );
- flag = KProcess::Stdout;
+ kp->setUsePty( TDEProcess::Stdin, false );
+ flag = TDEProcess::Stdout;
}
if ( !getCompressor().isNull() )
*kp << getCompressor() << "-c" << tmpfile;
@@ -163,15 +163,15 @@ void TarArch::updateArch()
*kp << "cat" << tmpfile;
- connect(kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(updateProgress( KProcess *, char *, int )));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- (Arch *)this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(updateProgress( TDEProcess *, char *, int )));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ (Arch *)this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect(kp, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(updateFinished(KProcess *)) );
+ connect(kp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(updateFinished(TDEProcess *)) );
- if ( !fd || kp->start(KProcess::NotifyOnExit, flag) == false)
+ if ( !fd || kp->start(TDEProcess::NotifyOnExit, flag) == false)
{
KMessageBox::error(0, i18n("Trouble writing to the archive..."));
emit updateDone();
@@ -179,7 +179,7 @@ void TarArch::updateArch()
}
}
-void TarArch::updateProgress( KProcess * _proc, char *_buffer, int _bufflen )
+void TarArch::updateProgress( TDEProcess * _proc, char *_buffer, int _bufflen )
{
// we're trying to capture the output of a command like this
// gzip -c myarch.tar
@@ -257,7 +257,7 @@ TarArch::open()
//
// Now it's essential - used later to decide whether pathnames in the
// tar archive are plain or start with "./"
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_archiver_program;
@@ -272,14 +272,14 @@ TarArch::open()
m_header_removed = false;
m_finished = false;
- connect(kp, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotListingDone(KProcess *)));
- connect(kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput( KProcess *, char *, int )));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect(kp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotListingDone(TDEProcess *)));
+ connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput( TDEProcess *, char *, int )));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
}
@@ -315,7 +315,7 @@ void TarArch::openFirstCreateTempDone()
m_listingThread->start();
}
-void TarArch::slotListingDone(KProcess *_kp)
+void TarArch::slotListingDone(TDEProcess *_kp)
{
const TQString list = getLastShellOutput();
FileListView *flv = m_gui->fileList();
@@ -393,29 +393,29 @@ void TarArch::createTmp()
else
fd = NULL;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
kdDebug(1601) << "Uncompressor is " << strUncompressor << endl;
*kp << strUncompressor;
- KProcess::Communication flag = KProcess::AllOutput;
+ TDEProcess::Communication flag = TDEProcess::AllOutput;
if (strUncompressor == "lzop")
{
// setting up a pty for lzop, since it doesn't like stdin to
// be /dev/null ( "no filename allowed when reading from stdin" )
// - but it used to work without this ? ( Feb 13, 2003 )
- kp->setUsePty( KProcess::Stdin, false );
- flag = KProcess::Stdout;
+ kp->setUsePty( TDEProcess::Stdin, false );
+ flag = TDEProcess::Stdout;
*kp << "-d";
}
*kp << "-c" << m_filename;
- connect(kp, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(createTmpFinished(KProcess *)));
- connect(kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(createTmpProgress( KProcess *, char *, int )));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- if (kp->start(KProcess::NotifyOnExit, flag ) == false)
+ connect(kp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(createTmpFinished(TDEProcess *)));
+ connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(createTmpProgress( TDEProcess *, char *, int )));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ if (kp->start(TDEProcess::NotifyOnExit, flag ) == false)
{
KMessageBox::error(0, i18n("Unable to fork a decompressor"));
emit sigOpen( this, false, TQString(), 0 );
@@ -433,7 +433,7 @@ void TarArch::createTmp()
}
}
-void TarArch::createTmpProgress( KProcess * _proc, char *_buffer, int _bufflen )
+void TarArch::createTmpProgress( TDEProcess * _proc, char *_buffer, int _bufflen )
{
// we're trying to capture the output of a command like this
// gunzip -c myarch.tar.gz
@@ -532,7 +532,7 @@ void TarArch::addFileCreateTempDone()
disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) );
TQStringList * urls = &m_filesToAdd;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_archiver_program;
if( ArkSettings::replaceOnlyWithNewer())
@@ -562,25 +562,25 @@ void TarArch::addFileCreateTempDone()
kdDebug(1601) << *strTemp << " " << endl;
}
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotAddFinished(KProcess*)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotAddFinished(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigAdd(false);
}
}
-void TarArch::slotAddFinished(KProcess *_kp)
+void TarArch::slotAddFinished(TDEProcess *_kp)
{
- disconnect( _kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotAddFinished(KProcess*)));
+ disconnect( _kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotAddFinished(TDEProcess*)));
m_pTmpProc = _kp;
m_filesToAdd = TQStringList();
if ( compressed )
@@ -613,7 +613,7 @@ void TarArch::unarchFileInternal()
TQString tmp;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -641,15 +641,15 @@ void TarArch::unarchFileInternal()
}
}
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotExtractExited(KProcess*)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotExtractExited(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigExtract(false);
@@ -670,7 +670,7 @@ void TarArch::removeCreateTempDone()
disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) );
TQString name, tmp;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "--delete" << "-f" ;
if (compressed)
@@ -685,22 +685,22 @@ void TarArch::removeCreateTempDone()
}
m_filesToRemove = TQStringList();
- connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+ connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
- connect( kp, TQT_SIGNAL(processExited(KProcess*)), this,
- TQT_SLOT(slotDeleteExited(KProcess*)));
+ connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
+ TQT_SLOT(slotDeleteExited(TDEProcess*)));
- if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
+ if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
emit sigDelete(false);
}
}
-void TarArch::slotDeleteExited(KProcess *_kp)
+void TarArch::slotDeleteExited(TDEProcess *_kp)
{
m_pTmpProc2 = _kp;
if ( compressed )
@@ -730,14 +730,14 @@ void TarArch::addDir(const TQString & _dirName)
addFile(list);
}
-void TarArch::openFinished( KProcess * )
+void TarArch::openFinished( TDEProcess * )
{
// do nothing
// turn off busy light (when someone makes one)
kdDebug(1601) << "Open finshed" << endl;
}
-void TarArch::createTmpFinished( KProcess *_kp )
+void TarArch::createTmpFinished( TDEProcess *_kp )
{
createTmpInProgress = false;
fclose(fd);
@@ -747,7 +747,7 @@ void TarArch::createTmpFinished( KProcess *_kp )
emit createTempDone();
}
-void TarArch::updateFinished( KProcess *_kp )
+void TarArch::updateFinished( TDEProcess *_kp )
{
fclose(fd);
updateInProgress = false;
@@ -789,7 +789,7 @@ void TarArch::test()
{
clearShellOutput();
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
TQString uncomp = getUnCompressor();
@@ -808,14 +808,14 @@ void TarArch::test()
*kp << m_filename;
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotTestExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotTestExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigTest( false );
diff --git a/ark/tar.h b/ark/tar.h
index 3b75008..4e7b7ec 100644
--- a/ark/tar.h
+++ b/ark/tar.h
@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class TQString;
class TQStrList;
-class KProcess;
+class TDEProcess;
class KTempDir;
class KTarDirectory;
class KTar;
@@ -77,14 +77,14 @@ class TarArch : public Arch
TQString getUnCompressor();
public slots:
- void updateProgress( KProcess *_kp, char *_buffer, int _bufflen );
- void openFinished( KProcess * );
- void updateFinished( KProcess * );
- void createTmpFinished( KProcess * );
- void createTmpProgress( KProcess *_kp, char *_buffer, int _bufflen );
- void slotAddFinished( KProcess * );
- void slotListingDone( KProcess * );
- void slotDeleteExited( KProcess * );
+ void updateProgress( TDEProcess *_kp, char *_buffer, int _bufflen );
+ void openFinished( TDEProcess * );
+ void updateFinished( TDEProcess * );
+ void createTmpFinished( TDEProcess * );
+ void createTmpProgress( TDEProcess *_kp, char *_buffer, int _bufflen );
+ void slotAddFinished( TDEProcess * );
+ void slotListingDone( TDEProcess * );
+ void slotDeleteExited( TDEProcess * );
signals:
void removeDone();
@@ -126,8 +126,8 @@ class TarArch : public Arch
FILE *fd;
TQStringList m_filesToAdd;
TQStringList m_filesToRemove;
- KProcess * m_pTmpProc;
- KProcess * m_pTmpProc2;
+ TDEProcess * m_pTmpProc;
+ TDEProcess * m_pTmpProc2;
bool failed;
bool m_dotslash;
TarListingThread *m_listingThread;
diff --git a/ark/zip.cpp b/ark/zip.cpp
index 1888d50..3f48607 100644
--- a/ark/zip.cpp
+++ b/ark/zip.cpp
@@ -90,18 +90,18 @@ void ZipArch::open()
m_header_removed = false;
m_finished = false;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_unarchiver_program << "-v" << m_filename;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotOpenExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotOpenExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigOpen( this, false, TQString(), 0 );
@@ -138,7 +138,7 @@ void ZipArch::addDir( const TQString & _dirName )
void ZipArch::addFile( const TQStringList &urls )
{
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -172,14 +172,14 @@ void ZipArch::addFile( const TQStringList &urls )
*kp << fileURL.fileName();
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotAddExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotAddExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigAdd( false );
@@ -196,7 +196,7 @@ void ZipArch::unarchFileInternal()
return;
}
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_unarchiver_program;
@@ -231,14 +231,14 @@ void ZipArch::unarchFileInternal()
*kp << "-d" << m_destDir;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotExtractExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotExtractExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigExtract( false );
@@ -256,7 +256,7 @@ void ZipArch::remove( TQStringList *list )
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "-d" << m_filename;
@@ -268,14 +268,14 @@ void ZipArch::remove( TQStringList *list )
*kp << str;
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotDeleteExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotDeleteExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigDelete( false );
@@ -286,7 +286,7 @@ void ZipArch::test()
{
clearShellOutput();
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_unarchiver_program << "-t";
@@ -296,14 +296,14 @@ void ZipArch::test()
*kp << m_filename;
- connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
- SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, SIGNAL( processExited(KProcess*) ),
- SLOT( slotTestExited(KProcess*) ) );
+ connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, SIGNAL( processExited(TDEProcess*) ),
+ SLOT( slotTestExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigTest( false );
diff --git a/ark/zoo.cpp b/ark/zoo.cpp
index 1ef7377..f94abdb 100644
--- a/ark/zoo.cpp
+++ b/ark/zoo.cpp
@@ -108,16 +108,16 @@ void ZooArch::open()
m_finished = false;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
*kp << m_archiver_program << "l" << m_filename;
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotOpenExited(KProcess*) ) );
-
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotOpenExited(TDEProcess*) ) );
+
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigOpen( this, false, TQString(), 0 );
@@ -155,7 +155,7 @@ void ZooArch::addDir( const TQString & _dirName )
void ZooArch::addFile( const TQStringList &urls )
{
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -177,14 +177,14 @@ void ZooArch::addFile( const TQStringList &urls )
*kp << fileURL.fileName();
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotAddExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotAddExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigAdd( false );
@@ -209,7 +209,7 @@ void ZooArch::unarchFileInternal()
// We already checked the validity of the dir before coming here
Q_ASSERT(ret);
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program;
@@ -236,14 +236,14 @@ void ZooArch::unarchFileInternal()
}
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotExtractExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotExtractExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigExtract( false );
@@ -255,7 +255,7 @@ void ZooArch::remove( TQStringList *list )
if (!list)
return;
- KProcess *kp = m_currentProcess = new KProcess;
+ TDEProcess *kp = m_currentProcess = new TDEProcess;
kp->clearArguments();
*kp << m_archiver_program << "D" << m_filename;
@@ -267,14 +267,14 @@ void ZooArch::remove( TQStringList *list )
*kp << str;
}
- connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ),
- TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
- connect( kp, TQT_SIGNAL( processExited(KProcess*) ),
- TQT_SLOT( slotDeleteExited(KProcess*) ) );
+ connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+ TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+ connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ),
+ TQT_SLOT( slotDeleteExited(TDEProcess*) ) );
- if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
+ if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
emit sigDelete( false );
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 4d773f9..0c88b95 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -43,7 +43,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("kcharselectapplet");
+ TDEGlobal::locale()->insertCatalogue("kcharselectapplet");
return new CharSelectApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About | KPanelApplet::Preferences,
parent, "kcharselectapplet");
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 5242cc4..8e1b7d2 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -584,7 +584,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
pbMinus, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMinusclicked(void)));
- pbPeriod = new KCalcButton(KGlobal::locale()->decimalSymbol(), thisPage,
+ pbPeriod = new KCalcButton(TDEGlobal::locale()->decimalSymbol(), thisPage,
"Period-Button", i18n("Decimal point"));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
TQT_TQOBJECT(pbPeriod), TQT_SLOT(slotSetAccelDisplayMode(bool)));
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index 26cdbf1..25b2361 100644
--- a/kcalc/kcalc.kcfg
+++ b/kcalc/kcalc.kcfg
@@ -45,7 +45,7 @@
<group name="Font">
<entry name="Font" type="Font">
<label>The font to use in the display.</label>
- <default code="true">TQFont(KGlobalSettings::generalFont().family(), 14, TQFont::Bold)</default>
+ <default code="true">TQFont(TDEGlobalSettings::generalFont().family(), 14, TQFont::Bold)</default>
</entry>
</group>
<group name="Precision">
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index 17ad67a..f768ffa 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -268,10 +268,10 @@ void KCalcDisplay::setText(TQString const &string)
// truncating, formatting and appending again
if (string.endsWith(".")) {
localizedString.truncate(localizedString.length() - 1);
- localizedString = KGlobal::locale()->formatNumber(localizedString, false, 0); // Note: rounding happened already above!
- localizedString.append(KGlobal::locale()->decimalSymbol());
+ localizedString = TDEGlobal::locale()->formatNumber(localizedString, false, 0); // Note: rounding happened already above!
+ localizedString.append(TDEGlobal::locale()->decimalSymbol());
} else
- localizedString = KGlobal::locale()->formatNumber(string, false, 0); // Note: rounding happened already above!
+ localizedString = TDEGlobal::locale()->formatNumber(string, false, 0); // Note: rounding happened already above!
TQLabel::setText(localizedString);
emit changedText(localizedString);
diff --git a/kcharselect/main.cc b/kcharselect/main.cc
index 642acf0..a64f379 100644
--- a/kcharselect/main.cc
+++ b/kcharselect/main.cc
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
KConfig *config = kapp->config();
config->setGroup("General");
- TQString font(config->readEntry("selectedFont", KGlobalSettings::generalFont().family()));
+ TQString font(config->readEntry("selectedFont", TDEGlobalSettings::generalFont().family()));
TQChar c = TQChar(static_cast<unsigned short>(config->readNumEntry("char",33)));
int tn = config->readNumEntry("table",0);
bool direction = config->readNumEntry("entryDirection",0);
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index ddc2205..b90c74b 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -74,7 +74,7 @@ IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQStri
theTrayIcon->contextMenu()->changeTitle(0, "IRKick");
theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQT_SLOT(slotConfigure()));
theTrayIcon->contextMenu()->insertSeparator();
- theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, KGlobal::instance()->aboutData()))->menu());
+ theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, TDEGlobal::instance()->aboutData()))->menu());
theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQT_SIGNAL(activated()));
connect(theTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), TQT_SLOT(doQuit()));
diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp
index 43715e9..95ba384 100644
--- a/kdelirc/irkick/main.cpp
+++ b/kdelirc/irkick/main.cpp
@@ -29,7 +29,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, aboutData );
KUniqueApplication::addCmdLineOptions();
KUniqueApplication app;
- KGlobal::locale()->insertCatalogue( "kdelirc" );
+ TDEGlobal::locale()->insertCatalogue( "kdelirc" );
app.disableSessionManagement();
IRKick *theIRKick = new IRKick("IRKick");
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index a7dcbae..9df9c6e 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name)
{
- KGlobal::locale()->insertCatalogue( "kcmlirc" );
+ TDEGlobal::locale()->insertCatalogue( "kcmlirc" );
setAboutData(new TDEAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), TDEAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org"));
setButtons(KCModule::Help);
setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>"));
@@ -535,7 +535,7 @@ void KCMLirc::configChanged()
extern "C"
{
KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *)
- { KGlobal::locale()->insertCatalogue("kcmlirc");
+ { TDEGlobal::locale()->insertCatalogue("kcmlirc");
return new KCMLirc(parent, "KCMLirc");
}
}
diff --git a/kdelirc/kdelirc/profileserver.cpp b/kdelirc/kdelirc/profileserver.cpp
index d95c5d5..880b50f 100644
--- a/kdelirc/kdelirc/profileserver.cpp
+++ b/kdelirc/kdelirc/profileserver.cpp
@@ -34,7 +34,7 @@ ProfileServer::~ProfileServer()
void ProfileServer::loadProfiles()
{
- TQStringList theFiles = KGlobal::dirs()->findAllResources("data", "profiles/*.profile.xml");
+ TQStringList theFiles = TDEGlobal::dirs()->findAllResources("data", "profiles/*.profile.xml");
for(TQStringList::iterator i = theFiles.begin(); i != theFiles.end(); ++i)
{ kdDebug() << "Found data file: " << *i << endl;
Profile *p = new Profile();
diff --git a/kdelirc/kdelirc/remoteserver.cpp b/kdelirc/kdelirc/remoteserver.cpp
index 04fb290..706bb0d 100644
--- a/kdelirc/kdelirc/remoteserver.cpp
+++ b/kdelirc/kdelirc/remoteserver.cpp
@@ -34,7 +34,7 @@ RemoteServer::~RemoteServer()
void RemoteServer::loadRemotes()
{
- TQStringList theFiles = KGlobal::dirs()->findAllResources("data", "remotes/*.remote.xml");
+ TQStringList theFiles = TDEGlobal::dirs()->findAllResources("data", "remotes/*.remote.xml");
for(TQStringList::iterator i = theFiles.begin(); i != theFiles.end(); ++i)
{ kdDebug() << "Found data file: " << *i << endl;
Remote *p = new Remote();
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index c1ec230..3d9d2b2 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
// Read configuration
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Passwords"));
int timeout = config->readNumEntry(TQString::fromLatin1("Timeout"), defTimeout);
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;
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index ad1e4de..c4e5849 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -342,7 +342,7 @@ void TopLevel::insertDate(){
TQString string;
TQDate dt = TQDate::currentDate();
- string = KGlobal::locale()->formatDate(dt);
+ string = TDEGlobal::locale()->formatDate(dt);
eframe->getCursorPosition(&line,&column);
eframe->insertAt(string,line,column);
@@ -896,7 +896,7 @@ void TopLevel::statusbar_slot(){
void TopLevel::print()
{
bool aborted = false;
- TQString headerLeft = i18n("Date: %1").arg(KGlobal::locale()->formatDate(TQDate::currentDate(),true));
+ TQString headerLeft = i18n("Date: %1").arg(TDEGlobal::locale()->formatDate(TQDate::currentDate(),true));
TQString headerMid = i18n("File: %1").arg(m_caption);
TQString headerRight;
@@ -1215,8 +1215,8 @@ void TopLevel::set_colors()
}
else
{
- ncgrp.setColor(TQColorGroup::Text, KGlobalSettings::textColor());
- ncgrp.setColor(TQColorGroup::Base, KGlobalSettings::baseColor());
+ ncgrp.setColor(TQColorGroup::Text, TDEGlobalSettings::textColor());
+ ncgrp.setColor(TQColorGroup::Base, TDEGlobalSettings::baseColor());
}
mypalette.setActive(ncgrp);
diff --git a/kedit/kedit.kcfg b/kedit/kedit.kcfg
index a647737..ef1e433 100644
--- a/kedit/kedit.kcfg
+++ b/kedit/kedit.kcfg
@@ -8,7 +8,7 @@
<group name="Text Font">
<entry name="Font" type="Font" key="KEditFont">
<label>Font</label>
- <default code="true">KGlobalSettings::fixedFont()</default>
+ <default code="true">TDEGlobalSettings::fixedFont()</default>
</entry>
</group>
<group name="General Options">
@@ -18,11 +18,11 @@
</entry>
<entry name="TextColor" type="Color" key="ForeColor">
<label>Text color</label>
- <default code="true">KGlobalSettings::textColor()</default>
+ <default code="true">TDEGlobalSettings::textColor()</default>
</entry>
<entry name="BackgroundColor" type="Color" key="BackColor">
<label>Background color</label>
- <default code="true">KGlobalSettings::baseColor()</default>
+ <default code="true">TDEGlobalSettings::baseColor()</default>
</entry>
<entry name="WrapMode" type="Enum">
<label>Wrapping mode</label>
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 027ee2f..47dbd07 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -43,7 +43,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
TQT_SLOT( slotSetEncoding() ), this,
"encoding" );
- TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
encodings.prepend( i18n( "Default encoding" ) );
mEncoding->setItems( encodings );
mEncoding->setCurrentItem(0);
@@ -103,7 +103,7 @@ void KTextFileDialog::slotShowEncCombo()
encCombo->setInsertionPolicy(TQComboBox::NoInsertion);
encCombo->insertItem(i18n("Default Encoding"));
- TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
encodings.prepend( i18n( "Default encoding" ) );
encCombo->insertStringList( encodings );
encCombo->setCurrentItem(0);
@@ -131,7 +131,7 @@ void KTextFileDialog::slotShowEncCombo()
if (encCombo->currentItem() == 0) { // Default
setEncoding("");
} else {
- setEncoding(KGlobal::charsets()->
+ setEncoding(TDEGlobal::charsets()->
encodingForName(encCombo->currentText()));
}
}
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 821bc18..8d278ce 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -272,7 +272,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
v3->addStretch( 1 );
//Setup the Help Menu
- helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), false);
+ helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
helpbutton = new KPushButton( KStdGuiItem::help(), this );
helpbutton->setAutoRepeat( false );
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 35ed933..1b26329 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -46,7 +46,7 @@ static TQString extPath = TQString();
extPath = path;
}
- return KGlobal::dirs()->findExe(e, extPath);
+ return TDEGlobal::dirs()->findExe(e, extPath);
}
@@ -324,7 +324,7 @@ bool FloppyAction::configureDevice(int drive,int density)
return true;
}
-void FloppyAction::processDone(KProcess *p)
+void FloppyAction::processDone(TDEProcess *p)
{
DEBUGSETUP;
@@ -354,14 +354,14 @@ void FloppyAction::processDone(KProcess *p)
}
}
-void FloppyAction::processStdOut(KProcess *, char *b, int l)
+void FloppyAction::processStdOut(TDEProcess *, char *b, int l)
{
Q_UNUSED(b);
Q_UNUSED(l);
kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl;
}
-void FloppyAction::processStdErr(KProcess *p, char *b, int l)
+void FloppyAction::processStdErr(TDEProcess *p, char *b, int l)
{
processStdOut(p,b,l);
}
@@ -370,16 +370,16 @@ bool FloppyAction::startProcess()
{
DEBUGSETUP;
- connect(theProcess,TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processDone(KProcess *)));
- connect(theProcess,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),
- this,TQT_SLOT(processStdOut(KProcess *,char *,int)));
- connect(theProcess,TQT_SIGNAL(receivedStderr(KProcess *,char *,int)),
- this,TQT_SLOT(processStdErr(KProcess *,char *,int)));
+ connect(theProcess,TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processDone(TDEProcess *)));
+ connect(theProcess,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),
+ this,TQT_SLOT(processStdOut(TDEProcess *,char *,int)));
+ connect(theProcess,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)),
+ this,TQT_SLOT(processStdErr(TDEProcess *,char *,int)));
theProcess->setEnvironment( "LC_ALL", "C" ); // We need the untranslated output of the tool
- return theProcess->start(KProcess::NotifyOnExit,
- KProcess::AllOutput);
+ return theProcess->start(TDEProcess::NotifyOnExit,
+ TDEProcess::AllOutput);
}
@@ -425,7 +425,7 @@ bool FDFormat::configure(bool v)
}
if (theProcess) delete theProcess;
- theProcess = new KProcess;
+ theProcess = new TDEProcess;
formatTrackCount=0;
@@ -464,7 +464,7 @@ bool FDFormat::configure(bool v)
// need, since the messages can be standardized across OSsen.
//
//
-void FDFormat::processStdOut(KProcess *, char *b, int l)
+void FDFormat::processStdOut(TDEProcess *, char *b, int l)
{
DEBUGSETUP;
TQString s;
@@ -586,7 +586,7 @@ DDZeroOut::DDZeroOut(TQObject *p) :
}
delete theProcess;
- theProcess = new KProcess;
+ theProcess = new TDEProcess;
*theProcess << m_ddName ;
@@ -601,7 +601,7 @@ DDZeroOut::DDZeroOut(TQObject *p) :
}
-void DDZeroOut::processDone(KProcess *p)
+void DDZeroOut::processDone(TDEProcess *p)
{
kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl;
@@ -685,7 +685,7 @@ void FATFilesystem::exec()
}
if (theProcess) delete theProcess;
- KProcess *p = theProcess = new KProcess;
+ TDEProcess *p = theProcess = new TDEProcess;
*p << newfs_fat;
#ifdef ANY_BSD
@@ -715,7 +715,7 @@ void FATFilesystem::exec()
}
}
-void FATFilesystem::processStdOut(KProcess *, char *b, int l)
+void FATFilesystem::processStdOut(TDEProcess *, char *b, int l)
{
#ifdef ANY_BSD
// ### TODO: do some checks
@@ -786,7 +786,7 @@ void UFSFilesystem::exec()
}
if (theProcess) delete theProcess;
- KProcess *p = theProcess = new KProcess;
+ TDEProcess *p = theProcess = new TDEProcess;
*p << newfs;
@@ -865,7 +865,7 @@ void Ext2Filesystem::exec()
}
if (theProcess) delete theProcess;
- KProcess *p = theProcess = new KProcess;
+ TDEProcess *p = theProcess = new TDEProcess;
*p << newfs;
*p << "-q";
@@ -881,7 +881,7 @@ void Ext2Filesystem::exec()
}
}
-void Ext2Filesystem::processStdOut(KProcess *, char *b, int l)
+void Ext2Filesystem::processStdOut(TDEProcess *, char *b, int l)
{
#ifdef ANY_BSD
// ### TODO: do some checks
@@ -959,7 +959,7 @@ void MinixFilesystem::exec()
}
if (theProcess) delete theProcess;
- KProcess *p = theProcess = new KProcess;
+ TDEProcess *p = theProcess = new TDEProcess;
*p << newfs;
@@ -975,7 +975,7 @@ void MinixFilesystem::exec()
}
}
-void MinixFilesystem::processStdOut(KProcess *, char *b, int l)
+void MinixFilesystem::processStdOut(TDEProcess *, char *b, int l)
{
TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
diff --git a/kfloppy/format.h b/kfloppy/format.h
index a33ff53..2da577c 100644
--- a/kfloppy/format.h
+++ b/kfloppy/format.h
@@ -167,7 +167,7 @@ typedef struct { const char **devices;
int tracks;
int flags; } fdinfo;
-class KProcess;
+class TDEProcess;
/**
* Concrete action for running a single external program.
@@ -219,11 +219,11 @@ protected slots:
/**
* \brief Provide handling of the exit of the external program
*/
- virtual void processDone(KProcess *);
+ virtual void processDone(TDEProcess *);
/**
* \brief Provide handling of stdout
*/
- virtual void processStdOut(KProcess *, char *, int);
+ virtual void processStdOut(TDEProcess *, char *, int);
/**
* \brief Provide handling stderr.
*
@@ -231,14 +231,14 @@ protected slots:
* to processStdOut(), so you need reimplement only
* FloppyAction::processStdOut if you choose.
*/
- virtual void processStdErr(KProcess *, char *, int);
+ virtual void processStdErr(TDEProcess *, char *, int);
protected:
- KProcess *theProcess;
+ TDEProcess *theProcess;
TQString theProcessName; ///< human-readable
/**
- * Sets up connections, calls KProcess::run().
+ * Sets up connections, calls TDEProcess::run().
* You need to *theProcess << program << args ; first.
*/
@@ -273,7 +273,7 @@ public:
bool configure(bool verify);
- virtual void processStdOut(KProcess *, char *,int);
+ virtual void processStdOut(TDEProcess *, char *,int);
protected:
static TQString fdformatName; ///< path to executable.
@@ -306,7 +306,7 @@ protected:
/**
* \brief Provide handling of the exit of the external program
*/
- virtual void processDone(KProcess *);
+ virtual void processDone(TDEProcess *);
protected:
static TQString m_ddName; ///< path to executable.
} ;
@@ -333,7 +333,7 @@ public:
bool configure(bool verify, bool label, const TQString &l);
/// Parse output
- virtual void processStdOut(KProcess*, char* b, int l);
+ virtual void processStdOut(TDEProcess*, char* b, int l);
protected:
static TQString newfs_fat;
@@ -359,7 +359,7 @@ public:
bool configure(bool verify, bool label, const TQString &l);
/// Parse output
- virtual void processStdOut(KProcess*, char* b, int l);
+ virtual void processStdOut(TDEProcess*, char* b, int l);
protected:
static TQString newfs;
@@ -409,7 +409,7 @@ public:
bool configure(bool verify, bool label, const TQString &l);
/// Parse output
- virtual void processStdOut(KProcess*, char* b, int l);
+ virtual void processStdOut(TDEProcess*, char* b, int l);
protected:
static TQString newfs;
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index 51da7ef..2f2b3be 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -138,17 +138,17 @@ void ZipFormat::quit()
formatStep=0;
if (p) delete p;
- p = new KProcess();
+ p = new TDEProcess();
if (statusTimer) delete statusTimer;
statusTimer = new TQTimer(this);
- connect(p,TQT_SIGNAL(processExited(KProcess *)),
+ connect(p,TQT_SIGNAL(processExited(TDEProcess *)),
this,TQT_SLOT(transition()));
- connect(p,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),
- this,TQT_SLOT(processResult(KProcess *,char *,int)));
- connect(p,TQT_SIGNAL(receivedStderr(KProcess *,char *,int)),
- this,TQT_SLOT(processResult(KProcess *,char *,int)));
+ connect(p,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),
+ this,TQT_SLOT(processResult(TDEProcess *,char *,int)));
+ connect(p,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)),
+ this,TQT_SLOT(processResult(TDEProcess *,char *,int)));
connect(statusTimer,TQT_SIGNAL(timeout()),
this,TQT_SLOT(statusRequest()));
@@ -189,7 +189,7 @@ void ZipFormat::transition()
<< "of=/dev/afd0c"
<< "bs=8192" ;
*p << TQString("count=%1").arg(totalBlocks);
- if (!p->start(KProcess::NotifyOnExit,KProcess::AllOutput))
+ if (!p->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput))
{
emit statusMessage(i18n("Cannot start dd to zero disk."));
emit formatDone(-1);
@@ -222,7 +222,7 @@ void ZipFormat::transition()
*p << "-U" ;
}
*p << "/dev/afd0c" ;
- if (!p->start(KProcess::NotifyOnExit,KProcess::AllOutput))
+ if (!p->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput))
{
emit statusMessage(i18n("Cannot start newfs."));
emit formatDone(-1);
@@ -245,7 +245,7 @@ void ZipFormat::transition()
}
}
-void ZipFormat::processResult(KProcess *, char *b, int l)
+void ZipFormat::processResult(TDEProcess *, char *b, int l)
{
DEBUGSETUP;
diff --git a/kfloppy/zip.h b/kfloppy/zip.h
index 525eb3f..e9a66a3 100644
--- a/kfloppy/zip.h
+++ b/kfloppy/zip.h
@@ -41,7 +41,7 @@
class TQCheckBox;
class TQTimer;
-class KProcess;
+class TDEProcess;
class KConfig;
class ZipFormat : public DiskFormat
@@ -74,7 +74,7 @@ protected:
static TQString newfs,dd;
- KProcess *p; ///< dd or newfs, doing the real work
+ TDEProcess *p; ///< dd or newfs, doing the real work
int formatStep; ///< keeps track of what phase we are in
// Variables for the zeroing phase
@@ -93,7 +93,7 @@ protected slots:
* processResult() reads output
* from either dd or newfs and interprets it.
*/
- void processResult(KProcess *,char *,int);
+ void processResult(TDEProcess *,char *,int);
/**
*statusRequest()
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index 2e75a4d..d3a8b2d 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -90,7 +90,7 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi
void KgpgKeyInfo::slotDisableKey(bool isOn)
{
-KProcess kp;
+TDEProcess kp;
kp<<"gpg"
<<"--no-tty"
@@ -99,7 +99,7 @@ KProcess kp;
if (isOn) kp<<"disable";
else kp<<"enable";
kp<<"save";
- kp.start(KProcess::Block);
+ kp.start(TDEProcess::Block);
loadKey(displayedKeyID);
keyWasChanged=true;
}
@@ -205,13 +205,13 @@ TQString gpgcmd="gpg --no-tty --no-secmem-warning --with-colon --with-fingerprin
TQString fullname=gpgOutput.section(':',9,9);
TQDate date = TQDate::fromString(gpgOutput.section(':',5,5), Qt::ISODate);
- prop->tLCreation->setText(KGlobal::locale()->formatDate(date));
+ prop->tLCreation->setText(TDEGlobal::locale()->formatDate(date));
if (gpgOutput.section(':',6,6).isEmpty()) expirationDate=i18n("Unlimited");
else
{
date = TQDate::fromString(gpgOutput.section(':',6,6), Qt::ISODate);
- expirationDate=KGlobal::locale()->formatDate(date);
+ expirationDate=TDEGlobal::locale()->formatDate(date);
}
prop->tLExpiration->setText(expirationDate);
@@ -297,13 +297,13 @@ void KgpgKeyInfo::reloadMainPhoto(const TQString &uid)
*p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput));
*p<<"--edit-key"<<displayedKeyID<<"uid"<<uid<<"showphoto";
TQObject::connect(p, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(finishphotoreadprocess(KProcIO *)));
- TQObject::connect(p, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotMainImageRead(KProcess *)));
- p->start(KProcess::NotifyOnExit,true);
+ TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotMainImageRead(TDEProcess *)));
+ p->start(TDEProcess::NotifyOnExit,true);
}
-void KgpgKeyInfo::slotMainImageRead(KProcess *p)
+void KgpgKeyInfo::slotMainImageRead(TDEProcess *p)
{
p->deleteLater();
TQPixmap pixmap;
@@ -347,7 +347,7 @@ void KgpgKeyInfo::openPhoto()
//KMessageBox::sorry(0,ptr->desktopEntryName());
KProcIO *p=new KProcIO();
*p<<"gpg"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i"))<<"--list-keys"<<displayedKeyID;
- p->start(KProcess::DontCare,true);
+ p->start(TDEProcess::DontCare,true);
}
void KgpgKeyInfo::slotChangeExp()
@@ -363,7 +363,7 @@ kb->setChecked(true);
kdt->setEnabled(false);
}
else
-kdt= new KDatePicker(page,KGlobal::locale()->readDate(prop->tLExpiration->text()));
+kdt= new KDatePicker(page,TDEGlobal::locale()->readDate(prop->tLExpiration->text()));
TQVBoxLayout *vbox=new TQVBoxLayout(page,3);
vbox->addWidget(kdt);
vbox->addWidget(kb);
@@ -405,7 +405,7 @@ chdate->enableButtonOK(kdt->date()>=TQDate::currentDate ());
}
}
-void KgpgKeyInfo::slotinfoimgread(KProcess *)
+void KgpgKeyInfo::slotinfoimgread(TDEProcess *)
{
TQPixmap pixmap;
pixmap.load(kgpginfotmp->name());
@@ -430,14 +430,14 @@ void KgpgKeyInfo::slotChangeTrust(int newTrust)
void KgpgKeyInfo::slotInfoPasswordChanged()
{
-KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
+KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
}
void KgpgKeyInfo::slotInfoTrustChanged()
{
keyWasChanged=true;
loadKey(displayedKeyID);
-//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this,0,600);
+//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this,0,600);
}
void KgpgKeyInfo::slotInfoExpirationChanged(int res)
@@ -447,11 +447,11 @@ if (res==3)
{
keyWasChanged=true;
if (kb->isChecked()) prop->tLExpiration->setText(i18n("Unlimited"));
-else prop->tLExpiration->setText(KGlobal::locale()->formatDate(kdt->date()));
+else prop->tLExpiration->setText(TDEGlobal::locale()->formatDate(kdt->date()));
}
if (res==2) {
infoMessage=i18n("Could not change expiration");infoText=i18n("Bad passphrase");
-KPassivePopup::message(infoMessage,infoText,KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
+KPassivePopup::message(infoMessage,infoText,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
}
}
diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h
index 2560e96..6d00d3b 100644
--- a/kgpg/keyinfowidget.h
+++ b/kgpg/keyinfowidget.h
@@ -27,7 +27,7 @@ class KDialogBase;
class TQCheckBox;
class KDatePicker;
class KeyProperties;
-class KProcess;
+class TDEProcess;
class KProcIO;
class KgpgKeyInfo : public KDialogBase
@@ -42,7 +42,7 @@ public:
KeyProperties *prop;
private slots:
- void slotinfoimgread(KProcess *);
+ void slotinfoimgread(TDEProcess *);
void slotChangePass();
void slotPreOk();
void slotChangeExp();
@@ -52,7 +52,7 @@ private slots:
void openPhoto();
void slotSetPhoto(const TQPixmap &pix);
void finishphotoreadprocess(KProcIO *p);
- void slotMainImageRead(KProcess *);
+ void slotMainImageRead(TDEProcess *);
void slotSetMainPhoto(TQStringList list);
void reloadMainPhoto(const TQString &uid);
void slotInfoPasswordChanged();
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index 00c655a..b0a673d 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -85,7 +85,7 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos
KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale());
*encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *)));
- encid->start(KProcess::NotifyOnExit,true);
+ encid->start(TDEProcess::NotifyOnExit,true);
page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty());
page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty());
setMinimumSize(sizeHint());
@@ -119,7 +119,7 @@ void keyServer::slotprocread(KProcIO *p)
///////////////////////////////////////////////////////////////// extract encryption keys
bool dead;
TQString tst;
- //TQPixmap pixkeySingle(KGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20));
+ //TQPixmap pixkeySingle(TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20));
while (p->readln(tst)!=-1) {
//tst=tst.stripWhiteSpace();
if (tst.startsWith("pub")) {
@@ -196,9 +196,9 @@ void keyServer::slotSearch()
*searchproc<<"--keyserver"<<keyserv<<"--command-fd=0"<<"--status-fd=2"<<"--search-keys"<<page->kLEimportid->text().stripWhiteSpace();
keyNumbers=0;
- TQObject::connect(searchproc, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotsearchresult(KProcess *)));
+ TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotsearchresult(TDEProcess *)));
TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *)));
- searchproc->start(KProcess::NotifyOnExit,true);
+ searchproc->start(TDEProcess::NotifyOnExit,true);
TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
dialogServer->setMainWidget(listpop);
listpop->setMinimumSize(listpop->sizeHint());
@@ -255,7 +255,7 @@ void keyServer::transferKeyID()
listpop->kLEID->setText(keysToSearch.stripWhiteSpace());
}
-void keyServer::slotsearchresult(KProcess *)
+void keyServer::slotsearchresult(TDEProcess *)
{
TQString nb;
dialogServer->enableButtonOK(true);
@@ -364,9 +364,9 @@ void keyServer::slotExport(TQStringList keyIds)
*exportproc<< "--keyserver-options"<<"no-honor-http-proxy";
*exportproc << "--status-fd=2" << "--keyserver" << keyserv << "--send-keys" << keyIds;
- TQObject::connect(exportproc, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotexportresult(KProcess *)));
+ TQObject::connect(exportproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotexportresult(TDEProcess *)));
TQObject::connect(exportproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *)));
- exportproc->start(KProcess::NotifyOnExit,true);
+ exportproc->start(TDEProcess::NotifyOnExit,true);
TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
importpop = new TQDialog( this,0,true,TQt::WDestructiveClose);
TQVBoxLayout *vbox=new TQVBoxLayout(importpop,3);
@@ -392,7 +392,7 @@ void keyServer::abortExport()
}
}
-void keyServer::slotexportresult(KProcess*)
+void keyServer::slotexportresult(TDEProcess*)
{
TQApplication::restoreOverrideCursor();
KMessageBox::information(0,readmessage);
@@ -431,9 +431,9 @@ void keyServer::slotImport()
*importproc<<TQString(TQFile::encodeName(fkeyNames));
}
- TQObject::connect(importproc, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotimportresult(KProcess *)));
+ TQObject::connect(importproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotimportresult(TDEProcess *)));
TQObject::connect(importproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *)));
- importproc->start(KProcess::NotifyOnExit,true);
+ importproc->start(TDEProcess::NotifyOnExit,true);
importproc->closeWhenDone();
TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
importpop = new TQDialog( this,0,true,TQt::WDestructiveClose);
@@ -462,7 +462,7 @@ void keyServer::abortImport()
if (autoCloseWindow) close();
}
-void keyServer::slotimportresult(KProcess*)
+void keyServer::slotimportresult(TDEProcess*)
{
TQApplication::restoreOverrideCursor();
TQString importedNb,importedNbSucess,importedNbProcess,resultMessage, parsedOutput,importedNbUnchanged,importedNbSig;
diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h
index de33f35..2387b2a 100644
--- a/kgpg/keyservers.h
+++ b/kgpg/keyservers.h
@@ -24,7 +24,7 @@
class KListViewItem;
class KSimpleConfig;
class KProcIO;
-class KProcess;
+class TDEProcess;
class searchRes;
@@ -47,14 +47,14 @@ public slots:
void syncCombobox();
void slotImport();
void slotSearch();
- void slotimportresult(KProcess*);
- void slotexportresult(KProcess*);
+ void slotimportresult(TDEProcess*);
+ void slotexportresult(TDEProcess*);
void slotimportread(KProcIO *p);
void slotprocread(KProcIO *p);
void slotPreExport();
void slotExport(TQStringList keyIds);
void preimport();
- void slotsearchresult(KProcess *);
+ void slotsearchresult(TDEProcess *);
void slotEnableProxyI(bool on);
void slotEnableProxyE(bool on);
void handleQuit();
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 016988d..6cfba30 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -206,7 +206,7 @@ if (encryptedFolder.exists()) {
}
pop = new KPassivePopup();
- pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+ pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
pop->setAutoDelete(false);
pop->show();
kapp->processEvents();
@@ -592,7 +592,7 @@ void MyView::firstRun()
{
KProcIO *p=new KProcIO();
*p<<"gpg"<<"--no-tty"<<"--list-secret-keys";
- p->start(KProcess::Block); //// start gnupg so that it will create a config file
+ p->start(TDEProcess::Block); //// start gnupg so that it will create a config file
startWizard();
}
@@ -642,7 +642,7 @@ void MyView::startWizard()
wiz->kURLRequester1->setURL(confPath);
/*
- wiz->kURLRequester2->setURL(KGlobalSettings::desktopPath());
+ wiz->kURLRequester2->setURL(TDEGlobalSettings::desktopPath());
wiz->kURLRequester2->setMode(2);*/
FILE *fp,*fp2;
@@ -715,7 +715,7 @@ void MyView::slotWizardChange()
void MyView::installShred()
{
KURL path;
- path.setPath(KGlobalSettings::desktopPath());
+ path.setPath(TDEGlobalSettings::desktopPath());
path.addPath("shredder.desktop");
KDesktopFile configl2(path.path(), false);
if (configl2.isImmutable() ==false) {
@@ -865,7 +865,7 @@ KgpgAppletApp::~KgpgAppletApp()
void KgpgAppletApp::slotHandleQuit()
{
-s_keyManager->keysList2->saveLayout(KGlobal::config(),"KeyView");
+s_keyManager->keysList2->saveLayout(TDEGlobal::config(),"KeyView");
KGpgSettings::setPhotoProperties(s_keyManager->photoProps->currentItem());
KGpgSettings::setShowTrust(s_keyManager->sTrust->isChecked());
KGpgSettings::setShowExpi(s_keyManager->sExpi->isChecked());
@@ -1009,7 +1009,7 @@ int KgpgAppletApp::newInstance()
void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric)
{
if (kapp->clipboard()->text(clipboardMode).isEmpty()) {
- KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
+ KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
return;
}
if (KGpgSettings::pgpCompatibility())
@@ -1033,7 +1033,7 @@ if (newtxt.length()>300)
newtxt.replace(TQRegExp("\n"),"<br>");
pop = new KPassivePopup( this);
- pop->setView(i18n("Encrypted following text:"),newtxt,KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+ pop->setView(i18n("Encrypted following text:"),newtxt,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
pop->setTimeout(3200);
pop->show();
TQRect qRect(TQApplication::desktop()->screenGeometry());
diff --git a/kgpg/kgpg.kcfg b/kgpg/kgpg.kcfg
index a7ade9f..6ee2417 100644
--- a/kgpg/kgpg.kcfg
+++ b/kgpg/kgpg.kcfg
@@ -193,7 +193,7 @@
<group name="Text Font">
<entry name="Font" type="Font" key="KEditFont">
<label>Font</label>
- <default code="true">KGlobalSettings::fixedFont()</default>
+ <default code="true">TDEGlobalSettings::fixedFont()</default>
</entry>
</group>
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 59acd4e..153cb75 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -300,7 +300,7 @@ void KgpgApp::slotFileOpen()
bool KgpgApp::checkEncoding(TQTextCodec *codec)
{
- ///////////// KGlobal::locale()->encoding()->name()
+ ///////////// TDEGlobal::locale()->encoding()->name()
return codec->canEncode(view->editor->text());
}
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 7e9dc56..0655b38 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -111,9 +111,9 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de
*proc<<TQString(TQFile::encodeName(srcUrl.path()));
///////// when process ends, update dialog infos
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(encryptfin(KProcess *)));
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(encryptfin(TDEProcess *)));
TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readencprocess(KProcIO *)));
- proc->start(KProcess::NotifyOnExit,true);
+ proc->start(TDEProcess::NotifyOnExit,true);
}
@@ -121,7 +121,7 @@ KgpgInterface::~KgpgInterface()
{}
-void KgpgInterface::encryptfin(KProcess *)
+void KgpgInterface::encryptfin(TDEProcess *)
{
if (message.find("END_ENCRYPTION")!=-1)
emit encryptionfinished(sourceFile);
@@ -180,12 +180,12 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option
*proc<<"-d"<<TQString(TQFile::encodeName(srcUrl.path()));
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(decryptfin(KProcess *)));
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(decryptfin(TDEProcess *)));
TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readdecprocess(KProcIO *)));
- proc->start(KProcess::NotifyOnExit,true);
+ proc->start(TDEProcess::NotifyOnExit,true);
}
-void KgpgInterface::decryptfin(KProcess *)
+void KgpgInterface::decryptfin(TDEProcess *)
{
if ((message.find("DECRYPTION_OKAY")!=-1) && (message.find("END_DECRYPTION")!=-1)) //&& (message.find("GOODMDC")!=-1)
emit decryptionfinished();
@@ -248,7 +248,7 @@ void KgpgInterface::readdecprocess(KProcIO *p)
void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQStringList Options)
{
message=TQString();
- //TQTextCodec *codec = KGlobal::charsets()->codecForName(KGlobal::locale()->encoding());
+ //TQTextCodec *codec = TDEGlobal::charsets()->codecForName(TDEGlobal::locale()->encoding());
TQTextCodec *codec =TQTextCodec::codecForLocale ();
if (codec->canEncode(text)) txtToEncrypt=text;
else txtToEncrypt=text.utf8();
@@ -270,14 +270,14 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString
///////// when process ends, update dialog infos
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(txtencryptfin(KProcess *)));
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtencryptfin(TDEProcess *)));
TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtreadencprocess(KProcIO *)));
- proc->start(KProcess::NotifyOnExit,false);
+ proc->start(TDEProcess::NotifyOnExit,false);
emit txtencryptionstarted();
}
-void KgpgInterface::txtencryptfin(KProcess *)
+void KgpgInterface::txtencryptfin(TDEProcess *)
{
if (!message.isEmpty())
emit txtencryptionfinished(message);
@@ -328,7 +328,7 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options)
decfinished=false;
decok=false;
badmdc=false;
- KProcess *proc=new KProcess();
+ TDEProcess *proc=new TDEProcess();
*proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--command-fd=0"<<"--status-fd=2"<<"--no-batch"<<"--utf8-strings";
for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it )
if (!TQFile::encodeName(*it).isEmpty()) *proc<< TQString(TQFile::encodeName(*it));
@@ -336,14 +336,14 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options)
///////// when process ends, update dialog infos
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(txtdecryptfin(KProcess *)));
- connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(getOutput(KProcess *, char *, int)));
- connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(KProcess *, char *, int)));
- proc->start(KProcess::NotifyOnExit,KProcess::All);
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *)));
+ connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int)));
+ connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int)));
+ proc->start(TDEProcess::NotifyOnExit,TDEProcess::All);
proc->writeStdin(text.utf8(), text.length());
}
-void KgpgInterface::txtdecryptfin(KProcess *)
+void KgpgInterface::txtdecryptfin(TDEProcess *)
{
if ((decok) && (!badmdc))
emit txtdecryptionfinished(message);
@@ -358,13 +358,13 @@ emit txtdecryptionfailed(log);
}
-void KgpgInterface::getOutput(KProcess *, char *data, int )
+void KgpgInterface::getOutput(TDEProcess *, char *data, int )
{
message.append(TQString::fromUtf8(data));
}
-void KgpgInterface::getCmdOutput(KProcess *p, char *data, int )
+void KgpgInterface::getCmdOutput(TDEProcess *p, char *data, int )
{
gpgOutput.append(TQString::fromUtf8(data));
log.append(data);
@@ -450,12 +450,12 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op
///////// when process ends, update dialog infos
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(txtsignfin(KProcess *)));
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtsignfin(TDEProcess *)));
TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtsignprocess(KProcIO *)));
//emit txtsigningstarted();
- proc->start(KProcess::NotifyOnExit,false);
+ proc->start(TDEProcess::NotifyOnExit,false);
/*if (useAgent)
{
kdDebug(2100)<<"Using Agent+++++++++++++"<<endl;
@@ -468,7 +468,7 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op
}
-void KgpgInterface::txtsignfin(KProcess *)
+void KgpgInterface::txtsignfin(TDEProcess *)
{
if (!message.isEmpty())
emit txtSignOver(message);
@@ -530,7 +530,7 @@ decfinished=false;
decok=false;
badmdc=false;
- KProcess *proc=new KProcess();
+ TDEProcess *proc=new TDEProcess();
*proc<<"gpg"<<"--no-tty"<<"--utf8-strings"<<"--no-secmem-warning"<<"--command-fd=0"<<"--status-fd=2"<<"--no-batch"<<"-o"<<"-";
for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) {
if (!TQFile::encodeName(*it).isEmpty()) *proc<< TQString(TQFile::encodeName(*it));
@@ -539,10 +539,10 @@ badmdc=false;
///////// when process ends, update dialog infos
- connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(txtdecryptfin(KProcess *)));
- connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(getOutput(KProcess *, char *, int)));
- connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(KProcess *, char *, int)));
- proc->start(KProcess::NotifyOnExit,KProcess::All);
+ connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *)));
+ connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int)));
+ connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int)));
+ proc->start(TDEProcess::NotifyOnExit,TDEProcess::All);
}
@@ -559,15 +559,15 @@ void KgpgInterface::KgpgVerifyText(TQString text)
message=TQString();
KProcIO *verifyproc=new KProcIO(TQTextCodec::codecForLocale());
*verifyproc<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"<<"--verify";
- connect(verifyproc, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotverifyresult(KProcess *)));
+ connect(verifyproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotverifyresult(TDEProcess *)));
connect(verifyproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotverifyread(KProcIO *)));
- verifyproc->start(KProcess::NotifyOnExit,true);
+ verifyproc->start(TDEProcess::NotifyOnExit,true);
verifyproc->writeStdin (text);
verifyproc->closeWhenDone();
}
-void KgpgInterface::slotverifyresult(KProcess*)
+void KgpgInterface::slotverifyresult(TDEProcess*)
{
if (signmiss) emit missingSignature(signID);
else {
@@ -705,14 +705,14 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options
*proc<<"--output"<<TQString(TQFile::encodeName(srcUrl.path()+".sig"));
*proc<<"--detach-sig"<<TQString(TQFile::encodeName(srcUrl.path()));
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(signfin(KProcess *)));
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(signfin(TDEProcess *)));
TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readsignprocess(KProcIO *)));
- proc->start(KProcess::NotifyOnExit,true);
+ proc->start(TDEProcess::NotifyOnExit,true);
}
-void KgpgInterface::signfin(KProcess *)
+void KgpgInterface::signfin(TDEProcess *)
{
if (message.find("SIG_CREATED")!=-1)
KMessageBox::information(0,i18n("The signature file %1 was successfully created.").arg(file.fileName()));
@@ -778,9 +778,9 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl)
*proc<<TQString(TQFile::encodeName(srcUrl.path()));
*proc<<TQString(TQFile::encodeName(sigUrl.path()));
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),this,TQT_SLOT(verifyfin(KProcess *)));
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(verifyfin(TDEProcess *)));
TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readprocess(KProcIO *)));
- proc->start(KProcess::NotifyOnExit,true);
+ proc->start(TDEProcess::NotifyOnExit,true);
}
@@ -819,7 +819,7 @@ TQString required;
}
-void KgpgInterface::verifyfin(KProcess *)
+void KgpgInterface::verifyfin(TDEProcess *)
{
if (!signmiss) {
if (signID.isEmpty()) signID=i18n("No signature found.");
@@ -860,8 +860,8 @@ void KgpgInterface::KgpgSignKey(TQString keyID,TQString signKeyID,TQString signK
if (local) *conprocess<<"lsign";
else *conprocess<<"sign";
TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(sigprocess(KProcIO *)));
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(signover(KProcess *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(signover(TDEProcess *)));
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
void KgpgInterface::sigprocess(KProcIO *p)
@@ -941,7 +941,7 @@ void KgpgInterface::sigprocess(KProcIO *p)
}
-void KgpgInterface::signover(KProcess *)
+void KgpgInterface::signover(TDEProcess *)
{
if (signSuccess>1)
emit signatureFinished(signSuccess); //// signature successful or bad passphrase
@@ -957,8 +957,8 @@ void KgpgInterface::signover(KProcess *)
void KgpgInterface::openSignConsole()
{
- KProcess conprocess;
- KConfig *config = KGlobal::config();
+ TDEProcess conprocess;
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
conprocess<< config->readPathEntry("TerminalApplication","konsole");
conprocess<<"-e"<<"gpg";
@@ -967,7 +967,7 @@ void KgpgInterface::openSignConsole()
conprocess<<"--sign-key"<<konsKeyID;
else
conprocess<<"--lsign-key"<<konsKeyID;
- conprocess.start(KProcess::Block);
+ conprocess.start(TDEProcess::Block);
emit signatureFinished(3);
}
@@ -1008,8 +1008,8 @@ void KgpgInterface::KgpgDelSignature(TQString keyID,TQString signKeyID)
*conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--utf8-strings"<<"--command-fd=0"<<"--status-fd=2";
*conprocess<<"--edit-key"<<keyID<<"uid 1"<<"delsig";
TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(delsigprocess(KProcIO *)));
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(delsignover(KProcess *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delsignover(TDEProcess *)));
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
@@ -1042,7 +1042,7 @@ void KgpgInterface::delsigprocess(KProcIO *p)
}
}
-void KgpgInterface::delsignover(KProcess *)
+void KgpgInterface::delsignover(TDEProcess *)
{
emit delsigfinished(deleteSuccess);
}
@@ -1085,8 +1085,8 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited)
*conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings";
*conprocess<<"--edit-key"<<keyID<<"expire";
TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(expprocess(KProcIO *)));
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(expover(KProcess *)));
- conprocess->start(KProcess::NotifyOnExit,KProcess::AllOutput);
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(expover(TDEProcess *)));
+ conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
}
@@ -1150,7 +1150,7 @@ void KgpgInterface::expprocess(KProcIO *p)
-void KgpgInterface::expover(KProcess *)
+void KgpgInterface::expover(TDEProcess *)
{
if ((expSuccess==3) || (expSuccess==2))
emit expirationFinished(expSuccess); //// signature successful or bad passphrase
@@ -1179,8 +1179,8 @@ void KgpgInterface::KgpgTrustExpire(TQString keyID,int keyTrust)
*conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings";
*conprocess<<"--edit-key"<<keyID<<"trust";
TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(trustprocess(KProcIO *)));
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(trustover(KProcess *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(trustover(TDEProcess *)));
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
@@ -1217,7 +1217,7 @@ void KgpgInterface::trustprocess(KProcIO *p)
-void KgpgInterface::trustover(KProcess *)
+void KgpgInterface::trustover(TDEProcess *)
{
emit trustfinished();
}
@@ -1235,8 +1235,8 @@ void KgpgInterface::KgpgChangePass(TQString keyID)
*conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--no-use-agent"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings";
*conprocess<<"--edit-key"<<keyID<<"passwd";
TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(passprocess(KProcIO *)));
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(passover(KProcess *)));
- conprocess->start(KProcess::NotifyOnExit,KProcess::AllOutput);
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(passover(TDEProcess *)));
+ conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
}
@@ -1318,7 +1318,7 @@ void KgpgInterface::passprocess(KProcIO *p)
-void KgpgInterface::passover(KProcess *)
+void KgpgInterface::passover(TDEProcess *)
{
//emit trustfinished();
}
@@ -1339,7 +1339,7 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes)
for ( TQStringList::Iterator it = IDs.begin(); it != IDs.end(); ++it )
*proc << *it;
TQObject::connect(proc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotReadKey(KProcIO *)));
- proc->start(KProcess::Block,false);
+ proc->start(TDEProcess::Block,false);
return keyString;
}
@@ -1364,9 +1364,9 @@ void KgpgInterface::importKeyURL(KURL url)
*conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import";
*conprocess<<"--allow-secret-key-import";
*conprocess<<tempKeyFile;
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(importURLover(KProcess *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importURLover(TDEProcess *)));
TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
}
@@ -1377,14 +1377,14 @@ void KgpgInterface::importKey(TQString keystr)
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--import";
*conprocess<<"--allow-secret-key-import";
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(importover(KProcess *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importover(TDEProcess *)));
TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ conprocess->start(TDEProcess::NotifyOnExit,true);
conprocess->writeStdin(keystr, true);
conprocess->closeWhenDone();
}
-void KgpgInterface::importover(KProcess *)
+void KgpgInterface::importover(TDEProcess *)
{
TQStringList importedKeysIds;
TQStringList messageList;
@@ -1448,7 +1448,7 @@ kdDebug(2100)<<"Importing is over"<<endl;
(void) new KDetailedInfo(0,"import_result",resultMessage,message,importedKeys);
}
-void KgpgInterface::importURLover(KProcess *p)
+void KgpgInterface::importURLover(TDEProcess *p)
{
KIO::NetAccess::removeTempFile(tempKeyFile);
importover(p);
@@ -1480,12 +1480,12 @@ addSuccess=true;
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings";
*conprocess<<"--edit-key"<<keyID<<"adduid";
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(adduidover(KProcess *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(adduidover(TDEProcess *)));
TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(adduidprocess(KProcIO *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
-void KgpgInterface::adduidover(KProcess *)
+void KgpgInterface::adduidover(TDEProcess *)
{
if (addSuccess) emit addUidFinished();
else emit addUidError(output);
@@ -1564,9 +1564,9 @@ userIDs=keyID;
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0";
*conprocess<<"--with-colon"<<"--list-keys"<<keyID;
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(photoreadover(KProcess *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(photoreadover(TDEProcess *)));
TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(photoreadprocess(KProcIO *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
void KgpgInterface::photoreadprocess(KProcIO *p)
@@ -1579,7 +1579,7 @@ void KgpgInterface::photoreadprocess(KProcIO *p)
}
-void KgpgInterface::photoreadover(KProcess *)
+void KgpgInterface::photoreadover(TDEProcess *)
{
for (int i=1;i<photoCount+1;i++)
if (isPhotoId(i)) photoList+=TQString::number(i);
@@ -1596,7 +1596,7 @@ KTempFile *kgpginfotmp=new KTempFile();
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings";
*conprocess<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput))<<"--edit-key"<<userIDs<<"uid"<<TQString::number(uid)<<"showphoto";
- conprocess->start(KProcess::Block);
+ conprocess->start(TDEProcess::Block);
if (kgpginfotmp->file()->size()>0)
{
kgpginfotmp->unlink();
@@ -1613,12 +1613,12 @@ void KgpgInterface::KgpgDeletePhoto(TQString keyID,TQString uid)
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings";
*conprocess<<"--edit-key"<<keyID<<"uid"<<uid<<"deluid";
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(delphotoover(KProcess *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delphotoover(TDEProcess *)));
TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(delphotoprocess(KProcIO *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
-void KgpgInterface::delphotoover(KProcess *)
+void KgpgInterface::delphotoover(TDEProcess *)
{
if (delSuccess) emit delPhotoFinished();
else emit delPhotoError(output);
@@ -1676,12 +1676,12 @@ addSuccess=true;
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings";
*conprocess<<"--edit-key"<<keyID<<"addphoto";
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(addphotoover(KProcess *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(addphotoover(TDEProcess *)));
TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(addphotoprocess(KProcIO *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
-void KgpgInterface::addphotoover(KProcess *)
+void KgpgInterface::addphotoover(TDEProcess *)
{
if (addSuccess) emit addPhotoFinished();
else emit addPhotoError(output);
@@ -1757,12 +1757,12 @@ void KgpgInterface::KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,T
if (!revokeUrl.isEmpty())
*conprocess<<"-o"<<revokeUrl;
*conprocess<<"--gen-revoke"<<keyID;
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(revokeover(KProcess *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(revokeover(TDEProcess *)));
TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(revokeprocess(KProcIO *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
-void KgpgInterface::revokeover(KProcess *)
+void KgpgInterface::revokeover(TDEProcess *)
{
if (!revokeSuccess)
KMessageBox::detailedSorry(0,i18n("Creation of the revocation certificate failed..."),output);
diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h
index da0d0f1..2433c72 100644
--- a/kgpg/kgpginterface.h
+++ b/kgpg/kgpginterface.h
@@ -26,7 +26,7 @@
class TQLabel;
class KProcIO;
-class KProcess;
+class TDEProcess;
class KLed;
/**
@@ -84,7 +84,7 @@ public slots:
void KgpgVerifyText(TQString text);
void slotverifyread(KProcIO *p);
- void slotverifyresult(KProcess*);
+ void slotverifyresult(TDEProcess*);
/**Import key function
@@ -124,15 +124,15 @@ public slots:
*/
//static TQString KgpgDecryptText(TQString text,TQString userID);
void KgpgDecryptText(TQString text,TQStringList Options=TQString());
- void txtdecryptfin(KProcess *);
+ void txtdecryptfin(TDEProcess *);
/**Extract list of photographic user id's
* @param keyID the recipients key id's.
*/
void KgpgGetPhotoList(TQString keyID);
- void getOutput(KProcess *, char *data, int );
- void getCmdOutput(KProcess *p, char *data, int );
+ void getOutput(TDEProcess *, char *data, int );
+ void getCmdOutput(TDEProcess *p, char *data, int );
TQString getKey(TQStringList IDs, bool attributes);
@@ -141,7 +141,7 @@ public slots:
void KgpgChangePass(TQString keyID);
void KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,TQString description);
- void revokeover(KProcess *);
+ void revokeover(TDEProcess *);
void revokeprocess(KProcIO *p);
void KgpgDeletePhoto(TQString keyID,TQString uid);
void KgpgAddPhoto(TQString keyID,TQString imagePath);
@@ -173,7 +173,7 @@ private slots:
/**
* Checks output of the signature process
*/
- void signover(KProcess *);
+ void signover(TDEProcess *);
/**
* Read output of the signature process
*/
@@ -182,17 +182,17 @@ private slots:
/**
* Checks if the encrypted file was saved.
*/
- void encryptfin(KProcess *);
+ void encryptfin(TDEProcess *);
/**
* Checks if the decrypted file was saved.
*/
- void decryptfin(KProcess *);
+ void decryptfin(TDEProcess *);
/**
* Checks if the signing was successful.
*/
- void signfin(KProcess *p);
+ void signfin(TDEProcess *p);
/**
* Checks the number of uid's for a key-> if greater than one, key signature will switch to konsole mode
@@ -206,12 +206,12 @@ private slots:
/**
* Checks output of the delete signature process
*/
- void delsignover(KProcess *p);
+ void delsignover(TDEProcess *p);
/**
* Checks output of the import process
*/
- void importURLover(KProcess *p);
- void importover(KProcess *);
+ void importURLover(TDEProcess *p);
+ void importover(TDEProcess *);
/**
* Read output of the import process
*/
@@ -235,37 +235,37 @@ private slots:
/**
* Checks output of the verify process
*/
- void verifyfin(KProcess *p);
+ void verifyfin(TDEProcess *p);
void expprocess(KProcIO *p);
- void expover(KProcess*);
+ void expover(TDEProcess*);
void trustprocess(KProcIO *p);
void passprocess(KProcIO *p);
- void trustover(KProcess *);
- void passover(KProcess *);
+ void trustover(TDEProcess *);
+ void passover(TDEProcess *);
void txtreadencprocess(KProcIO *p);
- void txtencryptfin(KProcess *);
+ void txtencryptfin(TDEProcess *);
- void delphotoover(KProcess *);
+ void delphotoover(TDEProcess *);
void delphotoprocess(KProcIO *p);
- void addphotoover(KProcess *);
+ void addphotoover(TDEProcess *);
void addphotoprocess(KProcIO *p);
- void adduidover(KProcess *);
+ void adduidover(TDEProcess *);
void adduidprocess(KProcIO *p);
void slotReadKey(KProcIO *p);
- void photoreadover(KProcess *);
+ void photoreadover(TDEProcess *);
void photoreadprocess(KProcIO *p);
bool isPhotoId(int uid);
void updateIDs(TQString txtString);
void txtsignprocess(KProcIO *p);
- void txtsignfin(KProcess *);
+ void txtsignfin(TDEProcess *);
- //void txtdecryptfin(KProcess *);
+ //void txtdecryptfin(TDEProcess *);
signals:
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index 418c53e..0f3e66a 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -122,7 +122,7 @@ void KgpgLibrary::processpopup2(TQString fileName)
{
//pop->setTimeout(0);
- pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+ pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
pop->show();
/*TQRect qRect(TQApplication::desktop()->screenGeometry());
int iXpos=qRect.width()/2-pop->width()/2;
@@ -154,7 +154,7 @@ void KgpgLibrary::slotShredResult( KIO::Job * job )
{
job->showErrorDialog( (TQWidget*)parent() );
emit systemMessage(TQString(),true);
- KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),panel,"kgpg_error",0);
+ KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),panel,"kgpg_error",0);
}
}
@@ -194,7 +194,7 @@ void KgpgLibrary::processpopup(TQString fileName)
{
emit systemMessage(i18n("Decrypting %1").arg(fileName));
pop->setTimeout(0);
- pop->setView(i18n("Processing decryption"),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+ pop->setView(i18n("Processing decryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
pop->show();
TQRect qRect(TQApplication::desktop()->screenGeometry());
int iXpos=qRect.width()/2-pop->width()/2;
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 211fb77..85a0e75 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -96,8 +96,8 @@ kdDebug(2100)<<"Adding pages"<<endl;
page7->shredInfo->setText(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>"));
page7->groupShred->adjustSize();
- pixkeySingle=KGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20);
- pixkeyDouble=KGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20);
+ pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20);
+ pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20);
addPage(page1, i18n("Encryption"), "encrypted");
addPage(page2, i18n("Decryption"), "decrypted");
addPage(page3, i18n("Appearance"), "looknfeel");
@@ -197,7 +197,7 @@ if (!gpgHome.endsWith("/")) gpgHome.append("/");
{
KProcIO *p=new KProcIO();
*p<<"gpg"<<"--homedir"<<gpgHome<<"--no-tty"<<"--list-secret-keys";
- p->start(KProcess::Block); //// start gnupg so that it will create a config file
+ p->start(TDEProcess::Block); //// start gnupg so that it will create a config file
confPath="gpg.conf";
TQFile confFile(gpgHome+confPath);
if (!confFile.open(IO_WriteOnly))
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index f09d6ac..c761552 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -167,8 +167,8 @@ int UpdateViewItem :: compare( TQListViewItem * item, int c, bool ascending ) c
{
int rc = 0;
if ((c==3) || (c==5)) {
- TQDate d = KGlobal::locale()->readDate(text(c));
- TQDate itemDate = KGlobal::locale()->readDate(item->text(c));
+ TQDate d = TDEGlobal::locale()->readDate(text(c));
+ TQDate itemDate = TDEGlobal::locale()->readDate(item->text(c));
bool itemDateValid = itemDate.isValid();
if (d.isValid()) {
if (itemDateValid) {
@@ -219,7 +219,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
TQString keyname;
page = new TQWidget(this);
TQLabel *labeltxt;
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
setMinimumSize(350,100);
@@ -395,7 +395,7 @@ TQString KgpgSelKey::getkeyMail()
KeyView::KeyView( TQWidget *parent, const char *name )
: KListView( parent, name )
{
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
pixkeyOrphan=loader->loadIcon("kgpg_key4",KIcon::Small,20);
pixkeyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
@@ -680,7 +680,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
newContact->setEnabled(false);
setCentralWidget(keysList2);
- keysList2->restoreLayout(KGlobal::config(), "KeyView");
+ keysList2->restoreLayout(TDEGlobal::config(), "KeyView");
TQObject::connect(keysList2,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(listsigns()));
TQObject::connect(keysList2,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),TQT_TQOBJECT(this),TQT_SLOT(listsigns()));
@@ -889,13 +889,13 @@ void listKeys::slotDelUid()
while (item->depth()>0)
item=item->parent();
- KProcess *conprocess=new KProcess();
- KConfig *config = KGlobal::config();
+ TDEProcess *conprocess=new TDEProcess();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
*conprocess<< config->readPathEntry("TerminalApplication","konsole");
*conprocess<<"-e"<<"gpg";
*conprocess<<"--edit-key"<<item->text(6)<<"uid";
- conprocess->start(KProcess::Block);
+ conprocess->start(TDEProcess::Block);
keysList2->refreshselfkey();
}
@@ -1475,7 +1475,7 @@ void listKeys::slotexportsec()
KProcIO *p=new KProcIO(TQTextCodec::codecForLocale());
*p<<"gpg"<<"--no-tty"<<"--output"<<TQString(TQFile::encodeName(url.path()))<<"--armor"<<"--export-secret-keys"<<keysList2->currentItem()->text(6);
- p->start(KProcess::Block);
+ p->start(TDEProcess::Block);
if (fgpg.exists())
KMessageBox::information(this,i18n("Your PRIVATE key \"%1\" was successfully exported.\nDO NOT leave it in an insecure place.").arg(url.path()));
@@ -1551,7 +1551,7 @@ void listKeys::slotexport()
*p<<(exportList.at(i)->text(6)).stripWhiteSpace();
- p->start(KProcess::Block);
+ p->start(TDEProcess::Block);
if (fgpg.exists())
KMessageBox::information(this,i18n("Your public key \"%1\" was successfully exported\n").arg(expname));
else
@@ -1611,7 +1611,7 @@ void listKeys::slotShowPhoto()
//KMessageBox::sorry(0,ptr->desktopEntryName());
KProcIO *p=new KProcIO(TQTextCodec::codecForLocale());
*p<<"gpg"<<"--no-tty"<<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i"))<<"--edit-key"<<keysList2->currentItem()->parent()->text(6)<<"uid"<<keysList2->currentItem()->text(6)<<"showphoto"<<"quit";
- p->start(KProcess::DontCare,true);
+ p->start(TDEProcess::DontCare,true);
}
void listKeys::listsigns()
@@ -1778,8 +1778,8 @@ void listKeys::editGroup()
KDialogBase *dialogGroupEdit=new KDialogBase(KDialogBase::Swallow, i18n("Group Properties"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true);
gEdit=new groupEdit();
- gEdit->buttonAdd->setPixmap(KGlobal::iconLoader()->loadIcon("down",KIcon::Small,20));
- gEdit->buttonRemove->setPixmap(KGlobal::iconLoader()->loadIcon("up",KIcon::Small,20));
+ gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",KIcon::Small,20));
+ gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",KIcon::Small,20));
connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupAdd()));
connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupRemove()));
@@ -1919,9 +1919,9 @@ void listKeys::signkey()
if (!terminalSign->isChecked())
signLoop();
else {
- KProcess kp;
+ TDEProcess kp;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
kp<< config->readPathEntry("TerminalApplication","konsole");
kp<<"-e"
@@ -1935,7 +1935,7 @@ void listKeys::signkey()
kp<<"lsign";
else
kp<<"sign";
- kp.start(KProcess::Block);
+ kp.start(TDEProcess::Block);
keysList2->refreshcurrentkey(keysList2->currentItem());
}
}
@@ -2095,9 +2095,9 @@ void listKeys::slotedit()
if (keysList2->currentItem()->text(6).isEmpty())
return;
- KProcess kp;
+ TDEProcess kp;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
kp<< config->readPathEntry("TerminalApplication","konsole");
kp<<"-e"
@@ -2107,7 +2107,7 @@ void listKeys::slotedit()
<<"--edit-key"
<<keysList2->currentItem()->text(6)
<<"help";
- kp.start(KProcess::Block);
+ kp.start(TDEProcess::Block);
keysList2->refreshcurrentkey(keysList2->currentItem());
}
@@ -2149,7 +2149,7 @@ void listKeys::slotgenkey()
TQWidget *wid=new TQWidget(pop);
TQVBoxLayout *vbox=new TQVBoxLayout(wid,3);
- TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),wid);
+ TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),wid);
TQMovie anim;
@@ -2179,8 +2179,8 @@ void listKeys::slotgenkey()
//*proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--batch"<<"--passphrase-fd"<<res<<"--gen-key"<<"-a"<<"kgpg.tmp";
*proc<<"gpg"<<"--no-tty"<<"--status-fd=2"<<"--no-secmem-warning"<<"--batch"<<"--gen-key"<<"--utf8-strings";
///////// when process ends, update dialog infos
- TQObject::connect(proc, TQT_SIGNAL(processExited(KProcess *)),TQT_TQOBJECT(this), TQT_SLOT(genover(KProcess *)));
- proc->start(KProcess::NotifyOnExit,true);
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(genover(TDEProcess *)));
+ proc->start(TDEProcess::NotifyOnExit,true);
if (ktype=="RSA")
proc->writeStdin(TQString("Key-Type: 1"));
@@ -2214,15 +2214,15 @@ void listKeys::slotgenkey()
proc->closeWhenDone();
} else ////// start expert (=konsole) mode
{
- KProcess kp;
+ TDEProcess kp;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
kp<< config->readPathEntry("TerminalApplication","konsole");
kp<<"-e"
<<"gpg"
<<"--gen-key";
- kp.start(KProcess::Block);
+ kp.start(TDEProcess::Block);
refreshkey();
}
}
@@ -2240,7 +2240,7 @@ void listKeys::readgenprocess(KProcIO *p)
// sample: [GNUPG:] KEY_CREATED B 156A4305085A58C01E2988229282910254D1B368
}
-void listKeys::genover(KProcess *)
+void listKeys::genover(TDEProcess *)
{
newkeyID=TQString();
continueSearch=true;
@@ -2248,8 +2248,8 @@ void listKeys::genover(KProcess *)
*conprocess<< "gpg";
*conprocess<<"--no-secmem-warning"<<"--with-colons"<<"--fingerprint"<<"--list-keys"<<newKeyName;
TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(slotReadFingerProcess(KProcIO *)));
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),TQT_TQOBJECT(this), TQT_SLOT(newKeyDone(KProcess *)));
- conprocess->start(KProcess::NotifyOnExit,true);
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(newKeyDone(TDEProcess *)));
+ conprocess->start(TDEProcess::NotifyOnExit,true);
}
@@ -2270,7 +2270,7 @@ void listKeys::slotReadFingerProcess(KProcIO *p)
}
-void listKeys::newKeyDone(KProcess *)
+void listKeys::newKeyDone(TDEProcess *)
{
changeMessage(i18n("Ready"),0);
// refreshkey();
@@ -2351,15 +2351,15 @@ void listKeys::deleteseckey()
if (result!=KMessageBox::Continue)
return;
- KProcess *conprocess=new KProcess();
- KConfig *config = KGlobal::config();
+ TDEProcess *conprocess=new TDEProcess();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
*conprocess<< config->readPathEntry("TerminalApplication","konsole");
*conprocess<<"-e"<<"gpg"
<<"--no-secmem-warning"
<<"--delete-secret-key"<<keysList2->currentItem()->text(6);
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(KProcess *)),TQT_TQOBJECT(this), TQT_SLOT(reloadSecretKeys()));
- conprocess->start(KProcess::NotifyOnExit,KProcess::AllOutput);
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(reloadSecretKeys()));
+ conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
}
void listKeys::reloadSecretKeys()
@@ -2425,7 +2425,7 @@ void listKeys::deletekey()
TQPtrList<TQListViewItem> exportList=keysList2->selectedItems();
if (exportList.count()==0)
return;
- KProcess gp;
+ TDEProcess gp;
gp << "gpg"
<< "--no-tty"
<< "--no-secmem-warning"
@@ -2435,7 +2435,7 @@ void listKeys::deletekey()
for ( uint i = 0; i < exportList.count(); ++i )
if ( exportList.at(i) )
gp<<(exportList.at(i)->text(6)).stripWhiteSpace();
- gp.start(KProcess::Block);
+ gp.start(TDEProcess::Block);
for ( uint i = 0; i < exportList.count(); ++i )
if ( exportList.at(i) )
@@ -2520,7 +2520,7 @@ TQPixmap KeyView::slotGetPhoto(TQString photoId,bool mini)
TQString popt="cp %i "+phototmp->name();
KProcIO *p=new KProcIO(TQTextCodec::codecForLocale());
*p<<"gpg"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(popt))<<"--list-keys"<<photoId;
- p->start(KProcess::Block);
+ p->start(TDEProcess::Block);
TQPixmap pixmap;
@@ -2580,7 +2580,7 @@ void KeyView::expandKey(TQListViewItem *item)
KProcIO *p=new KProcIO(TQTextCodec::codecForLocale());
*p<<"gpg"<<"--no-tty"<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput));
*p<<"--edit-key"<<item->text(6)<<"uid"<<TQString::number(uidNumber)<<"showphoto"<<"quit";
- p->start(KProcess::Block);
+ p->start(TDEProcess::Block);
TQPixmap pixmap;
pixmap.load(kgpgphototmp->name());
TQImage dup=pixmap.convertToImage();
@@ -3047,7 +3047,7 @@ gpgKey KeyView::extractKey(TQString keyColon)
ret.gpgkeycreation=keyString[5];
if(!ret.gpgkeycreation.isEmpty()) {
TQDate date = TQDate::fromString(ret.gpgkeycreation, Qt::ISODate);
- ret.gpgkeycreation=KGlobal::locale()->formatDate(date, true);
+ ret.gpgkeycreation=TDEGlobal::locale()->formatDate(date, true);
}
TQString tid=keyString[4];
ret.gpgkeyid=TQString("0x"+tid.right(8));
@@ -3056,7 +3056,7 @@ gpgKey KeyView::extractKey(TQString keyColon)
ret.gpgkeyexpiration=i18n("Unlimited");
else {
TQDate date = TQDate::fromString(ret.gpgkeyexpiration, Qt::ISODate);
- ret.gpgkeyexpiration=KGlobal::locale()->formatDate(date, true);
+ ret.gpgkeyexpiration=TDEGlobal::locale()->formatDate(date, true);
}
TQString fullname=keyString[9];
if (fullname.find("<")!=-1) {
diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h
index 13f0bf1..c006198 100644
--- a/kgpg/listkeys.h
+++ b/kgpg/listkeys.h
@@ -41,7 +41,7 @@ class TQLabel;
class TQCheckbox;
class KStatusBar;
class KPassivePopup;
-class KProcess;
+class TDEProcess;
class KProcIO;
class TQEvent;
class KTempFile;
@@ -236,7 +236,7 @@ private slots:
void slotSetPhotoSize(int size);
void slotShowPhoto();
void readgenprocess(KProcIO *p);
- void newKeyDone(KProcess *);
+ void newKeyDone(TDEProcess *);
void slotrevoke(TQString keyID,TQString revokeUrl,int reason,TQString description);
void revokeWidget();
void doFilePrint(TQString url);
@@ -251,7 +251,7 @@ private slots:
void slotProcessExportMail(TQString keys);
void slotProcessExportClip(TQString keys);
void readOptions();
- void genover(KProcess *p);
+ void genover(TDEProcess *p);
void showOptions();
void slotSetDefKey();
void slotSetDefaultKey(TQListViewItem *newdef);
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index e079540..c4f436f 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -100,7 +100,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
if (KGpgSettings::allowCustomEncryptionOptions())
customOptions=KGpgSettings::customEncryptionOptions();
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
@@ -337,9 +337,9 @@ void popupPublic::refreshkeys()
KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale());
*encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
///////// when process ends, update dialog infos
- TQObject::connect(encid, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotpreselect()));
+ TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect()));
TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *)));
- encid->start(KProcess::NotifyOnExit,true);
+ encid->start(TDEProcess::NotifyOnExit,true);
}
void popupPublic::slotpreselect()
diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 14c81c1..337b447 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -38,7 +38,7 @@ CDigitLabel::~CDigitLabel( void )
void CDigitLabel::initialize( void )
{
- TQFont font( KGlobalSettings::generalFont() );
+ TQFont font( TDEGlobalSettings::generalFont() );
font.setBold( true );
setFont( font );
}
diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc
index a560ea8..933fa7e 100644
--- a/khexedit/chartabledialog.cc
+++ b/khexedit/chartabledialog.cc
@@ -45,7 +45,7 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name,
if( topLayout == 0 ) { return; }
mCharacterList = new CListView( plainPage(), "characterList" );
- mCharacterList->setFont( KGlobalSettings::fixedFont() );
+ mCharacterList->setFont( TDEGlobalSettings::fixedFont() );
mCharacterList->addColumn( i18n("Decimal") );
mCharacterList->addColumn( i18n("Hexadecimal") );
mCharacterList->addColumn( i18n("Octal") );
diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc
index a619846..bfa7ff2 100644
--- a/khexedit/fileinfodialog.cc
+++ b/khexedit/fileinfodialog.cc
@@ -100,7 +100,7 @@ CFileInfoDialog::CFileInfoDialog( TQWidget *parent,const char *name,bool modal)
gbox->addWidget( mFileSizeLabel, 1, 1 );
mFrequencyList = new CListView( plainPage(), "stringList" );
- mFrequencyList->setFont( KGlobalSettings::fixedFont() );
+ mFrequencyList->setFont( TDEGlobalSettings::fixedFont() );
mFrequencyList->addColumn( i18n("Hexadecimal") );
mFrequencyList->addColumn( i18n("Decimal") );
@@ -219,7 +219,7 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc )
setClean();
mFrequencyList->clear();
mFileNameLabel->setText( sc.documentName );
- mFileSizeLabel->setText( KGlobal::locale()->formatNumber(sc.documentSize, 0) );
+ mFileSizeLabel->setText( TDEGlobal::locale()->formatNumber(sc.documentSize, 0) );
TQString d, h, o, b, c, n, p;
TQListViewItem *item = 0;
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index 1e34ae7..8a516a8 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -1860,7 +1860,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int x1, int x2, int y,
int CHexBuffer::headerHeight( TQPainter &paint )
{
TQFont font( paint.font() );
- paint.setFont( KGlobalSettings::generalFont() );
+ paint.setFont( TDEGlobalSettings::generalFont() );
const TQFontMetrics &fm = paint.fontMetrics();
int height = fm.height();
@@ -1871,7 +1871,7 @@ int CHexBuffer::headerHeight( TQPainter &paint )
int CHexBuffer::headerMargin( TQPainter &paint )
{
TQFont font( paint.font() );
- paint.setFont( KGlobalSettings::generalFont() );
+ paint.setFont( TDEGlobalSettings::generalFont() );
const TQFontMetrics &fm = paint.fontMetrics();
int margin = fm.height() / 2;
@@ -1885,7 +1885,7 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y,
const SPagePosition &position )
{
TQFont font( paint.font() );
- paint.setFont( KGlobalSettings::generalFont() );
+ paint.setFont( TDEGlobalSettings::generalFont() );
const TQFontMetrics &fm = paint.fontMetrics();
paint.fillRect( sx, y, width, fm.height(), TQt::white );
@@ -1918,13 +1918,13 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y,
{
TQDateTime datetime;
datetime.setTime_t( position.now );
- msg = KGlobal::locale()->formatDateTime(datetime);
+ msg = TDEGlobal::locale()->formatDateTime(datetime);
}
else if( header.pos[i] == SPageHeader::PageNumber )
{
msg = i18n("Page %1 of %2")
- .arg(KGlobal::locale()->formatNumber(position.curPage, 0))
- .arg(KGlobal::locale()->formatNumber(position.maxPage, 0));
+ .arg(TDEGlobal::locale()->formatNumber(position.curPage, 0))
+ .arg(TDEGlobal::locale()->formatNumber(position.maxPage, 0));
}
else if( header.pos[i] == SPageHeader::FileName )
{
@@ -1937,7 +1937,7 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y,
if( 0 && pos[i] == TQPainter::AlignRight )
{
- //const TQFontMetrics &f = TQFontMetrics( KGlobalSettings::generalFont() );
+ //const TQFontMetrics &f = TQFontMetrics( TDEGlobalSettings::generalFont() );
//TQRect r = paint.boundingRect(sx, y, width, fm.height(), pos[i], msg );
//printf("R: %d, %d, %d, %d\n", r.x(), r.y(), r.width(), r.height() );
diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc
index 1c9e234..f833256 100644
--- a/khexedit/hexdrag.cc
+++ b/khexedit/hexdrag.cc
@@ -52,7 +52,7 @@ void CHexDrag::prepPixmap(void)
// Wont use it yet,
//
/*
- KIconLoader &loader = *KGlobal::iconLoader();
+ KIconLoader &loader = *TDEGlobal::iconLoader();
TQPixmap pix = loader.loadIcon( "binary.xpm" );
TQPoint hotspot( pix.width()-20,pix.height()/2 );
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 894b70f..5bf6c7f 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -493,7 +493,7 @@ void CHexEditorWidget::setFont( const SDisplayFont &font )
SDisplayFontInfo fontInfo;
if( mDisplayState.font.useSystemFont == true )
{
- fontInfo.font = KGlobalSettings::fixedFont();
+ fontInfo.font = TDEGlobalSettings::fixedFont();
}
else
{
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 2ae2c8c..339a26a 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -429,7 +429,7 @@ class SDisplayFontInfo
SDisplayFontInfo &init( void )
{
- font = KGlobalSettings::fixedFont();
+ font = TDEGlobalSettings::fixedFont();
nonPrintChar = '.';
return( *this );
}
@@ -444,7 +444,7 @@ class SDisplayFont
SDisplayFont( void )
{
useSystemFont = false;
- localFont = KGlobalSettings::fixedFont();
+ localFont = TDEGlobalSettings::fixedFont();
nonPrintChar = '.';
}
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 22f939d..5ebd75b 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -89,7 +89,7 @@ bool CDragManager::start( TQMouseEvent *e )
if( mActivateMode == Movement )
{
- if( (mOrigin - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay() )
+ if( (mOrigin - e->pos()).manhattanLength() > TDEGlobalSettings::dndEventDelay() )
{
mPending = false;
emit startDrag( e->state() & ShiftButton ? true : false );
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index b45c76d..6b27670 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -79,7 +79,7 @@ static bool is8Bit( TQTextCodec *Codec )
static TQTextCodec *createLatin1()
{
- return KGlobal::charsets()->codecForName( EncodingNames[0].Name );
+ return TDEGlobal::charsets()->codecForName( EncodingNames[0].Name );
}
/** heuristic seems to be doomed :(
@@ -120,12 +120,12 @@ const TQStringList &KTextCharCodec::codecNames()
// first call?
if( CodecNames.isEmpty() )
{
- const TQStringList &CharSets = KGlobal::charsets()->availableEncodingNames();
+ const TQStringList &CharSets = TDEGlobal::charsets()->availableEncodingNames();
for( TQStringList::ConstIterator it = CharSets.begin(); it != CharSets.end(); ++it )
{
bool Found = true;
- TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found );
+ TQTextCodec* Codec = TDEGlobal::charsets()->codecForName( *it, Found );
if( Found && is8Bit(Codec) )
CodecNames.append( TQString::fromLatin1(Codec->name()) );
}
@@ -161,7 +161,7 @@ TQStringList KTextCharCodec::CodecNames;
KTextCharCodec *KTextCharCodec::createLocalCodec()
{
- TQTextCodec *Codec = KGlobal::locale()->codecForEncoding();
+ TQTextCodec *Codec = TDEGlobal::locale()->codecForEncoding();
if( !is8Bit(Codec) )
Codec = createLatin1();
return new KTextCharCodec( Codec );
@@ -171,7 +171,7 @@ KTextCharCodec *KTextCharCodec::createLocalCodec()
KTextCharCodec *KTextCharCodec::createCodec( const TQString &CodeName )
{
bool Ok;
- TQTextCodec *Codec = KGlobal::charsets()->codecForName( CodeName, Ok );
+ TQTextCodec *Codec = TDEGlobal::charsets()->codecForName( CodeName, Ok );
if( Ok )
Ok = is8Bit( Codec );
return Ok ? new KTextCharCodec( Codec ) : 0;
@@ -187,7 +187,7 @@ const TQStringList &KTextCharCodec::codecNames()
{
bool Found = true;
TQString Name = TQString::fromLatin1( EncodingNames[i].Name );
- TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found );
+ TQTextCodec* Codec = TDEGlobal::charsets()->codecForName( Name, Found );
if( Found )
CodecNames.append( TQString::fromLatin1(Codec->name()) );
}
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index 35fbbca..54b776e 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -47,7 +47,7 @@ static const char *localTextPlain()
if( TextPlainLocal.isNull() )
{
- TextPlainLocal = TQCString(KGlobal::locale()->encoding()).lower();
+ TextPlainLocal = TQCString(TDEGlobal::locale()->encoding()).lower();
// remove the whitespaces
int s;
while( (s=TextPlainLocal.find(' ')) >= 0 )
@@ -74,7 +74,7 @@ static TQTextCodec* codecForCharset( const TQCString& Desc )
return TQTextCodec::codecForName( CharSetName );
}
// no charset=, use locale
- return KGlobal::locale()->codecForEncoding();
+ return TDEGlobal::locale()->codecForEncoding();
}
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index 2a833d6..6a7c433 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -128,7 +128,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl
FixedFont.setFixedPitch( true );
setFont( FixedFont );
#else
- setFont( KGlobalSettings::fixedFont() );
+ setFont( TDEGlobalSettings::fixedFont() );
#endif
// get the full control
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 89ed9b3..c33700c 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -392,7 +392,7 @@ void COptionDialog::setupFontPage( void )
mFont.chooser = new KFontChooser( page, "font", true, TQStringList(), false, 4 );
topLayout->addWidget( mFont.chooser );
- TQFont fixFont( KGlobalSettings::fixedFont() );
+ TQFont fixFont( TDEGlobalSettings::fixedFont() );
fixFont.setBold(true);
mFont.chooser->setFont( fixFont, true );
mFont.chooser->setSampleText( i18n("KHexEdit editor font") );
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index 5ccafbf..a204671 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -69,7 +69,7 @@ KHexEditPart::~KHexEditPart()
/*
void KHexEditPart::setupTools( bool BrowserViewWanted )
{
- if( !BrowserViewWanted ) new KClipboardTool( this );
+ if( !BrowserViewWanted ) new TDEClipboardTool( this );
new KZoomToolet( this );
new KSelectToolet( this );
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index f08baf6..5e7814d 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -72,7 +72,7 @@ void CStatusBarProgress::initialize( void )
mTextColor = palette().active().text();
setBackgroundColor( palette().active().background() );
- TQFont font( KGlobalSettings::generalFont() );
+ TQFont font( TDEGlobalSettings::generalFont() );
font.setBold( true );
setFont( font );
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index 52a845e..37247ae 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -91,7 +91,7 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal )
// Using listview as suggested by Dima Rogozin <dima@mercury.co.il>
//
mStringList = new CListView( plainPage(), "stringList" );
- mStringList->setFont( KGlobalSettings::fixedFont() );
+ mStringList->setFont( TDEGlobalSettings::fixedFont() );
mStringList->addColumn( i18n("Offset") );
mStringList->addColumn( i18n("String") );
mStringList->setAllColumnsShowFocus( true );
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 9333b81..f0a1c70 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -67,7 +67,7 @@ KJotsMain::KJotsMain(const char* name)
setCentralWidget(f_main);
splitter = new TQSplitter(f_main);
- splitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
// the subject list
subjectList = new KListView(splitter, "subjectList");
@@ -573,7 +573,7 @@ void KJotsMain::slotQuit()
void KJotsMain::insertDate()
{
- me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
+ me_text->insert(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
}
void KJotsMain::updateMenu()
diff --git a/kjots/kjots.kcfg b/kjots/kjots.kcfg
index 4350210..68e5fc3 100644
--- a/kjots/kjots.kcfg
+++ b/kjots/kjots.kcfg
@@ -13,7 +13,7 @@
</entry>
<entry name="Font" type="Font">
<label>The font used to display the contents of books.</label>
- <default code="true">KGlobalSettings::generalFont()</default>
+ <default code="true">TDEGlobalSettings::generalFont()</default>
</entry>
<entry name="AutoSave" type="Bool">
<label>Whether books should be saved automatically.</label>
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 4dfb247..e66513b 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -54,7 +54,7 @@ extern void wake_laptop_daemon();
AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
: KCModule(parent, name)
{
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
config = new KConfig("kcmlaptoprc");
@@ -174,12 +174,12 @@ void AcpiConfig::setupHelper()
i18n("KLaptopDaemon"), KStdGuiItem::cont(),
"");
if (rc == KMessageBox::Continue) {
- KProcess proc;
+ TDEProcess proc;
proc << tdesu;
proc << "-u";
proc << "root";
proc << "chown root "+helper+"; chmod +s "+helper;
- proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
+ proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results
}
} else {
KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."),
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index 9de0c85..107cff0 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -54,7 +54,7 @@ extern void wake_laptop_daemon();
ApmConfig::ApmConfig (TQWidget * parent, const char *name)
: KCModule(parent, name)
{
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
config = new KConfig("kcmlaptoprc");
@@ -162,12 +162,12 @@ void ApmConfig::setupHelper()
"KLaptopDaemon", KStdGuiItem::cont(),
"");
if (rc == KMessageBox::Continue) {
- KProcess proc;
+ TDEProcess proc;
proc << tdesu;
proc << "-u";
proc << "root";
proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
- proc.start(KProcess::Block); // run it sync so has_apm below sees the results
+ proc.start(TDEProcess::Block); // run it sync so has_apm below sees the results
}
} else {
KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly.").arg(TQString(apm_name)),
@@ -196,12 +196,12 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
i18n("KLaptopDaemon"), KStdGuiItem::cont(),
"");
if (rc == KMessageBox::Continue) {
- KProcess proc;
+ TDEProcess proc;
proc << tdesu;
proc << "-u";
proc << "root";
proc << "chown root "+helper+"; chmod +s "+helper;
- proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
+ proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results
}
} else {
KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."),
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 7ca5a55..e4ba202 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -59,7 +59,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
buttonNoCharge(0),
buttonCharge(0)
{
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
apm = laptop_portable::has_power_management();
config = new KConfig("kcmlaptoprc");
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index 51c9ce7..eb3a6bf 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -77,7 +77,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
int can_shutdown = 1; // fix me
int can_logout = 1; // fix me
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
apm = laptop_portable::has_power_management();
config = new KConfig("kcmlaptoprc");
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 32d1dfd..88b89e6 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -52,7 +52,7 @@ laptop_dock::laptop_dock( laptop_daemon* parent )
: KSystemTray()
{
setCaption(i18n("KLaptop Daemon"));
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
_pcmcia = NULL;
pdaemon = parent;
current_code = -1;
@@ -207,7 +207,7 @@ laptop_dock::invokeBrightness()
brightness_slider->setValue(255-brightness);
}
if (!brightness_widget->isVisible()) {
- TQRect desktop = KGlobalSettings::desktopGeometry(this);
+ TQRect desktop = TDEGlobalSettings::desktopGeometry(this);
int sw = desktop.width();
int sh = desktop.height();
int sx = desktop.x();
@@ -244,16 +244,16 @@ void laptop_dock::slotGoRoot(int /*id*/) {
i18n("KLaptopDaemon"), KStdGuiItem::cont(),
"switchToPCMCIAPrompt");
if (rc == KMessageBox::Continue) {
- KProcess *_rootProcess;
- _rootProcess = new KProcess;
+ TDEProcess *_rootProcess;
+ _rootProcess = new TDEProcess;
*_rootProcess << tdesu;
*_rootProcess << "-u";
*_rootProcess << "root";
//*_rootProcess << "--nonewdcop";
*_rootProcess << KStandardDirs::findExe("klaptopdaemon");
- connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(rootExited(KProcess*)));
- _rootProcess->start(KProcess::NotifyOnExit);
+ connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(rootExited(TDEProcess*)));
+ _rootProcess->start(TDEProcess::NotifyOnExit);
// We should disable this menu item here now.
}
} else {
@@ -307,7 +307,7 @@ void laptop_dock::slotQuit() {
}
-void laptop_dock::rootExited(KProcess *p) {
+void laptop_dock::rootExited(TDEProcess *p) {
if (p && p->isRunning()) {
p->detach();
}
@@ -525,10 +525,10 @@ void laptop_dock::invokeLockSuspend()
void laptop_dock::invokeSetup()
{
- KProcess proc;
+ TDEProcess proc;
proc << KStandardDirs::findExe("kcmshell");
proc << "laptop";
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
proc.detach();
}
@@ -690,7 +690,7 @@ quit:
int oldPixmapWidth = image.size().width();
int oldPixmapHeight = image.size().height();
- TQFont percentageFont = KGlobalSettings::generalFont();
+ TQFont percentageFont = TDEGlobalSettings::generalFont();
percentageFont.setBold(true);
// decrease the size of the font for the number of unread messages if the
diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h
index 3297bb6..f35e9fd 100644
--- a/klaptopdaemon/daemondock.h
+++ b/klaptopdaemon/daemondock.h
@@ -80,7 +80,7 @@ private slots:
void fill_performance();
- void rootExited(KProcess *p);
+ void rootExited(TDEProcess *p);
void slotGoRoot(int id);
void slotQuit();
void slotHide();
diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp
index 50d7b4c..a17b5f8 100644
--- a/klaptopdaemon/kpcmcia.cpp
+++ b/klaptopdaemon/kpcmcia.cpp
@@ -520,7 +520,7 @@ return -1;
}
static int openDevice(dev_t dev) {
-TQString tmp_path = locateLocal("tmp", KGlobal::instance()->instanceName());
+TQString tmp_path = locateLocal("tmp", TDEGlobal::instance()->instanceName());
TQString ext = "_socket%1";
tmp_path += ext.arg((int)dev);
diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index 499577b..0df5a95 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/krichtextlabel.cpp
@@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
setAlignment( TQt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
setAlignment( TQt::WordBreak );
}
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 3d1caab..6868545 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -503,9 +503,9 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type)
if (s.runCommand[t]) {
// make sure the command exists
if (!s.runCommandPath[t].isEmpty()) {
- KProcess command;
+ TDEProcess command;
command << s.runCommandPath[t];
- command.start(KProcess::DontCare);
+ command.start(TDEProcess::DontCare);
}
}
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index 60d1fc0..4554686 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -48,7 +48,7 @@ PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
about->addAuthor("Paul Campbell", 0, "paul@taniwha.com");
setAboutData( about );
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
label0 = laptop_portable::pcmcia_info(0, this);
label0_text = laptop_portable::pcmcia_info(1, this);
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index 7c5d227..ed4801f 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -745,14 +745,14 @@ laptop_portable::acpi_set_mask(bool standby, bool suspend, bool hibernate, bool
static void
invoke_acpi_helper(const char *param, const char *param2, const char *param3)
{
- KProcess proc;
+ TDEProcess proc;
proc << KStandardDirs::findExe("klaptop_acpi_helper");
proc << param;
if (param2)
proc << param2;
if (param3)
proc << param3;
- proc.start(KProcess::Block); // helper runs fast and we want to see the result
+ proc.start(TDEProcess::Block); // helper runs fast and we want to see the result
}
static unsigned long apm_sleep_enabled = 0x0c; // apm sleep functions enabled mask
@@ -1086,10 +1086,10 @@ void laptop_portable::invoke_standby()
return;
}
// add other machine specific standbys here
- KProcess proc;
+ TDEProcess proc;
proc << "/usr/bin/apm";
proc << "--standby";
- proc.start(KProcess::Block); // helper runs fast and we want to see the result
+ proc.start(TDEProcess::Block); // helper runs fast and we want to see the result
}
//
@@ -1100,10 +1100,10 @@ void laptop_portable::invoke_suspend()
last_seed++; // make it look for battery removal/return
if (::has_pmu()) {
- KProcess proc;
+ TDEProcess proc;
proc << "/usr/bin/apm";
proc << "-f";
- proc.start(KProcess::Block); // helper runs fast and we want to see the result
+ proc.start(TDEProcess::Block); // helper runs fast and we want to see the result
return;
}
@@ -1125,10 +1125,10 @@ void laptop_portable::invoke_suspend()
return;
}
// add other machine specific suspends here
- KProcess proc;
+ TDEProcess proc;
proc << "/usr/bin/apm";
proc << "--suspend";
- proc.start(KProcess::Block); // helper runs fast and we want to see the result
+ proc.start(TDEProcess::Block); // helper runs fast and we want to see the result
}
//
@@ -2225,12 +2225,12 @@ void laptop_portable::invoke_suspend()
//
void laptop_portable::invoke_hibernation()
{
- KProcess thisProc;
+ TDEProcess thisProc;
if (::access(PATH_TPCTL, X_OK)==0) {
thisProc << PATH_TPCTL;
thisProc << "---hibernate";
- thisProc.start(KProcess::Block);
+ thisProc.start(TDEProcess::Block);
return;
}
}
@@ -2603,10 +2603,10 @@ TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent)
//
void laptop_portable::invoke_standby()
{
- KProcess proc;
+ TDEProcess proc;
proc << "/usr/sbin/apm";
proc << "-S";
- proc.start(KProcess::Block); // helper runs fast and we want to see the result
+ proc.start(TDEProcess::Block); // helper runs fast and we want to see the result
}
//
@@ -2616,10 +2616,10 @@ void laptop_portable::invoke_standby()
//
void laptop_portable::invoke_suspend()
{
- KProcess proc;
+ TDEProcess proc;
proc << "/usr/sbin/apm";
proc << "-z";
- proc.start(KProcess::Block); // helper runs fast and we want to see the result
+ proc.start(TDEProcess::Block); // helper runs fast and we want to see the result
}
//
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index 446e900..28e558e 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -79,7 +79,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
noeditlav(0),
editlav(0)
{
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
apm = laptop_portable::has_power_management();
config = new KConfig("kcmlaptoprc");
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index f71325f..c61e884 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -64,7 +64,7 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
int current_throttle;
bool has_throttle = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list);
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
config = new KConfig("kcmlaptoprc");
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index 7bc7175..a318153 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -58,7 +58,7 @@ extern void wake_laptop_daemon();
SonyConfig::SonyConfig(TQWidget * parent, const char *name)
: KCModule(parent, name)
{
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
config = new KConfig("kcmlaptoprc");
@@ -115,12 +115,12 @@ void SonyConfig::setupHelper()
i18n("KLaptopDaemon"), KStdGuiItem::cont(),
"");
if (rc == KMessageBox::Continue) {
- KProcess proc;
+ TDEProcess proc;
proc << tdesu;
proc << "-u";
proc << "root";
proc << "chmod +r /dev/sonypi";
- proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
+ proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results
}
} else {
KMessageBox::sorry(0, i18n("The /dev/sonypi protections cannot be changed because tdesu cannot be found. Please make sure that it is installed correctly."),
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 4845fdc..14fb14b 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -50,7 +50,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
checkStandby(0),
checkHibernate(0)
{
- KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+ TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
type = t;
apm = laptop_portable::has_power_management();
diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp
index 4e13be1..658533a 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -98,7 +98,7 @@ bool GenericMonitor::init()
{ "Mute", KShortcut("XF86AudioMute"), TQT_SLOT(mute()) }
};
- ga = new KGlobalAccel(this, "miloGenericAccel");
+ ga = new TDEGlobalAccel(this, "miloGenericAccel");
ShortcutInfo si;
int len = (int)sizeof(shortcuts)/sizeof(ShortcutInfo);
@@ -338,9 +338,9 @@ Monitor::DisplayType GenericMonitor::poll()
void GenericMonitor::launch(TQString configKey, TQString defaultApplication)
{
TQString application = config->readEntry(configKey, defaultApplication);
- KProcess proc;
+ TDEProcess proc;
proc << application;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void GenericMonitor::launchMail()
@@ -362,9 +362,9 @@ void GenericMonitor::launchSearch()
void GenericMonitor::launchHomeFolder()
{
TQString home = TQDir::home().path();
- KProcess proc;
+ TDEProcess proc;
proc << "kfmclient" << "exec" << home;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void GenericMonitor::launchMusic()
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index 6f23316..3884627 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -85,7 +85,7 @@ private:
void displayVolume();
void launch(TQString configKey, TQString defaultApplication);
- KGlobalAccel *ga;
+ TDEGlobalAccel *ga;
KConfig* config;
DCOPRef *kmixClient, *kmixWindow;
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 6bc35c7..2793ee2 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -98,7 +98,7 @@ void DefaultSkin::clear() {
void DefaultSkin::show() {
#if KDE_IS_VERSION(3,1,90)
- TQRect r = KGlobalSettings::splashScreenDesktopGeometry();
+ TQRect r = TDEGlobalSettings::splashScreenDesktopGeometry();
#else
TQRect r = TQApplication::desktop()->geometry();
#endif
diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp
index 08e661e..269e8e5 100644
--- a/kregexpeditor/kregexpeditorprivate.cpp
+++ b/kregexpeditor/kregexpeditorprivate.cpp
@@ -174,7 +174,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
#ifdef TQT_ONLY
TQPixmap pix( "icons/error.png" );
#else
- TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar );
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar );
#endif
_error = new TQLabel( this );
_error->setPixmap( pix );
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index 2c2b247..b450d84 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -53,7 +53,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
TQPixmap pix;
pix.convertFromImage( qembed_findImage( "select" ) );
#else
- TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar );
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar );
#endif
_selectBut->setPixmap( pix );
@@ -158,7 +158,7 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
TQPixmap pix;
pix.convertFromImage( qembed_findImage( TQString::fromLatin1( name ) ) );
#else
- TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) +
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) +
TQString::fromLatin1(".png") ), KIcon::Toolbar );
#endif
diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp
index 89e0bb1..16f191f 100644
--- a/kregexpeditor/userdefinedregexps.cpp
+++ b/kregexpeditor/userdefinedregexps.cpp
@@ -70,7 +70,7 @@ void UserDefinedRegExps::slotPopulateUserRegexps()
TQStringList dirs;
dirs << TQString::fromLatin1( "predefined" );
#else
- TQStringList dirs = KGlobal::dirs()->findDirs( "data", TQString::fromLocal8Bit("kregexpeditor/predefined/") );
+ TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", TQString::fromLocal8Bit("kregexpeditor/predefined/") );
#endif
for ( TQStringList::iterator it1 = dirs.begin(); it1 != dirs.end(); ++it1 ) {
diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp
index a57f99c..bfcd0fe 100644
--- a/kregexpeditor/util.cpp
+++ b/kregexpeditor/util.cpp
@@ -26,7 +26,7 @@ TQPixmap Util::getKRegExpEditorIcon( const TQString& name )
pix.convertFromImage( qembed_findImage(name) );
return pix;
#else
- return KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ),
+ return TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ),
KIcon::Toolbar );
#endif
}
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index e74f768..0134c51 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -37,7 +37,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile)
{
- KGlobal::locale()->insertCatalogue("ksim");
+ TDEGlobal::locale()->insertCatalogue("ksim");
return new KSim::PanelExtension(configFile, KPanelExtension::Normal,
KPanelExtension::About | KPanelExtension::Help |
KPanelExtension::Preferences | KPanelExtension::ReportBug,
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 7140e3a..7c39e22 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -76,7 +76,7 @@ void KSim::Sysinfo::clockUptimeUpdate()
if (m_timeLabel) {
TQTime now = TQTime::currentTime();
- time = KGlobal::locale()->formatTime(now, true);
+ time = TDEGlobal::locale()->formatTime(now, true);
if ( now == TQTime(0, 0) )
updateDate = true;
@@ -86,7 +86,7 @@ void KSim::Sysinfo::clockUptimeUpdate()
// only update the date when necessary
if (m_dateLabel) {
if (updateDate) {
- m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::currentDate()));
+ m_dateLabel->setText(TDEGlobal::locale()->formatDate(TQDate::currentDate()));
updateDate = false;
}
}
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 4f91647..8b991f2 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -330,7 +330,7 @@ void KSim::MainView::reparseConfig(bool emitReload,
void KSim::MainView::addPlugins()
{
- TQStringList locatedFiles = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
+ TQStringList locatedFiles = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
TQStringList::ConstIterator it;
for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it)
{
diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp
index 71b17b7..2126790 100644
--- a/ksim/library/pluginloader.cpp
+++ b/ksim/library/pluginloader.cpp
@@ -171,7 +171,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name,
switch (type) {
case Name: {
- TQStringList files = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
+ TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
TQStringList::ConstIterator it;
for (it = files.begin(); it != files.end(); ++it) {
KDesktopFile file((*it));
@@ -183,7 +183,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name,
break;
}
case LibName: {
- TQStringList files = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
+ TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
TQStringList::ConstIterator it;
for (it = files.begin(); it != files.end(); ++it) {
KDesktopFile file((*it));
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index ff52525..60e2031 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -362,7 +362,7 @@ TQFont KSim::Theme::currentFont() const
return KSim::ThemeLoader::currentFont();
break;
case 4:
- return KGlobalSettings::generalFont();
+ return TDEGlobalSettings::generalFont();
break;
}
@@ -660,7 +660,7 @@ TQColor KSim::Theme::textColour(const TQString &itemType,
const TQString &entry) const
{
if (d->recolour)
- return KGlobalSettings::textColor();
+ return TDEGlobalSettings::textColor();
return readColourEntry(itemType, entry, 0);
}
@@ -1134,7 +1134,7 @@ TQString KSim::ThemeLoader::currentUrl()
KSim::Config::config()->setGroup("Theme");
TQString folder(KSim::Config::config()->readEntry("Name"));
folder.prepend("ksim/themes/").append("/");
- TQString dirName(KGlobal::dirs()->findResourceDir("data", folder));
+ TQString dirName(TDEGlobal::dirs()->findResourceDir("data", folder));
dirName += folder;
return dirName;
@@ -1142,7 +1142,7 @@ TQString KSim::ThemeLoader::currentUrl()
TQString KSim::ThemeLoader::defaultUrl()
{
- return KGlobal::dirs()->findDirs("data", "ksim/themes/ksim").first();
+ return TDEGlobal::dirs()->findDirs("data", "ksim/themes/ksim").first();
}
int KSim::ThemeLoader::currentAlternative()
diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp
index 0038c85..d85be8a 100644
--- a/ksim/monitorprefs.cpp
+++ b/ksim/monitorprefs.cpp
@@ -45,7 +45,7 @@ KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name)
setSelectionMode(TQListView::Single);
// Scan for .desktop files and enter them into the KListView
- m_locatedFiles = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
+ m_locatedFiles = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
m_locatedFiles.sort();
TQStringList::ConstIterator it;
for (it = m_locatedFiles.begin(); it != m_locatedFiles.end(); ++it) {
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index cccf0a5..6c91d00 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -216,13 +216,13 @@ void DiskView::updateDisplay()
if (m_useSeperatly) {
it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks);
it.current()->first->setText(i18n("in: %1k")
- .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
- i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
+ .arg(TDEGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
+ i18n("out: %1k").arg(TDEGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
}
else {
it.current()->first->setValue(diff, 0);
it.current()->first->setText(i18n("%1k")
- .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
+ .arg(TDEGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
}
it.current()->second->setMaxValue(it.current()->first->maxValue());
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 7286e0f..b7ded52 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -169,16 +169,16 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
return TQWidget::eventFilter(o, e);
}
-void FilesystemWidget::receivedStderr(KProcess *, char *buffer, int length)
+void FilesystemWidget::receivedStderr(TDEProcess *, char *buffer, int length)
{
m_stderrString.setLatin1(buffer, length);
}
-void FilesystemWidget::processExited(KProcess *)
+void FilesystemWidget::processExited(TDEProcess *)
{
delete m_process;
m_process = 0;
- kdDebug(2003) << "Deleting KProcess pointer" << endl;
+ kdDebug(2003) << "Deleting TDEProcess pointer" << endl;
if (m_stderrString.isEmpty())
return;
@@ -198,16 +198,16 @@ void FilesystemWidget::processExited(KProcess *)
void FilesystemWidget::createProcess(const TQString &command, const TQString &point)
{
- m_process = new KProcess();
+ m_process = new TDEProcess();
connect(m_process,
- TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
- TQT_SLOT(receivedStderr(KProcess *, char *, int)));
+ TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
connect(m_process,
- TQT_SIGNAL(processExited(KProcess *)),
- TQT_SLOT(processExited(KProcess *)));
+ TQT_SIGNAL(processExited(TDEProcess *)),
+ TQT_SLOT(processExited(TDEProcess *)));
(*m_process) << command << point;
- void(m_process->start(KProcess::NotifyOnExit, KProcess::Stderr));
+ void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr));
}
void FilesystemWidget::showMenu(uint id)
diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h
index 9cd3f61..2a8f116 100644
--- a/ksim/monitors/filesystem/filesystemwidget.h
+++ b/ksim/monitors/filesystem/filesystemwidget.h
@@ -24,7 +24,7 @@
#include <tqptrlist.h>
-class KProcess;
+class TDEProcess;
class TQVBoxLayout;
class FilesystemWidget : public TQWidget
@@ -44,8 +44,8 @@ class FilesystemWidget : public TQWidget
bool eventFilter(TQObject *, TQEvent *);
private slots:
- void receivedStderr(KProcess *, char *, int);
- void processExited(KProcess *);
+ void receivedStderr(TDEProcess *, char *, int);
+ void processExited(TDEProcess *);
private:
class Filesystem
@@ -73,7 +73,7 @@ class FilesystemWidget : public TQWidget
typedef TQPtrList<Filesystem> ProgressList;
ProgressList m_list;
TQVBoxLayout *m_layout;
- KProcess *m_process;
+ TDEProcess *m_process;
TQString m_stderrString;
};
#endif
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 2d3bd9c..a8e57ce 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -391,8 +391,8 @@ void NetView::updateGraph()
( *it ).chart()->setValue( receiveDiff, sendDiff );
( *it ).setMaxValue( ( *it ).chart()->maxValue() );
- TQString receiveString = KGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 );
- TQString sendString = KGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 );
+ TQString receiveString = TDEGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 );
+ TQString sendString = TDEGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 );
( *it ).chart()->setText( i18n( "in: %1k" ).arg( receiveString ),
i18n( "out: %1k" ).arg( sendString ) );
@@ -402,8 +402,8 @@ void NetView::updateGraph()
( *it ).setData( NetData() );
( *it ).chart()->setValue( 0, 0 );
- ( *it ).chart()->setText( i18n( "in: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ),
- i18n( "out: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) );
+ ( *it ).chart()->setText( i18n( "in: %1k" ).arg( TDEGlobal::locale()->formatNumber( 0.0, 1 ) ),
+ i18n( "out: %1k" ).arg( TDEGlobal::locale()->formatNumber( 0.0, 1 ) ) );
if ( ( *it ).label() )
( *it ).label()->setText( i18n( "offline" ) );
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index aaa726d..dc12f45 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -130,7 +130,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
this, TQT_SLOT(showFontDialog(int)));
m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4);
- TQStringList locatedFiles = KGlobal::dirs()->findDirs("data", "ksim/themes");
+ TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes");
for (TQStringList::ConstIterator it = locatedFiles.begin(); it != locatedFiles.end(); ++it)
readThemes(*it);
}
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index 62d7460..cff3083 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -299,7 +299,7 @@ struct KTimerJobPrivate {
bool oneInstance;
unsigned value;
KTimerJob::States state;
- TQPtrList<KProcess> processes;
+ TQPtrList<TDEProcess> processes;
void *user;
TQTimer *timer;
@@ -487,7 +487,7 @@ void KTimerJob::timeout()
}
-void KTimerJob::processExited(KProcess *proc)
+void KTimerJob::processExited(TDEProcess *proc)
{
bool ok = proc->exitStatus()==0;
d->processes.remove( proc );
@@ -502,9 +502,9 @@ void KTimerJob::fire()
KShellProcess *proc = new KShellProcess;
(*proc) << d->command;
d->processes.append( proc );
- connect( proc, TQT_SIGNAL(processExited(KProcess*)),
- TQT_SLOT(processExited(KProcess*)) );
- bool ok = proc->start( KProcess::NotifyOnExit );
+ connect( proc, TQT_SIGNAL(processExited(TDEProcess*)),
+ TQT_SLOT(processExited(TDEProcess*)) );
+ bool ok = proc->start( TDEProcess::NotifyOnExit );
emit fired( this );
if( !ok ) {
d->processes.remove( proc );
diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h
index bdb1d00..0a646fb 100644
--- a/ktimer/ktimer.h
+++ b/ktimer/ktimer.h
@@ -81,7 +81,7 @@ class KTimerJob : public TQObject {
private slots:
void timeout();
- void processExited(KProcess *proc);
+ void processExited(TDEProcess *proc);
private:
struct KTimerJobPrivate *d;
diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp
index d06898c..b7dbc64 100644
--- a/kwallet/allyourbase.cpp
+++ b/kwallet/allyourbase.cpp
@@ -51,7 +51,7 @@ KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, con
}
TQPixmap KWalletFolderItem::getFolderIcon(KIcon::Group group){
- KIconLoader *loader = KGlobal::instance()->iconLoader();
+ KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQPixmap pix = loader->loadIcon( _name, group, 0,
KIcon::DefaultState, 0, true );
if (pix.isNull())
@@ -620,7 +620,7 @@ class KWalletIconDrag : public TQIconDrag {
* */
KWalletIconView::KWalletIconView(TQWidget *parent, const char *name)
: KIconView(parent, name) {
- KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+ TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
}
@@ -654,7 +654,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
return;
}
- TQString dest = KGlobal::dirs()->saveLocation("kwallet") + u.fileName();
+ TQString dest = TDEGlobal::dirs()->saveLocation("kwallet") + u.fileName();
if (TQFile::exists(dest)) {
KMessageBox::sorry(viewport(), i18n("That wallet file already exists. You cannot overwrite wallets."));
e->ignore();
@@ -676,7 +676,7 @@ void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) {
TQDragObject *KWalletIconView::dragObject() {
KWalletIconDrag* id = new KWalletIconDrag(viewport(), "KWallet Drag");
- TQString path = "file:" + KGlobal::dirs()->saveLocation("kwallet");
+ TQString path = "file:" + TDEGlobal::dirs()->saveLocation("kwallet");
TQPoint pos = _mousePos;
for (TQIconViewItem *item = firstItem(); item; item = item->nextItem()) {
if (item->isSelected()) {
diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp
index 5233047..69dbb48 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/kwallet/kwalleteditor.cpp
@@ -1131,7 +1131,7 @@ void KWalletEditor::saveAs() {
if (_nonLocal) {
KIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this);
} else {
- TQString path = KGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl";
+ TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl";
KURL destURL; destURL.setPath(path);
KIO::NetAccess::file_copy(destURL, url, 0600, false, false, this);
}
diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp
index d73cba2..20ab41d 100644
--- a/kwallet/kwalletmanager.cpp
+++ b/kwallet/kwalletmanager.cpp
@@ -48,7 +48,7 @@
KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
: KMainWindow(parent, name, f), DCOPObject("KWalletManager") {
- KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+ TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
_kwalletdLaunch = false;
TQAccel *accel = new TQAccel(this, "kwalletmanager");
diff --git a/kwallet/main.cpp b/kwallet/main.cpp
index 7503737..5790ef9 100644
--- a/kwallet/main.cpp
+++ b/kwallet/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
a.setMainWidget(&wm);
- KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+ TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp
index b53c6e3..e16d415 100644
--- a/superkaramba/src/disksensor.cpp
+++ b/superkaramba/src/disksensor.cpp
@@ -18,10 +18,10 @@
DiskSensor::DiskSensor( int msec ) : Sensor( msec )
{
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
// update values on startup
ksp.clearArguments();
@@ -68,7 +68,7 @@ int DiskSensor::getPercentFree(TQString mntPt) const
return ( 100 - getPercentUsed( mntPt ) );
}
-void DiskSensor::receivedStdout(KProcess *, char *buffer, int len )
+void DiskSensor::receivedStdout(TDEProcess *, char *buffer, int len )
{
buffer[len] = 0;
@@ -76,7 +76,7 @@ void DiskSensor::receivedStdout(KProcess *, char *buffer, int len )
}
-void DiskSensor::processExited(KProcess *)
+void DiskSensor::processExited(TDEProcess *)
{
TQStringList stringList = TQStringList::split('\n',sensorResult);
sensorResult = "";
diff --git a/superkaramba/src/disksensor.h b/superkaramba/src/disksensor.h
index d28174f..7207dd2 100644
--- a/superkaramba/src/disksensor.h
+++ b/superkaramba/src/disksensor.h
@@ -42,8 +42,8 @@ private:
int init;
private slots:
- void receivedStdout(KProcess *, char *buffer, int);
- void processExited(KProcess *);
+ void receivedStdout(TDEProcess *, char *buffer, int);
+ void processExited(TDEProcess *);
signals:
void initComplete();
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index d6e270a..da9eec7 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -1900,14 +1900,14 @@ void karamba::startupRemoved(Startup* t)
pythonIface->startupRemoved(this, t);
}
-void karamba::processExited (KProcess* proc)
+void karamba::processExited (TDEProcess* proc)
{
//tqDebug("karamba::processExited");
if (pythonIface && pythonIface->isExtensionLoaded())
pythonIface->commandFinished(this, (int)proc->pid());
}
-void karamba::receivedStdout (KProcess *proc, char *buffer, int)
+void karamba::receivedStdout (TDEProcess *proc, char *buffer, int)
{
//tqDebug("karamba::receivedStdout");
//Everything below is to call the python callback function
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index 416bc5b..35c16e8 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -136,7 +136,7 @@ public:
KarambaRootPixmap *kroot;
TaskManager taskManager;
Systemtray* systray;
- KProcess* currProcess;
+ TDEProcess* currProcess;
bool useSmoothTransforms();
void changeInterval(int interval);
@@ -267,8 +267,8 @@ public slots:
void updateBackground(KSharedPixmap*);
void passMenuOptionChanged(TQString key, bool);
void passMenuItemClicked(int);
- void processExited (KProcess *proc);
- void receivedStdout (KProcess *proc, char *buffer, int buflen);
+ void processExited (TDEProcess *proc);
+ void receivedStdout (TDEProcess *proc, char *buffer, int buflen);
void toDesktop(int desktopid, int menuid);
const char *getPrettyName() { return prettyName.ascii(); }
diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp
index d22d3c8..0193926 100644
--- a/superkaramba/src/kwidgetlistbox.cpp
+++ b/superkaramba/src/kwidgetlistbox.cpp
@@ -152,19 +152,19 @@ void KWidgetListbox::setItemColors(int index, bool even)
if(index == selected())
{
- itm->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
- itm->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
+ itm->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
+ itm->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
}
else if(even)
{
- itm->setPaletteBackgroundColor(KGlobalSettings::baseColor());
- itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+ itm->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
+ itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
else
{
itm->setPaletteBackgroundColor(
- KGlobalSettings::alternateBackgroundColor());
- itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+ TDEGlobalSettings::alternateBackgroundColor());
+ itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
}
diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp
index dda7983..4cc2e7d 100644
--- a/superkaramba/src/memsensor.cpp
+++ b/superkaramba/src/memsensor.cpp
@@ -56,10 +56,10 @@ MemSensor::MemSensor(int msec) : Sensor(msec)
# if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018
kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
# elif defined Q_OS_FREEBSD
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
swapTotal = swapUsed = 0;
@@ -76,18 +76,18 @@ MemSensor::~MemSensor()
{}
#ifdef Q_OS_FREEBSD
-void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
+void MemSensor::receivedStdout(TDEProcess *, char *buffer, int len )
{
buffer[len] = 0;
sensorResult += TQString( TQCString(buffer) );
}
#else
-void MemSensor::receivedStdout(KProcess *, char *, int)
+void MemSensor::receivedStdout(TDEProcess *, char *, int)
{
}
#endif
-void MemSensor::processExited(KProcess *)
+void MemSensor::processExited(TDEProcess *)
{
#ifdef Q_OS_FREEBSD
TQStringList stringList = TQStringList::split('\n',sensorResult);
@@ -272,7 +272,7 @@ void MemSensor::readValues()
# if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018)
ksp.clearArguments();
ksp << "swapinfo";
- ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
+ ksp.start( TDEProcess::NotifyOnExit,KProcIO::Stdout);
# endif
#else
TQFile file("/proc/meminfo");
diff --git a/superkaramba/src/memsensor.h b/superkaramba/src/memsensor.h
index bf2af69..56a91a5 100644
--- a/superkaramba/src/memsensor.h
+++ b/superkaramba/src/memsensor.h
@@ -60,8 +60,8 @@ private:
#endif
private slots:
- void receivedStdout(KProcess *, char *buffer, int);
- void processExited(KProcess *);
+ void receivedStdout(TDEProcess *, char *buffer, int);
+ void processExited(TDEProcess *);
};
diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp
index 449fe44..3dc5213 100644
--- a/superkaramba/src/misc_python.cpp
+++ b/superkaramba/src/misc_python.cpp
@@ -126,7 +126,7 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args)
karamba* currTheme = (karamba*)widget;
- currTheme->currProcess = new KProcess;
+ currTheme->currProcess = new TDEProcess;
/* get the number of lines passed to us */
numLines = PyList_Size(listObj);
@@ -149,14 +149,14 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args)
}
TQApplication::connect(currTheme->currProcess,
- TQT_SIGNAL(processExited(KProcess *)),
+ TQT_SIGNAL(processExited(TDEProcess *)),
currTheme,
- TQT_SLOT(processExited(KProcess *)));
+ TQT_SLOT(processExited(TDEProcess *)));
TQApplication::connect(currTheme->currProcess,
- TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
currTheme,
- TQT_SLOT(receivedStdout(KProcess *, char *, int)));
- currTheme->currProcess->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
+ currTheme->currProcess->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
return Py_BuildValue((char*)"l", (int)(currTheme->currProcess->pid()));
}
@@ -308,7 +308,7 @@ PyObject* py_userLanguage(PyObject *, PyObject *args)
return NULL;
if (!checkKaramba(widget))
return NULL;
- return Py_BuildValue((char*)"s", KGlobal::locale()->language().ascii());
+ return Py_BuildValue((char*)"s", TDEGlobal::locale()->language().ascii());
}
PyObject* py_userLanguages(PyObject *, PyObject *args)
@@ -319,14 +319,14 @@ PyObject* py_userLanguages(PyObject *, PyObject *args)
if (!checkKaramba(widget))
return NULL;
- unsigned int noOfLangs = KGlobal::locale()->languageList().count();
+ unsigned int noOfLangs = TDEGlobal::locale()->languageList().count();
PyObject *list, *item;
list = PyList_New(noOfLangs);
for(unsigned int i = 0; i < noOfLangs; i++)
{
- item = Py_BuildValue((char*)"s", KGlobal::locale()->languageList()[i].ascii());
+ item = Py_BuildValue((char*)"s", TDEGlobal::locale()->languageList()[i].ascii());
PyList_SetItem(list, i, item);
}
diff --git a/superkaramba/src/programsensor.cpp b/superkaramba/src/programsensor.cpp
index 1118d2d..0c2f3e2 100644
--- a/superkaramba/src/programsensor.cpp
+++ b/superkaramba/src/programsensor.cpp
@@ -25,22 +25,22 @@ ProgramSensor::ProgramSensor(const TQString &progName, int interval, TQString en
programName = progName;
//update();
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
}
ProgramSensor::~ProgramSensor()
{}
-void ProgramSensor::receivedStdout(KProcess *, char *buffer, int len)
+void ProgramSensor::receivedStdout(TDEProcess *, char *buffer, int len)
{
buffer[len] = 0;
sensorResult += codec->toUnicode( TQCString(buffer) );
}
-void ProgramSensor::processExited(KProcess *)
+void ProgramSensor::processExited(TDEProcess *)
{
int lineNbr;
SensorParams *sp;
diff --git a/superkaramba/src/programsensor.h b/superkaramba/src/programsensor.h
index d3f2b39..672d0e7 100644
--- a/superkaramba/src/programsensor.h
+++ b/superkaramba/src/programsensor.h
@@ -32,8 +32,8 @@ private:
TQString sensorResult;
public slots:
- void receivedStdout(KProcess *proc, char *buffer, int buflen);
- void processExited(KProcess *proc);
+ void receivedStdout(TDEProcess *proc, char *buffer, int buflen);
+ void processExited(TDEProcess *proc);
};
#endif // PROGRAMSENSOR_H
diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp
index ed6934e..baea31d 100644
--- a/superkaramba/src/sensorsensor.cpp
+++ b/superkaramba/src/sensorsensor.cpp
@@ -29,10 +29,10 @@ SensorSensor::SensorSensor(int interval, char tempUnit) : Sensor( interval )
#endif
if(tempUnit == 'F')
extraParams = " -f";
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
// readValues();
}
@@ -42,13 +42,13 @@ SensorSensor::~SensorSensor()
{
}
-void SensorSensor::receivedStdout(KProcess *, char *buffer, int len )
+void SensorSensor::receivedStdout(TDEProcess *, char *buffer, int len )
{
buffer[len] = 0;
sensorResult += TQString( TQCString(buffer) );
}
-void SensorSensor::processExited(KProcess *)
+void SensorSensor::processExited(TDEProcess *)
{
TQStringList stringList = TQStringList::split('\n',sensorResult);
sensorResult = "";
@@ -108,7 +108,7 @@ void SensorSensor::update()
#else
ksp << "sensors" << extraParams;
#endif
- ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
+ ksp.start( TDEProcess::NotifyOnExit,KProcIO::Stdout);
}
diff --git a/superkaramba/src/sensorsensor.h b/superkaramba/src/sensorsensor.h
index f4ff004..fccf5bf 100644
--- a/superkaramba/src/sensorsensor.h
+++ b/superkaramba/src/sensorsensor.h
@@ -40,8 +40,8 @@ private:
TQString sensorResult;
private slots:
- void receivedStdout(KProcess *, char *buffer, int);
- void processExited(KProcess *);
+ void receivedStdout(TDEProcess *, char *buffer, int);
+ void processExited(TDEProcess *);
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index 3dd32f6..683219e 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -135,6 +135,6 @@ TQString SKNewStuff::downloadDestination( KNS::Entry *entry )
KRun::runURL( source, "text/html");
return file;
}
- return KGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
+ return TDEGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
}
#endif //HAVE_KNEWSTUFF
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index 2c65e2a..c733d67 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
// // KSGRD::SensorMgr foo ;// p->engage( "" );
-// //KConfig *kconfig = KGlobal::config();
+// //KConfig *kconfig = TDEGlobal::config();
// //kconfig->setGroup("karamba");
// //kconfig->writeEntry("test", "/home/hk/foofoo");
// //kconfig->sync();
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 1092342..27e3a74 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -54,7 +54,7 @@ TaskManager::TaskManager(TQObject *parent, const char *name)
twin_module = new KWinModule();
-// KGlobal::locale()->insertCatalogue("libtaskmanager");
+// TDEGlobal::locale()->insertCatalogue("libtaskmanager");
connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
@@ -344,7 +344,7 @@ Task::Task(WId win, TaskManager * parent, const char *name) :
// try to guess the icon from the classhint
if(_pixmap.isNull())
- KGlobal::instance()->iconLoader()->loadIcon(className().lower(),
+ TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
KIcon::Small,KIcon::Small,
KIcon::DefaultState, 0, true);
@@ -372,7 +372,7 @@ void Task::refresh(bool icon)
// try to guess the icon from the classhint
if(_pixmap.isNull())
{
- KGlobal::instance()->iconLoader()->loadIcon(className().lower(),
+ TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
KIcon::Small, KIcon::Small, KIcon::DefaultState, 0, true);
}
@@ -538,7 +538,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeSmall );
isStaticIcon = true;
@@ -561,7 +561,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeMedium );
isStaticIcon = true;
@@ -575,7 +575,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// If not, try to get one from the classname
if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
- pixmap = KGlobal::iconLoader()->loadIcon( className(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
KIcon::NoGroup,
size,
KIcon::DefaultState,
@@ -592,7 +592,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
size );
isStaticIcon = true;
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index bd3c661..8d8891f 100644
--- a/superkaramba/src/themelocale.cpp
+++ b/superkaramba/src/themelocale.cpp
@@ -171,7 +171,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages)
TQStringList ThemeLocale::languageList()
{
- KConfig* config = KGlobal::instance()->config();
+ KConfig* config = TDEGlobal::instance()->config();
// Reset the list and add the new languages
TQStringList languageList;
languageList +=
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index f483a04..a726238 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -126,7 +126,7 @@ void ThemesDlg::populateListbox()
tableThemes->clear();
item = new ThemeWidget;
- item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("knewstuff",
+ item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("knewstuff",
KIcon::NoGroup, KIcon::SizeHuge));
item->setHeaderText(i18n("Get New Stuff"));
item->setDescriptionText(i18n("Download new themes."));
@@ -142,7 +142,7 @@ void ThemesDlg::populateListbox()
tableThemes->insertItem(item);
item = new ThemeWidget;
- item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("ksysguard",
+ item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("ksysguard",
KIcon::NoGroup, KIcon::SizeHuge));
item->setHeaderText(i18n("Open Local Theme"));
item->setDescriptionText(i18n("Add local theme to the list."));
@@ -217,7 +217,7 @@ void ThemesDlg::openLocalTheme()
void ThemesDlg::getNewStuff()
{
#ifdef HAVE_KNEWSTUFF
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writePathEntry("ProvidersUrl",
TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
@@ -301,7 +301,7 @@ void ThemesDlg::addThemeToDialog(const KArchiveDirectory *archiveDir,
void ThemesDlg::writeNewStuffConfig(const TQString &file)
{
#ifdef HAVE_KNEWSTUFF
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
TQStringList keys = config->entryMap("KNewStuffStatus").keys();
for(TQStringList::Iterator it = m_newStuffStatus.begin();
@@ -321,7 +321,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
void ThemesDlg::configSanityCheck()
{
#ifdef HAVE_KNEWSTUFF
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys();
TQStringList nameKeys = config->entryMap("KNewStuffNames").keys();
TQStringList removeList;
@@ -427,7 +427,7 @@ bool ThemesDlg::filter(int index, TQWidget* widget, void* data)
bool ThemesDlg::isDownloaded( const TQString& path )
{
kdDebug() << "isDownloaded path: " << path << endl;
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
return !config->readEntry(path).isEmpty();
}
@@ -442,7 +442,7 @@ void ThemesDlg::uninstall()
karambaApp->dcopIface()->closeTheme(tf->name());
if(!KProtocolInfo::isKnownProtocol(trash))
- trash = KGlobalSettings::trashPath();
+ trash = TDEGlobalSettings::trashPath();
if(!tf->isZipTheme())
{
@@ -478,7 +478,7 @@ void ThemesDlg::uninstall()
}
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(tempPath);
if(!name.isEmpty())
@@ -508,7 +508,7 @@ void ThemesDlg::uninstall()
tableThemes->removeItem(w);
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(theme.path());
if(!name.isEmpty())