Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

5 files changed, 8 insertions, 8 deletions

diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
index 7cee87a..3c4a1a7 100644
--- a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
@@ -162,7 +162,7 @@ TQString OpenVPNConfig::findOpenVPNBinary()
 }
 
 
-void OpenVPNConfig::receiveCipherData(KProcess*, char* buffer, int len)
+void OpenVPNConfig::receiveCipherData(TDEProcess*, char* buffer, int len)
 {
 	// add possible cipher modes to the combobox
 	TQStringList cipherModes = TQStringList::split("\n", TQString::fromLatin1(buffer, len), false );
@@ -177,12 +177,12 @@ void OpenVPNConfig::getCipherModes()
 	// get all possible cipher modes
 	TQString openvpn = findOpenVPNBinary();
 	if (!openvpn.isNull()) {
-		KProcess* cipherHelper = new KProcess();
+		TDEProcess* cipherHelper = new TDEProcess();
 		cipherHelper->setUseShell(true, "/bin/sh");
 		*cipherHelper << TQString::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn);
-		connect (cipherHelper, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(KProcess*, char*, int)));
+		connect (cipherHelper, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(TDEProcess*, char*, int)));
 		kdDebug() << "starting openvpn to get cipher modes" << endl;
-		if (!cipherHelper->start(KProcess::Block, KProcess::Stdout)) {
+		if (!cipherHelper->start(TDEProcess::Block, TDEProcess::Stdout)) {
 			kdDebug() << "error starting openvpn" << endl;
 		}
 	}
diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h
index 2f8889d..30aad1d 100644
--- a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h
@@ -79,7 +79,7 @@ class OpenVPNConfig : public VPNConfigWidget
 		~OpenVPNConfig();
 
 	public slots:
-		void receiveCipherData(KProcess*, char*, int);
+		void receiveCipherData(TDEProcess*, char*, int);
 
 	private:
 		OpenVPNConfigWidget*   _openvpnWidget;
diff --git a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
index 3475dd5..6d1e920 100644
--- a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY(tdenetman_pptp, PPTPPluginFactory("tdenetman_pptp"));
 PPTPPlugin::PPTPPlugin(TQObject* parent, const char* name, const TQStringList& args)
 	: VPNPlugin(parent, name, args)
 {
-	KLocale* loc = KGlobal::locale();
+	KLocale* loc = TDEGlobal::locale();
 	loc->insertCatalogue("NetworkManager-pptp");
 }
 
diff --git a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
index 2d9e0d7..d92a010 100644
--- a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( tdenetman_strongswan, StrongswanPluginFactory("tdene
 StrongswanPlugin::StrongswanPlugin(TQObject* parent, const char* name, const TQStringList& args)
 	: VPNPlugin(parent, name, args)
 {
-	KLocale* loc = KGlobal::locale();
+	KLocale* loc = TDEGlobal::locale();
 	loc->insertCatalogue("NetworkManager-strongswan");
 }
 
diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp
index 272e05f..cb0aec1 100644
--- a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp
@@ -55,7 +55,7 @@ char linedata [2048];
 VPNCPlugin::VPNCPlugin(TQObject* parent, const char* name, const TQStringList& args) 
 	: VPNPlugin(parent, name, args)
 {
-	KLocale* loc = KGlobal::locale();
+	KLocale* loc = TDEGlobal::locale();
 	loc->insertCatalogue("NetworkManager-vpnc");
 }