diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index 416bcf5..17cded0 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -82,7 +82,7 @@ KMFSysTray::~KMFSysTray() {}
 
 void KMFSysTray::initMenu() {
 	KPopupMenu* menu = contextMenu ();
-	menu->insertItem( KGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K );
+	menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K );
 	
 }
 
@@ -98,10 +98,10 @@ void KMFSysTray::slotSetRunningStatus( bool on ) {
 
 
 void KMFSysTray::slotLaunchKMF () {
-	KProcess *childproc = new KProcess();
+	TDEProcess *childproc = new TDEProcess();
 	*childproc << "tdesu";
  	*childproc << "kmyfirewall";
-	childproc->start( KProcess:: DontCare, KProcess::NoCommunication );
+	childproc->start( TDEProcess:: DontCare, TDEProcess::NoCommunication );
 }
 
 void KMFSysTray::slotShowDetails() {
@@ -156,7 +156,7 @@ void KMFSysTray::resizeEvent( TQResizeEvent *e ) {}
 
 // extern "C" {
 // 	KPanelApplet * init( TQWidget * parent, const TQString & configFile ) {
-// 		KGlobal::locale() ->insertCatalogue( "kmfsystray" );
+// 		TDEGlobal::locale() ->insertCatalogue( "kmfsystray" );
 // 		return new KMFSysTray( configFile, KPanelApplet::Normal,
 // 		                       KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
 // 		                       parent, "kmfsystray" );
diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp
index f948b77..ef0b415 100644
--- a/kmyfirewall/core/kmfapp.cpp
+++ b/kmyfirewall/core/kmfapp.cpp
@@ -43,7 +43,7 @@ void set_splash_status( const TQString& msg ) {
 		return ;
 	splash->repaint( FALSE );
 	TQPainter p( splash );
-	TQFont f( KGlobalSettings::generalFont().family(), 8, TQFont::Bold );
+	TQFont f( TDEGlobalSettings::generalFont().family(), 8, TQFont::Bold );
 	p.setFont( f );
 	p.setPen( TQt::white );
 	p.drawText( splash->width() / 2 - splash->fontMetrics().width( msg ) / 2, 265, msg );
@@ -62,7 +62,7 @@ void showSplash() {
 		kdDebug() << "\nFound Splashscreen at: " << dir << endl;
 
 		TQPixmap pic = TQPixmap::fromMimeSource( dir );
-		TQFont f( KGlobalSettings::generalFont().family(), 8, TQFont::Bold );
+		TQFont f( TDEGlobalSettings::generalFont().family(), 8, TQFont::Bold );
 		if ( pic.isNull() )
 			return ;
 		TQPainter p( &pic );
diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp
index 5cd9801..b6c69ef 100644
--- a/kmyfirewall/core/kmftarget.cpp
+++ b/kmyfirewall/core/kmftarget.cpp
@@ -208,17 +208,17 @@ KMFError* KMFTarget::tryAutoConfiguration() {
 	KMFError* err = new KMFError();
 	
 	if ( isLocalExecuteTarget() ) {
-		KProcessWrapper::instance()->slotStartLocalJob( "autoconf", "uname", false, true );
+		TDEProcessWrapper::instance()->slotStartLocalJob( "autoconf", "uname", false, true );
 	} else {
-		KProcessWrapper::instance()->slotStartRemoteJob( "autoconf", "uname", rulesetDoc()->target() );
+		TDEProcessWrapper::instance()->slotStartRemoteJob( "autoconf", "uname", rulesetDoc()->target() );
 	}
-	if ( KProcessWrapper::instance()->exitStatus() != 0 ) {	
-		kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
+	if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {	
+		kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
 		err->setErrType( KMFError::NORMAL );
-		err->setErrMsg( KProcessWrapper::instance()->stdErr() );
+		err->setErrMsg( TDEProcessWrapper::instance()->stdErr() );
 		return err;	 
 	}
-	TQString retValUname = KProcessWrapper::instance()->stdCombined();
+	TQString retValUname = TDEProcessWrapper::instance()->stdCombined();
 	kdDebug() << "Found OS: " << retValUname << endl;
 	
 	config()->setOS( retValUname.lower().remove( "\n" ).remove( " " ) );
@@ -227,7 +227,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
 	path.append( config()->oS().lower() );
 	path.append( "/autoconfighelper.sh" );
 	kdDebug() << "Search Path: " << path << endl;
-	TQString localFile = KGlobal::dirs() ->findResource( "data", path );
+	TQString localFile = TDEGlobal::dirs() ->findResource( "data", path );
 	
 	if ( ! KIO::NetAccess::exists( localFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
 		kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl;
@@ -238,19 +238,19 @@ KMFError* KMFTarget::tryAutoConfiguration() {
 	}
 	
 	if ( isLocalExecuteTarget() ) {
-		KProcessWrapper::instance()->slotStartLocalJob( "autoconf", localFile, false, true );
+		TDEProcessWrapper::instance()->slotStartLocalJob( "autoconf", localFile, false, true );
 	} else {
-		KProcessWrapper::instance()->slotStartRemoteJob( "autoconf", localFile, rulesetDoc()->target() );
+		TDEProcessWrapper::instance()->slotStartRemoteJob( "autoconf", localFile, rulesetDoc()->target() );
 	}
 	
 	
-	if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-		kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
+	if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+		kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
 		err->setErrType( KMFError::NORMAL );
-		err->setErrMsg( KProcessWrapper::instance()->stdErr() );
+		err->setErrMsg( TDEProcessWrapper::instance()->stdErr() );
 		return err;	 
 	}
-	TQString retVal = KProcessWrapper::instance()->stdCombined();
+	TQString retVal = TDEProcessWrapper::instance()->stdCombined();
 	kdDebug() << "AutoConf XML: \n"<< retVal << endl;
 	TQDomDocument doc;
 	doc.setContent( retVal );
@@ -275,7 +275,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
 // 	kdDebug() << "KMFTarget::slotProcessFinished( const TQString& jobName, int status, bool exitedNormal, const TQString& stdOut, const TQString& stdErr, const TQString& completeOut )" << endl;
 // 	
 // 	disconnect( 
-// 		KProcessWrapper::instance(), 
+// 		TDEProcessWrapper::instance(), 
 // 		TQT_SIGNAL( sigProcessFinished( 
 // 			const TQString&, 
 // 			int, 
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index 6ecbd99..0f13cc0 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -33,10 +33,10 @@ namespace KMF {
 
 //##########  KMFUndoEngine  ##############
 //#### static stuff
-KProcessWrapper* KProcessWrapper::m_instance = 0;
-KProcessWrapper* KProcessWrapper::instance() {
+TDEProcessWrapper* TDEProcessWrapper::m_instance = 0;
+TDEProcessWrapper* TDEProcessWrapper::instance() {
 	if ( ! m_instance ) {
-		m_instance = new KProcessWrapper( TQT_TQOBJECT(TDEApplication::kApplication()->mainWidget()) , "KProcessWrapper" );
+		m_instance = new TDEProcessWrapper( TQT_TQOBJECT(TDEApplication::kApplication()->mainWidget()) , "TDEProcessWrapper" );
 	}
 	return m_instance;
 }
@@ -44,23 +44,23 @@ KProcessWrapper* KProcessWrapper::instance() {
 
 
 
-KProcessWrapper::KProcessWrapper( TQObject* parent,  const char* name ) : TQObject( parent, name ) {
+TDEProcessWrapper::TDEProcessWrapper( TQObject* parent,  const char* name ) : TQObject( parent, name ) {
 	m_stderrbuf = new TQString( "" );
 	m_stdoutbuf = new TQString( "" );
-	m_childproc = new KProcess();
+	m_childproc = new TDEProcess();
 	m_status = -1;
 	m_exitedNormal = false;
 	
-	connect( m_childproc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( KProcess*, char*, int ) ) );
-	connect( m_childproc, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( KProcess*, char*, int ) ) );
-	connect( m_childproc, TQT_SIGNAL( processExited( KProcess* ) ), this, TQT_SLOT( slotProcessExited( KProcess* ) ) ) ;
+	connect( m_childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
+	connect( m_childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );
+	connect( m_childproc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
 }
 
-KProcessWrapper::~KProcessWrapper()
+TDEProcessWrapper::~TDEProcessWrapper()
 {
 }
 
-void KProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQString& command, bool useKdeSu , bool synchronous = false  ) {
+void TDEProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQString& command, bool useKdeSu , bool synchronous = false  ) {
 	kdDebug() << "Start Local Job: " << jobName << " " << command << endl;
 	kdDebug() << "synchronous: " << synchronous << endl;
 	m_jobName = jobName;
@@ -72,7 +72,7 @@ void KProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQString
 	TQString localScriptFile = command;
 	KTempFile *f = new KTempFile();
 	if ( ! KIO::NetAccess::exists( localScriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
-		kdDebug() << "KProcessWrapper::slotStartLocalJob(...) - creating temporary script file." << endl;
+		kdDebug() << "TDEProcessWrapper::slotStartLocalJob(...) - creating temporary script file." << endl;
 		TQTextStream *ts = f->textStream();
 		*ts << command << endl;
 		f->sync();
@@ -88,15 +88,15 @@ void KProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQString
 		*m_childproc << "bash" << localScriptFile;
 	}
 	if ( synchronous ) {
-		m_childproc->start( KProcess::Block, KProcess::AllOutput );
+		m_childproc->start( TDEProcess::Block, TDEProcess::AllOutput );
 	} else {
-		m_childproc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
+		m_childproc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
 	}
 	f->unlink();
 	delete f;
 } 
 
-void KProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQString& scriptFile, KMFTarget* execHost ) {
+void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQString& scriptFile, KMFTarget* execHost ) {
 	TQString localScriptFile = scriptFile;
 	m_jobName = jobName;
 	*m_stdoutbuf = "";
@@ -106,7 +106,7 @@ void KProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStrin
 	m_stdErr = "";
 	KTempFile *f = new KTempFile();
 	if ( ! KIO::NetAccess::exists( scriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) {
-		kdDebug() << "KProcessWrapper::slotStartRemoteJob(...) - creating temporary script file." << endl;
+		kdDebug() << "TDEProcessWrapper::slotStartRemoteJob(...) - creating temporary script file." << endl;
 		TQTextStream *ts = f->textStream();
 		*ts << scriptFile << endl;
 		f->sync();
@@ -173,13 +173,13 @@ void KProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStrin
 
 
 
-void KProcessWrapper::slotKillJob() {
-	kdDebug() << "void KProcessWrapper::killJob()" << endl;
+void TDEProcessWrapper::slotKillJob() {
+	kdDebug() << "void TDEProcessWrapper::killJob()" << endl;
 	m_childproc->kill();
 }
 
-void KProcessWrapper::slotReceivedOutput( KProcess *, char *buffer, int buflen ) {
-	kdDebug() << "KProcessWrapper::slotReceivedOutput( KProcess *, char *buffer, int buflen )" << endl;
+void TDEProcessWrapper::slotReceivedOutput( TDEProcess *, char *buffer, int buflen ) {
+	kdDebug() << "TDEProcessWrapper::slotReceivedOutput( TDEProcess *, char *buffer, int buflen )" << endl;
 	if ( !m_stderrbuf->isEmpty() ) {
 		m_allOut.append( *m_stderrbuf );
 		m_stdErr.append( *m_stderrbuf );
@@ -204,8 +204,8 @@ void KProcessWrapper::slotReceivedOutput( KProcess *, char *buffer, int buflen )
 // 	}
 }
 
-void KProcessWrapper::slotReceivedError( KProcess *, char *buffer, int buflen ) {
-	kdDebug() << "KProcessWrapper::slotReceivedError( KProcess *, char *buffer, int buflen )" << endl;
+void TDEProcessWrapper::slotReceivedError( TDEProcess *, char *buffer, int buflen ) {
+	kdDebug() << "TDEProcessWrapper::slotReceivedError( TDEProcess *, char *buffer, int buflen )" << endl;
 	// Flush stdout buffer
 	if ( !m_stdoutbuf->isEmpty() ) {
 		// Do What
@@ -228,8 +228,8 @@ void KProcessWrapper::slotReceivedError( KProcess *, char *buffer, int buflen )
 	}*/
 }
 
-void KProcessWrapper::slotProcessExited( KProcess* ) {
-	kdDebug() << "KProcessWrapper::slotProcessExited()" << endl;
+void TDEProcessWrapper::slotProcessExited( TDEProcess* ) {
+	kdDebug() << "TDEProcessWrapper::slotProcessExited()" << endl;
 	m_status = m_childproc->exitStatus();
 	m_exitedNormal = m_childproc->normalExit();
 	
diff --git a/kmyfirewall/core/kprocesswrapper.h b/kmyfirewall/core/kprocesswrapper.h
index d7f0a41..c426627 100644
--- a/kmyfirewall/core/kprocesswrapper.h
+++ b/kmyfirewall/core/kprocesswrapper.h
@@ -20,7 +20,7 @@
 // KDE includes
 
 
-class KProcess;
+class TDEProcess;
 
 // Project includes
 namespace KMF {
@@ -29,23 +29,23 @@ class KMFTarget;
 /**
 	@author Christian Hubinger <chubinger@irrsinnig.org>
 */
-class KProcessWrapper : public TQObject {
+class TDEProcessWrapper : public TQObject {
 Q_OBJECT
   
 
 //############# Beginn static stuff ##############	
 public:
 	/** return the one and only instance */
-	static KProcessWrapper* instance();
+	static TDEProcessWrapper* instance();
 private:	
-	static KProcessWrapper* m_instance;
+	static TDEProcessWrapper* m_instance;
 	
 //############# End static stuff ##############
 
 public:
-    KProcessWrapper( TQObject*, const char* );
+    TDEProcessWrapper( TQObject*, const char* );
 
-    ~KProcessWrapper();
+    ~TDEProcessWrapper();
 
 	bool isRunning();
 	
@@ -75,9 +75,9 @@ public slots:
 	void slotStartRemoteJob( const TQString& jobName, const TQString& scriptFile, KMFTarget* execHost ); 
 
 protected slots:
-	void slotReceivedOutput( KProcess*, char*, int );
-	void slotReceivedError( KProcess*, char*, int );
-	void slotProcessExited( KProcess* );
+	void slotReceivedOutput( TDEProcess*, char*, int );
+	void slotReceivedError( TDEProcess*, char*, int );
+	void slotProcessExited( TDEProcess* );
 		
 
 private:
@@ -91,7 +91,7 @@ private:
 	
 	TQString m_stdOut;
 	TQString m_stdErr;
-	KProcess* m_childproc;
+	TDEProcess* m_childproc;
 
 signals:
 	void sigProcessFinished( const TQString& jobName, int status, bool exitedNormal, const TQString& stdOut, const TQString& stdErr, const TQString& completeOut );
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface.cpp b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
index b63ae03..6abfb2b 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
@@ -207,7 +207,7 @@ void KMFGenericInterface::slotPageChanged( TQWidget* /*wid*/ ){
 
 void KMFGenericInterface::loadIcons() {
 	kdDebug() << "void KMFGenericInterface::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal:: iconLoader();
+	KIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "network";
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
index bb53954..2b7a674 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
@@ -448,7 +448,7 @@ KMFListViewItem* KMFGenericInterfaceHost::findKMFItem( const TQUuid& obj_id ) {
 
 void KMFGenericInterfaceHost::loadIcons() {
 	kdDebug() << "void KMFGenericInterfa::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal:: iconLoader();
+	KIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
index 3f6a328..7ff5151 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
@@ -613,7 +613,7 @@ void KMFGenericInterfaceProtocol::slotRenameItem( TQListViewItem* item, int, con
  
 void KMFGenericInterfaceProtocol::loadIcons() {
 	kdDebug() << "void KMFGenericInterfa::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal:: iconLoader();
+	KIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp
index 203edf3..69e6788 100644
--- a/kmyfirewall/installer/kmfinstallerplugin.cpp
+++ b/kmyfirewall/installer/kmfinstallerplugin.cpp
@@ -379,10 +379,10 @@ void KMFInstallerPlugin::slotGenerateInstallerPackage() {
 		
 		TQString remPath = url.protocol();
 		if ( url.isLocalFile() ) {
-			KProcess *proc = new KProcess();
+			TDEProcess *proc = new TDEProcess();
 			*proc << "chmod";
 			*proc << "700" << url.path();
-			proc->start( KProcess::Block );
+			proc->start( TDEProcess::Block );
 			delete proc;
 			proc = 0;
 			kdDebug() << "Set perms for: " << url.path() << endl;
diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
index 6e153ea..3b1da48 100644
--- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp
+++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
@@ -205,7 +205,7 @@ void KMFIPTInstaller::cmdRunFW() {
 		}
 		
 		TQString cmd = "bash " + temp_file->name() + " -v start";
-		// KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
+		// TDEProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
 		setOutputWidget( execWidget() );
 		execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
 		showOutput();
@@ -246,16 +246,16 @@ void KMFIPTInstaller::cmdRunFW() {
 		
 		generateInstallerPackage( rulesetDoc()->target() );
 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --start";
-		KProcessWrapper::instance()->slotStartRemoteJob( Constants::StartFirewallJob_Name, cmd, rulesetDoc()->target() );
+		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::StartFirewallJob_Name, cmd, rulesetDoc()->target() );
 	
-		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 			return;	 
 		}
 			
 		setOutputWidget( execWidget() );
-		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 		showOutput();
 		checkStatus();
 	}
@@ -294,16 +294,16 @@ void KMFIPTInstaller::cmdStopFW() {
 		
 		generateInstallerPackage( rulesetDoc()->target() );
 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --stop";
-		KProcessWrapper::instance()->slotStartRemoteJob( Constants::StopFirewallJob_Name, cmd, rulesetDoc()->target() );
+		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::StopFirewallJob_Name, cmd, rulesetDoc()->target() );
 
-		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 			return;	 
 		}
 			
 		setOutputWidget( execWidget() );
-		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 		showOutput();
 		checkStatus();
 	}
@@ -322,7 +322,7 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) {
 	}
 	
 	if( rulesetDoc()->target()->isLocalExecuteTarget() ) {
-		// KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
+		// TDEProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
 		setOutputWidget( execWidget() );
 		execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name,  i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ), true );
 		showOutput();
@@ -331,16 +331,16 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) {
 		setOutputWidget( execWidget() );
 		execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 		showOutput();
-		KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
+		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
 	
-		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 			return;	 
 		}
 		
 		setOutputWidget( execWidget() );
-		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() )  );
+		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() )  );
 		showOutput();
 	}
 }
@@ -360,7 +360,7 @@ void KMFIPTInstaller::cmdInstallFW() {
 	}
 	
 	if ( rulesetDoc()->target()->isLocalExecuteTarget() ) {
-		KURL url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
+		KURL url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
 		TQString installscript = url.path();
 
 		if ( installscript.isEmpty() ) {
@@ -434,16 +434,16 @@ void KMFIPTInstaller::cmdInstallFW() {
 			
 		generateInstallerPackage( rulesetDoc()->target() );
 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --install";
-		KProcessWrapper::instance()->slotStartRemoteJob( Constants::InstallFirewallJob_Name, cmd, rulesetDoc()->target() );
+		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::InstallFirewallJob_Name, cmd, rulesetDoc()->target() );
 	
-		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 			return;	 
 		}
 		
 		setOutputWidget( execWidget() );
-		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 		showOutput();
 		checkStatus();	
 	}
@@ -463,7 +463,7 @@ void KMFIPTInstaller::cmdUninstallFW() {
 		
 		
 	if ( rulesetDoc()->target()->isLocalExecuteTarget() ) {
-		KURL url (KGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
+		KURL url (TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
 		TQString installscript = url.path();
 
 		if ( installscript.isEmpty() ) {
@@ -516,7 +516,7 @@ void KMFIPTInstaller::cmdUninstallFW() {
 			systemtype = "sysv";
 
 		TQString cmd = "bash " + installscript + " uninstall " + systemtype + " " + conf->initPath() + " " + conf->rcDefaultPath();
-		// KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
+		// TDEProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
 	
 		setOutputWidget( execWidget() );
 		execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name,  i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
@@ -530,16 +530,16 @@ void KMFIPTInstaller::cmdUninstallFW() {
 			
 		generateInstallerPackage( rulesetDoc()->target() );
 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --uninstall";
-		KProcessWrapper::instance()->slotStartRemoteJob( Constants::UninstallFirewallJob_Name, cmd, rulesetDoc()->target() );
+		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::UninstallFirewallJob_Name, cmd, rulesetDoc()->target() );
 		
-		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 			return;	 
 		}
 		
 		setOutputWidget( execWidget() );
-		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 		showOutput();
 		checkStatus();
 	}	
@@ -908,7 +908,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
 	KTempFile *kmf_pkg_intsall = new KTempFile();	
 	KTempFile *kmf_install_package = new KTempFile();
 	
-	KURL readme_url ( KGlobal::dirs() ->findResource( "appdata", "README.InstallerPackage.txt" ));
+	KURL readme_url ( TDEGlobal::dirs() ->findResource( "appdata", "README.InstallerPackage.txt" ));
 	if ( readme_url.path().isEmpty() ) {
 		TQString msg = i18n( "<p>Unable to find the package README script <b>README.InstallerPackage.txt</b>"
 				"<p>Please check your installation. Usually this file is installed in "
@@ -921,7 +921,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
 	kdDebug() << "found readme script: " << readme_url.path() << endl;	
 	
 	
-	KURL kmfinstall_url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfinstall.sh" ));
+	KURL kmfinstall_url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfinstall.sh" ));
 	if ( kmfinstall_url.path().isEmpty() ) {
 		TQString msg = i18n( "<p>Unable to find install script <b>kmfinstall.sh</b>"
 				"<p>Please check your installation. Usually this script is installed in "
@@ -938,7 +938,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
 
 	
 	
-	KURL kmfpgkinstall_url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfpkginstall.sh" ));
+	KURL kmfpgkinstall_url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfpkginstall.sh" ));
 	if ( kmfpgkinstall_url.path().isEmpty() ) {
 		TQString msg = i18n( "<p>Unable to find install script <b>kmfinstall.sh</b>"
 				"<p>Please check your installation. Usually this script is installed in "
@@ -954,7 +954,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
 	parseFileHeaders( kmfpgkinstall_url.path(), kmf_pkg_intsall->name() );
 	
 	
-	KURL kmf_install_package_url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/installpackage.sh" ));
+	KURL kmf_install_package_url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/installpackage.sh" ));
 	if ( kmf_install_package_url.path().isEmpty() ) {
 		TQString msg = i18n( "<p>Unable to find install package script <b>installpackage.sh</b>"
 				"<p>Please check your installation. Usually this script is installed in "
@@ -1120,7 +1120,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
 
 void KMFIPTInstaller::loadIcons() {
 	kdDebug() << "void KMFIPTInstaller::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal:: iconLoader();
+	KIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 	icon_name = "encrypted";
 	icon_run = loader->loadIcon( icon_name, KIcon::Toolbar );
diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
index f620abc..cf4c68d 100644
--- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
+++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
@@ -216,7 +216,7 @@ void KMFPFInstaller::cmdRunFW() {
 // 		}
 // 		
 // 		TQString cmd = "bash " + file + " -v start";
-// 		// KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
+// 		// TDEProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
 // 		setOutputWidget( execWidget() );
 // 		execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
 // 		showOutput();
@@ -257,16 +257,16 @@ void KMFPFInstaller::cmdRunFW() {
 // 		
 // 		generateInstallerPackage( rulesetDoc()->target() );
 // 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --start";
-// 		KProcessWrapper::instance()->slotStartRemoteJob( Constants::StartFirewallJob_Name, cmd, rulesetDoc()->target() );
+// 		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::StartFirewallJob_Name, cmd, rulesetDoc()->target() );
 // 	
-// 		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-// 			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-// 			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+// 		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+// 			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+// 			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 // 			return;	 
 // 		}
 // 			
 // 		setOutputWidget( execWidget() );
-// 		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+// 		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 // 		showOutput();
 // 		checkStatus();
 // 	}
@@ -305,16 +305,16 @@ void KMFPFInstaller::cmdStopFW() {
 // 		
 // 		generateInstallerPackage( rulesetDoc()->target() );
 // 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --stop";
-// 		KProcessWrapper::instance()->slotStartRemoteJob( Constants::StopFirewallJob_Name, cmd, rulesetDoc()->target() );
+// 		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::StopFirewallJob_Name, cmd, rulesetDoc()->target() );
 // 
-// 		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-// 			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-// 			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+// 		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+// 			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+// 			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 // 			return;	 
 // 		}
 // 			
 // 		setOutputWidget( execWidget() );
-// 		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+// 		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 // 		showOutput();
 // 		checkStatus();
 // 	}
@@ -333,7 +333,7 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) {
 // 	}
 // 	
 // 	if( rulesetDoc()->target()->isLocalExecuteTarget() ) {
-// 		// KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
+// 		// TDEProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
 // 		setOutputWidget( execWidget() );
 // 		execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name,  i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ), true );
 // 		showOutput();
@@ -342,16 +342,16 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) {
 // 		setOutputWidget( execWidget() );
 // 		execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 // 		showOutput();
-// 		KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
+// 		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
 // 	
-// 		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-// 			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-// 			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+// 		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+// 			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+// 			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 // 			return;	 
 // 		}
 // 		
 // 		setOutputWidget( execWidget() );
-// 		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() )  );
+// 		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() )  );
 // 		showOutput();
 // 	}
 }
@@ -371,7 +371,7 @@ void KMFPFInstaller::cmdInstallFW() {
 // 	}
 // 	
 // 	if ( rulesetDoc()->target()->isLocalExecuteTarget() ) {
-// 		KURL url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
+// 		KURL url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
 // 		TQString installscript = url.path();
 // 
 // 		if ( installscript.isEmpty() ) {
@@ -434,7 +434,7 @@ void KMFPFInstaller::cmdInstallFW() {
 // 			systemtype = "sysv";
 // 
 // 		TQString cmd = "bash " + installscript + " install " + systemtype + " " + conf->initPath() + " " + conf->rcDefaultPath() + " " + initscript + " " + fwscript;
-// 	//	KProcessWrapper::instance()->slotStartLocalJob( "installfirewall", cmd, true, true );
+// 	//	TDEProcessWrapper::instance()->slotStartLocalJob( "installfirewall", cmd, true, true );
 // 		
 // 		setOutputWidget( execWidget() );
 // 		execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
@@ -447,16 +447,16 @@ void KMFPFInstaller::cmdInstallFW() {
 // 			
 // 		generateInstallerPackage( rulesetDoc()->target() );
 // 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --install";
-// 		KProcessWrapper::instance()->slotStartRemoteJob( Constants::InstallFirewallJob_Name, cmd, rulesetDoc()->target() );
+// 		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::InstallFirewallJob_Name, cmd, rulesetDoc()->target() );
 // 	
-// 		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-// 			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-// 			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+// 		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+// 			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+// 			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 // 			return;	 
 // 		}
 // 		
 // 		setOutputWidget( execWidget() );
-// 		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+// 		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 // 		showOutput();
 // 		checkStatus();	
 // 	}
@@ -476,7 +476,7 @@ void KMFPFInstaller::cmdUninstallFW() {
 // 		
 // 		
 // 	if ( rulesetDoc()->target()->isLocalExecuteTarget() ) {
-// 		KURL url (KGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
+// 		KURL url (TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/linux/kmfinstall.sh" ));
 // 		TQString installscript = url.path();
 // 
 // 		if ( installscript.isEmpty() ) {
@@ -529,7 +529,7 @@ void KMFPFInstaller::cmdUninstallFW() {
 // 			systemtype = "sysv";
 // 
 // 		TQString cmd = "bash " + installscript + " uninstall " + systemtype + " " + conf->initPath() + " " + conf->rcDefaultPath();
-// 		// KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
+// 		// TDEProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
 // 	
 // 		setOutputWidget( execWidget() );
 // 		execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name,  i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
@@ -543,16 +543,16 @@ void KMFPFInstaller::cmdUninstallFW() {
 // 			
 // 		generateInstallerPackage( rulesetDoc()->target() );
 // 		TQString cmd = "cd /tmp/; sh ./kmfpackage.kmfpkg -q --uninstall";
-// 		KProcessWrapper::instance()->slotStartRemoteJob( Constants::UninstallFirewallJob_Name, cmd, rulesetDoc()->target() );
+// 		TDEProcessWrapper::instance()->slotStartRemoteJob( Constants::UninstallFirewallJob_Name, cmd, rulesetDoc()->target() );
 // 		
-// 		if ( KProcessWrapper::instance()->exitStatus() != 0 ) {
-// 			kdDebug() << "ERROR:" << KProcessWrapper::instance()->stdErr() << endl;
-// 			KMessageBox::error( 0, KProcessWrapper::instance()->stdCombined() );
+// 		if ( TDEProcessWrapper::instance()->exitStatus() != 0 ) {
+// 			kdDebug() << "ERROR:" << TDEProcessWrapper::instance()->stdErr() << endl;
+// 			KMessageBox::error( 0, TDEProcessWrapper::instance()->stdCombined() );
 // 			return;	 
 // 		}
 // 		
 // 		setOutputWidget( execWidget() );
-// 		execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
+// 		execWidget()->setText( TDEProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() )  );
 // 		showOutput();
 // 		checkStatus();
 // 	}	
@@ -866,7 +866,7 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
 // 	KTempFile *kmf_pkg_intsall = new KTempFile();	
 // 	KTempFile *kmf_install_package = new KTempFile();
 // 	
-// 	KURL readme_url ( KGlobal::dirs() ->findResource( "appdata", "README.InstallerPackage.txt" ));
+// 	KURL readme_url ( TDEGlobal::dirs() ->findResource( "appdata", "README.InstallerPackage.txt" ));
 // // 	TQString readme_txt = readme_url.path();
 // 	if ( readme_url.path().isEmpty() ) {
 // 		TQString msg = i18n( "<p>Unable to find the package README script <b>README.InstallerPackage.txt</b>"
@@ -880,7 +880,7 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
 // 	kdDebug() << "found readme script: " << readme_url.path() << endl;	
 // 	
 // 	
-// 	KURL kmfinstall_url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfinstall.sh" ));
+// 	KURL kmfinstall_url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfinstall.sh" ));
 // 	if ( kmfinstall_url.path().isEmpty() ) {
 // 		TQString msg = i18n( "<p>Unable to find install script <b>kmfinstall.sh</b>"
 // 				"<p>Please check your installation. Usually this script is installed in "
@@ -896,7 +896,7 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
 // 
 // 	
 // 	
-// 	KURL kmfpgkinstall_url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfpkginstall.sh" ));
+// 	KURL kmfpgkinstall_url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/kmfpkginstall.sh" ));
 // 	if ( kmfpgkinstall_url.path().isEmpty() ) {
 // 		TQString msg = i18n( "<p>Unable to find install script <b>kmfinstall.sh</b>"
 // 				"<p>Please check your installation. Usually this script is installed in "
@@ -911,7 +911,7 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
 // 	parseFileHeaders( kmfpgkinstall_url.path(), kmf_pkg_intsall->name() );
 // 	
 // 	
-// 	KURL kmf_install_package_url ( KGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/installpackage.sh" ));
+// 	KURL kmf_install_package_url ( TDEGlobal::dirs() ->findResource( "appdata", "scripts/installer/" + target->config()->oS() + "/installpackage.sh" ));
 // 	if ( kmf_install_package_url.path().isEmpty() ) {
 // 		TQString msg = i18n( "<p>Unable to find install package script <b>installpackage.sh</b>"
 // 				"<p>Please check your installation. Usually this script is installed in "
@@ -1080,7 +1080,7 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
 // 
 // void KMFPFInstaller::loadIcons() {
 // 	kdDebug() << "void KMFPFInstaller::loadIcons()" << endl;
-// 	KIconLoader *loader = KGlobal:: iconLoader();
+// 	KIconLoader *loader = TDEGlobal:: iconLoader();
 // 	TQString icon_name;
 // 	icon_name = "encrypted";
 // 	icon_run = loader->loadIcon( icon_name, KIcon::Toolbar );
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index 9324902..83e4e25 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -90,7 +90,7 @@ KMFIPTEditorPart::KMFIPTEditorPart( TQWidget *parentWidget, const char *widgetNa
 	                                0 , this, TQT_SLOT( slotDelChain() ), actionCollection(), "del_chain" );
 
 	
-	m_actionNewRule = new KAction( i18n( "Add New Rule..." ), TQIconSet( KGlobal:: iconLoader()->loadIcon( "rule", KIcon::Toolbar ) ) ,
+	m_actionNewRule = new KAction( i18n( "Add New Rule..." ), TQIconSet( TDEGlobal:: iconLoader()->loadIcon( "rule", KIcon::Toolbar ) ) ,
 								   KStdAccel::shortcut(KStdAccel::New) , this, TQT_SLOT( slotNewRule() ), actionCollection(), "new_rule" );
 	
 //	m_actionNewRule->setIconSet( TQIconSet(  loader->loadIcon( "rule-22", KIcon::User ) ) );							   
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index 760d484..0746f2c 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -1446,7 +1446,7 @@ void KMFRuleEdit::slotHelp() {
 }
 void KMFRuleEdit::loadIcons() {
 	kdDebug() << "void KMFRuleEdit::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal:: iconLoader();
+	KIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp
index afb8ecf..4017ac3 100644
--- a/kmyfirewall/kmfconfigdialog.cpp
+++ b/kmyfirewall/kmfconfigdialog.cpp
@@ -392,7 +392,7 @@ void KMFConfigDialog::slotEnableWarnings() {
 }
 
 void KMFConfigDialog::loadIcons() {
-	KIconLoader * loader = KGlobal:: iconLoader();
+	KIconLoader * loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "about_kde";
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
index 4f1d7c7..5db3c42 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
+++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
@@ -88,7 +88,7 @@ void KMFCheckListOutput::clearList() {
 
 void KMFCheckListOutput::loadIcons() {
 	kdDebug() << "void KMFCheckListOutput::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal::iconLoader();
+	KIconLoader *loader = TDEGlobal::iconLoader();
 	TQString icon_name;
 
 	icon_name = "stop";
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index 05c5e8d..bcd49a0 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -1062,7 +1062,7 @@ KMFListViewItem* KMFListView::findKMFItem( const TQString & text1, int column1,c
 
 void KMFListView::loadIcons() {
 	kdDebug() << "void KMFListView::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal::iconLoader();
+	KIconLoader *loader = TDEGlobal::iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
diff --git a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
index 3ed6968..fd7b20a 100644
--- a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
@@ -162,7 +162,7 @@ void KMFListViewItem::setupProtocolView() {
 		delete firstChild();
 	}
 	
-	setPixmap(0, KGlobal:: iconLoader()->loadIcon("kmyfirewall", KIcon::Small ) );
+	setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("kmyfirewall", KIcon::Small ) );
 	setText( 0, protocol()->name() );
 	setText( 1, protocol()->description() );
 	// setOpen( true );
@@ -190,7 +190,7 @@ void KMFListViewItem::setupProtocolCategoryView() {
 		delete firstChild();
 	}
 	
-	setPixmap(0, KGlobal::iconLoader()->loadIcon( "folder" , KIcon::Small ) );
+	setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "folder" , KIcon::Small ) );
 	setText( 0, protocolCategory()->name() );
 	setText( 1, protocolCategory()->description() );
 
@@ -209,9 +209,9 @@ void KMFListViewItem::setupTargetView() {
 // 		setFont( TQFont::Bold );
 // 	}
 	if ( target()->isCurrentTarget() ) {
-		setPixmap(0, KGlobal:: iconLoader()->loadIcon("kmyfirewall", KIcon::Small ) );
+		setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("kmyfirewall", KIcon::Small ) );
 	} else {
-		setPixmap(0, KGlobal:: iconLoader()->loadIcon("enhanced_browsing", KIcon::Small ) );
+		setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("enhanced_browsing", KIcon::Small ) );
 	}
 	setText( 0, target()->guiName() );
 	setText( 1,"[" +  target()->address()->toString() + "]" );
@@ -221,7 +221,7 @@ void KMFListViewItem::setupTargetView() {
 }
 
 void KMFListViewItem::setupNetHostView() {
-	setPixmap(0, KGlobal:: iconLoader()->loadIcon("home_white", KIcon::Small ) );
+	setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("home_white", KIcon::Small ) );
 	setText( 0, host()->guiName() );
 	setText( 1,"[" +  host()->address()->toString() + "]" );
 		
@@ -240,7 +240,7 @@ void KMFListViewItem::setupZoneView() {
 	if ( type() != NetfilterObject::NETZONE ) {
 		return;
 	}
-	KIconLoader *loader = KGlobal:: iconLoader();
+	KIconLoader *loader = TDEGlobal:: iconLoader();
 
 	setText( 0,m_zone->guiName() );
 	if ( m_zone->name() == "incoming_world" || m_zone->name() == "outgoing_world" ) {
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index 1c38b96..4239885 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -265,7 +265,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
 			}
 			if ( ! m_target->isCurrentTarget() ) {
 				m_contextMenu->insertSeparator();
-				m_contextMenu->insertItem( KGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Make Active Target..." ), this, TQT_SLOT( slotSetActiveTarget() ) );
+				m_contextMenu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Make Active Target..." ), this, TQT_SLOT( slotSetActiveTarget() ) );
 			}
 			
 			m_contextMenu->popup( point );
@@ -513,7 +513,7 @@ KMFListViewItem* KMFMyNetworkWidget::findItem( const TQUuid& obj_id ) {
 /*$SPECIALIZATION$*/
 void KMFMyNetworkWidget::loadIcons() {
 	kdDebug() << "void KMFGenericInterfa::loadIcons()" << endl;
-	KIconLoader *loader = KGlobal:: iconLoader();
+	KIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp
index a876830..c9126de 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp
@@ -37,11 +37,11 @@ KMFProcOut::KMFProcOut( TQWidget *parent, const char *name, WFlags fl ) : TQWidg
 	stderrbuf = new TQString( "" );
 	stdoutbuf = new TQString( "" );
 	m_job_name = XML::Undefined_Value;
-	childproc = new KProcess();
+	childproc = new TDEProcess();
 	
-	connect( childproc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( KProcess*, char*, int ) ) );
-	connect( childproc, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( KProcess*, char*, int ) ) );
-	connect( childproc, TQT_SIGNAL( processExited( KProcess* ) ), this, TQT_SLOT( slotProcessExited( KProcess* ) ) ) ;
+	connect( childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
+	connect( childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );
+	connect( childproc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
 	initGUI();
 	hide();
 	kdDebug() << "KMFProcOut: Finished initialisation." << endl;
@@ -52,7 +52,7 @@ KMFProcOut::~KMFProcOut() {
 }
 
 void KMFProcOut::initGUI() {
-	KIconLoader * loader = KGlobal:: iconLoader();
+	KIconLoader * loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "stop";
@@ -107,7 +107,7 @@ void KMFProcOut::startJob( const TQString &cmd, bool useKdeSu ) {
 		*childproc << "bash" << cmd;
 	}
 	
-	childproc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
+	childproc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
 }
 
 void KMFProcOut::slotKillJob() {
@@ -119,7 +119,7 @@ bool KMFProcOut::isRunning() {
 	return childproc->isRunning();
 }
 
-void KMFProcOut::slotReceivedOutput( KProcess *, char *buffer, int buflen ) {
+void KMFProcOut::slotReceivedOutput( TDEProcess *, char *buffer, int buflen ) {
 	// Flush stderr buffer
 	if ( !stderrbuf->isEmpty() ) {
 		insertStderrLine( *stderrbuf );
@@ -136,7 +136,7 @@ void KMFProcOut::slotReceivedOutput( KProcess *, char *buffer, int buflen ) {
 	}
 }
 
-void KMFProcOut::slotReceivedError( KProcess *, char *buffer, int buflen ) {
+void KMFProcOut::slotReceivedError( TDEProcess *, char *buffer, int buflen ) {
 	// Flush stdout buffer
 	if ( !stdoutbuf->isEmpty() ) {
 		insertStdoutLine( *stdoutbuf );
@@ -153,7 +153,7 @@ void KMFProcOut::slotReceivedError( KProcess *, char *buffer, int buflen ) {
 	}
 }
 
-void KMFProcOut::slotProcessExited( KProcess * ) {
+void KMFProcOut::slotProcessExited( TDEProcess * ) {
 	kdDebug() << "KMFProcOut::slotProcessExited()" << endl;
 	emit processExited( childproc );
 	childFinished( childproc->normalExit(), childproc->exitStatus() );
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.h b/kmyfirewall/kmfwidgets/kmfprocout.h
index 9dc0832..e71a896 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.h
+++ b/kmyfirewall/kmfwidgets/kmfprocout.h
@@ -48,9 +48,9 @@ public slots:
 	void slotKillJob();
 	
 protected slots:
-	void slotReceivedOutput( KProcess*, char*, int );
-	void slotReceivedError( KProcess*, char*, int );
-	void slotProcessExited( KProcess* );
+	void slotReceivedOutput( TDEProcess*, char*, int );
+	void slotReceivedError( TDEProcess*, char*, int );
+	void slotProcessExited( TDEProcess* );
 
 private:
 	
@@ -65,7 +65,7 @@ private:
 private:    // data
 	TQString* stderrbuf;
 	TQString* stdoutbuf;
-	KProcess* childproc;
+	TDEProcess* childproc;
 	
 	TQPixmap icon_stop, icon_close;
 	TQString m_job_name;
@@ -75,7 +75,7 @@ private:    // data
 	KPushButton *m_bkill;
 
 signals:
-	void processExited( KProcess * );
+	void processExited( TDEProcess * );
 	void rowSelected( int row );
 	void sigJobFinished( bool, const TQString& );
 };
diff --git a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
index da89c7e..0fe4df3 100644
--- a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
+++ b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
@@ -164,13 +164,13 @@ void KMFTransactionLog::slotShowDiff() {
 		return;
 	}
 	
-	 KProcess* childproc = new KProcess();
+	 TDEProcess* childproc = new TDEProcess();
 	 kdDebug() << "kompare " << m_undoXMLFile->name() << m_redoXMLFile->name() << endl;
 	 *childproc << "kompare" << m_undoXMLFile->name() << m_redoXMLFile->name();
-	 childproc->start( KProcess::NotifyOnExit, KProcess::NoCommunication );
+	 childproc->start( TDEProcess::NotifyOnExit, TDEProcess::NoCommunication );
 }
 
-void KMFTransactionLog::slotKompareExited( KProcess* ) {
+void KMFTransactionLog::slotKompareExited( TDEProcess* ) {
 }
 
 void KMFTransactionLog::slotClearStacks() {
diff --git a/kmyfirewall/kmfwidgets/kmftransactionlog.h b/kmyfirewall/kmfwidgets/kmftransactionlog.h
index c71d9fc..d5a1a68 100644
--- a/kmyfirewall/kmfwidgets/kmftransactionlog.h
+++ b/kmyfirewall/kmfwidgets/kmftransactionlog.h
@@ -18,7 +18,7 @@
 #include "kmyfirewalltransactionlog.h"
 
 class KPopupMenu;
-class KProcess;
+class TDEProcess;
 class KTempFile;
 class KListView;
 class KListViewItem;
@@ -54,7 +54,7 @@ class KMFTransactionLog : public KMyFirewallTransactionLog
 		void slotLog( const TQString& );
 		void slotZoneRBM( TQListViewItem*, const TQPoint&, int );
 		void slotShowDiff();
-		void slotKompareExited( KProcess* );	
+		void slotKompareExited( TDEProcess* );	
 	private:
 		KMFTransactionLog ( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 		KListViewItem* setupListItem( KMFTransaction*, KListView*, KListViewItem*);
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index 4af2abe..f35ded7 100644
--- a/kmyfirewall/kmyfirewall.cpp
+++ b/kmyfirewall/kmyfirewall.cpp
@@ -95,13 +95,13 @@ KMyFirewall::KMyFirewall( TQWidget* parent, const char *name ) : KMFMainWindow(
 	KMFUndoEngine::instance()->setKMFInterface( this );
 	KMFTransactionLog::instance();
 	
-/*	childproc = new KProcess();
+/*	childproc = new TDEProcess();
 	
-	connect( childproc, TQT_SIGNAL( processExited( KProcess* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotProcessExited( KProcess* ) ) ) ;
+	connect( childproc, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
 	
-	connect( childproc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotReceivedOutput( KProcess*, char*, int ) ) );
+	connect( childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
 	
-	connect( childproc, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotReceivedError( KProcess*, char*, int ) ) );*/
+	connect( childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );*/
 	
 	
 	
@@ -360,14 +360,14 @@ void KMyFirewall::slotExportTargetConfig() {
 }
 
 void KMyFirewall::slotConfigureToolbars() {
-	saveMainWindowSettings( KGlobal::config(), "KMyFirewall" );
+	saveMainWindowSettings( TDEGlobal::config(), "KMyFirewall" );
 	KEditToolbar dlg( factory() );
 	connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_TQOBJECT(this), TQT_SLOT( slotNewToolbarConfig() ) );
 	dlg.exec();
 }
 
 void KMyFirewall::slotNewToolbarConfig() {
-	applyMainWindowSettings( KGlobal::config(), "KMyFirewall" );
+	applyMainWindowSettings( TDEGlobal::config(), "KMyFirewall" );
 }
 
 //check for the uid etc...
diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h
index 5e21f48..77d78d7 100644
--- a/kmyfirewall/kmyfirewall.h
+++ b/kmyfirewall/kmyfirewall.h
@@ -121,9 +121,9 @@ protected slots:
 	void toggleToolBar();
 	void toggleStatusBar();
 	void slotShowEditor();
-// 	void slotProcessExited( KProcess* );
-// 	void slotReceivedOutput( KProcess*, char*, int );
-// 	void slotReceivedError( KProcess*, char*, int );
+// 	void slotProcessExited( TDEProcess* );
+// 	void slotReceivedOutput( TDEProcess*, char*, int );
+// 	void slotReceivedError( TDEProcess*, char*, int );
 
 private:    // member functions
 	bool isTemplate();
@@ -136,8 +136,8 @@ private:    // member functions
 
 private:    // data
 	TQWidget* m_editorWidget;
-// 	KProcess* childproc;
-// 	KProcess &operator<<( const TQString& arg );
+// 	TDEProcess* childproc;
+// 	TDEProcess &operator<<( const TQString& arg );
 /*	TQString m_processName;
 	KTempFile *m_iptables_saveOutput;*/
 	KMFError *m_err;
@@ -171,7 +171,7 @@ private:    // data
 
 signals:
 	void documentChanged( KMFIPTDoc * );
-// 	void processExited( KProcess * );
+// 	void processExited( TDEProcess * );
 	void sigSplashShow( bool );
 	void sigSplashShowMsg( const TQString& );
 };