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

6 files changed, 24 insertions, 24 deletions

diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index c408d0ad..05eabee7 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -163,9 +163,9 @@ void WinPopupLib::startReadProcess(const TQString &Host)
 	*reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-";
 
 	connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *)));
-	connect(reader, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotReadProcessExited(KProcess *)));
+	connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *)));
 
-	if (!reader->start(KProcess::NotifyOnExit, true)) {
+	if (!reader->start(TDEProcess::NotifyOnExit, true)) {
 		// still to come
 		kdDebug(14170) << "ReadProcess not started!" << endl;
 	}
@@ -189,7 +189,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r)
 	}
 }
 
-void WinPopupLib::slotReadProcessExited(KProcess *r)
+void WinPopupLib::slotReadProcessExited(TDEProcess *r)
 {
 	delete r;
 
@@ -327,13 +327,13 @@ void WinPopupLib::readMessages(const KFileItemList &items)
  */
 void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination)
 {
-	KProcess *sender = new KProcess(this);
+	TDEProcess *sender = new TDEProcess(this);
 	*sender << smbClientBin << "-M" << Destination;
 	*sender << "-N" << "-";
 
-	connect(sender, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendProcessExited(KProcess *)));
+	connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *)));
 
-	if (sender->start(KProcess::NotifyOnExit, KProcess::Stdin)) {
+	if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) {
 		sender->writeStdin(Body.local8Bit(), Body.local8Bit().length());
 		if (!sender->closeStdin()) {
 			delete sender;
@@ -343,7 +343,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination)
 	}
 }
 
-void WinPopupLib::slotSendProcessExited(KProcess *p)
+void WinPopupLib::slotSendProcessExited(TDEProcess *p)
 {
 //	emit sendJobDone(p->pid());
 	delete p;
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index c4789ebc..1213b3cf 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -77,8 +77,8 @@ private slots:
 	void slotUpdateGroupData();
 	void startReadProcess(const TQString &Host);
 	void slotReadProcessReady(KProcIO *r);
-	void slotReadProcessExited(KProcess *r);
-	void slotSendProcessExited(KProcess *p);
+	void slotReadProcessExited(TDEProcess *r);
+	void slotSendProcessExited(TDEProcess *p);
 	void slotStartDirLister();
 	void slotListCompleted();
 	void slotNewMessages(const KFileItemList &items);
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 217ac462..0e0b6f43 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -58,9 +58,9 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount)
 		mHostName->setText(account()->accountId());
 //		mAutoConnect->setChecked(account()->excludeConnect());
 		mHostName->setReadOnly(true);
-		KGlobal::config()->setGroup("WinPopup");
-		mHostCheckFreq->setValue(KGlobal::config()->readNumEntry("HostCheckFreq", 60));
-		mSmbcPath->setURL(KGlobal::config()->readEntry("SmbcPath", tmpSmbcPath));
+		TDEGlobal::config()->setGroup("WinPopup");
+		mHostCheckFreq->setValue(TDEGlobal::config()->readNumEntry("HostCheckFreq", 60));
+		mSmbcPath->setURL(TDEGlobal::config()->readEntry("SmbcPath", tmpSmbcPath));
 
 	}
 	else {
@@ -112,9 +112,9 @@ bool WPEditAccount::validateData()
 
 void WPEditAccount::writeConfig()
 {
-	KGlobal::config()->setGroup("WinPopup");
-	KGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url());
-	KGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text());
+	TDEGlobal::config()->setGroup("WinPopup");
+	TDEGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url());
+	TDEGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text());
 }
 
 Kopete::Account *WPEditAccount::apply()
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 8e21a16d..5d4f708a 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -128,9 +128,9 @@ void WPProtocol::settingsChanged()
 
 void WPProtocol::readConfig()
 {
-	KGlobal::config()->setGroup("WinPopup");
-	smbClientBin = KGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient");
-	groupCheckFreq = KGlobal::config()->readNumEntry("HostCheckFreq", 60);
+	TDEGlobal::config()->setGroup("WinPopup");
+	smbClientBin = TDEGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient");
+	groupCheckFreq = TDEGlobal::config()->readNumEntry("HostCheckFreq", 60);
 }
 
 void WPProtocol::installSamba()
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index 162374b7..39651475 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -59,16 +59,16 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa
 // if we would do this in libwinpopup. GF
 void WPUserInfo::startDetailsProcess(const TQString &host)
 {
-	KGlobal::config()->setGroup("WinPopup");
-	TQString theSMBClientPath = KGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient");
+	TDEGlobal::config()->setGroup("WinPopup");
+	TQString theSMBClientPath = TDEGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient");
 
 	KProcIO *details = new KProcIO;
 	*details << theSMBClientPath << "-N" << "-E" << "-g" << "-L" << host << "-";
 
 	connect(details, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotDetailsProcessReady(KProcIO *)));
-	connect(details, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotDetailsProcessExited(KProcess *)));
+	connect(details, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotDetailsProcessExited(TDEProcess *)));
 
-	if (!details->start(KProcess::NotifyOnExit, KProcess::Stderr)) {
+	if (!details->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) {
 		slotDetailsProcessExited(details);
 		kdDebug(14170) << "DetailsProcess not started!" << endl;
 	}
@@ -91,7 +91,7 @@ void WPUserInfo::slotDetailsProcessReady(KProcIO *d)
 	}
 }
 
-void WPUserInfo::slotDetailsProcessExited(KProcess *d)
+void WPUserInfo::slotDetailsProcessExited(TDEProcess *d)
 {
 	delete d;
 
diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h
index 09d2f332..f70f9c8d 100644
--- a/kopete/protocols/winpopup/wpuserinfo.h
+++ b/kopete/protocols/winpopup/wpuserinfo.h
@@ -43,7 +43,7 @@ class WPUserInfo : public KDialogBase
 
 	private slots:
 		void slotDetailsProcessReady(KProcIO *d);
-		void slotDetailsProcessExited(KProcess *d);
+		void slotDetailsProcessExited(TDEProcess *d);
 		void slotCloseClicked();
 
 	signals: