From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kdepasswd/kcm/kcm_useraccount.kcfg |  2 +-
 kdepasswd/kcm/main.cpp             | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kdepasswd/kcm')

diff --git a/kdepasswd/kcm/kcm_useraccount.kcfg b/kdepasswd/kcm/kcm_useraccount.kcfg
index 60007f4c9..c780db21a 100644
--- a/kdepasswd/kcm/kcm_useraccount.kcfg
+++ b/kdepasswd/kcm/kcm_useraccount.kcfg
@@ -9,7 +9,7 @@
 	<group name="X-*-Greeter">
 		<entry name="faceDir" type="Path">
 			<default code="true">
-				KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces"  + '/'
+				TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces"  + '/'
 			</default>
 		</entry>
 		<entry name="UserFaceDir" type="Path">
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index 11ac07242..fc58dcea7 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -107,8 +107,8 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
 
 void KCMUserAccount::slotChangePassword()
 {
-	KProcess *proc = new KProcess;
-	TQString bin = KGlobal::dirs()->findExe("kdepasswd");
+	TDEProcess *proc = new TDEProcess;
+	TQString bin = TDEGlobal::dirs()->findExe("kdepasswd");
 	if ( !bin )
 	{
 		kdDebug() << "kcm_useraccount: kdepasswd was not found." << endl;
@@ -122,7 +122,7 @@ void KCMUserAccount::slotChangePassword()
 	}
 
 	*proc << bin << _ku->loginName() ;
-	proc->start(KProcess::DontCare);
+	proc->start(TDEProcess::DontCare);
 
 	delete proc;
 
@@ -147,7 +147,7 @@ void KCMUserAccount::load()
 	_mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
 
 	TQString _userPicsDir = KCFGUserAccount::faceDir() +  
-		KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/";
+		TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/";
 
 	TQString fs = KCFGUserAccount::faceSource();
 	if (fs == TQString::fromLatin1("UserOnly"))
@@ -270,7 +270,7 @@ void KCMUserAccount::slotFaceButtonClicked()
     return;
   }
 
-  ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() +
+  ChFaceDlg* pDlg = new ChFaceDlg( TDEGlobal::dirs()->resourceDirs("data").last() +
 	"/tdm/pics/users/" );
 
   if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() )
-- 
cgit v1.2.1