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

---
 tdmlib/kgreet_classic.cpp |  6 +++---
 tdmlib/kgreet_pam.cpp     |  6 +++---
 tdmlib/kgreet_winbind.cpp | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tdmlib')

diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp
index b37f2bab7..01bf41485 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -180,7 +180,7 @@ KClassicGreeter::loadUsers( const TQStringList &users )
 	userNamesCompletion->setItems( users );
 	loginEdit->setCompletionObject( userNamesCompletion );
 	loginEdit->setAutoDeleteCompletionObject( true );
-	loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
+	loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
 }
 
 void // virtual
@@ -485,13 +485,13 @@ static bool init( const TQString &,
                   void *ctx )
 {
 	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
-	KGlobal::locale()->insertCatalogue( "kgreet_classic" );
+	TDEGlobal::locale()->insertCatalogue( "kgreet_classic" );
 	return true;
 }
 
 static void done( void )
 {
-	KGlobal::locale()->removeCatalogue( "kgreet_classic" );
+	TDEGlobal::locale()->removeCatalogue( "kgreet_classic" );
 }
 
 static KGreeterPlugin *
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index 8e2946183..d47fc5b5b 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -223,7 +223,7 @@ KPamGreeter::loadUsers( const TQStringList &users )
 	userNamesCompletion->setItems( users );
 	loginEdit->setCompletionObject( userNamesCompletion );
 	loginEdit->setAutoDeleteCompletionObject( true );
-	loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
+	loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
 }
 
 void // virtual
@@ -643,13 +643,13 @@ static bool init( const TQString &,
                   void *ctx )
 {
 	echoMode = (KPasswordEdit::EchoModes) getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
-	KGlobal::locale()->insertCatalogue( "kgreet_pam" );
+	TDEGlobal::locale()->insertCatalogue( "kgreet_pam" );
 	return true;
 }
 
 static void done( void )
 {
-	KGlobal::locale()->removeCatalogue( "kgreet_pam" );
+	TDEGlobal::locale()->removeCatalogue( "kgreet_pam" );
         if (log && log != stderr)
 	    fclose(log);
         log = 0;
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index 85721dd45..fe73ee169 100644
--- a/tdmlib/kgreet_winbind.cpp
+++ b/tdmlib/kgreet_winbind.cpp
@@ -246,7 +246,7 @@ KWinbindGreeter::loadUsers( const TQStringList &users )
 	KCompletion *userNamesCompletion = new KCompletion;
 	loginEdit->setCompletionObject( userNamesCompletion );
 	loginEdit->setAutoDeleteCompletionObject( true );
-	loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
+	loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
 	slotChangedDomain( defaultDomain );
 }
 
@@ -572,10 +572,10 @@ KWinbindGreeter::slotStartDomainList()
 
     m_domainLister = new KProcIO;
     connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList()));
-    connect(m_domainLister, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotEndDomainList()));
+    connect(m_domainLister, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotEndDomainList()));
 
     (*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains";
-    m_domainLister->setComm (KProcess::Stdout);
+    m_domainLister->setComm (TDEProcess::Stdout);
     m_domainLister->start();
 }
 
@@ -648,13 +648,13 @@ static bool init( const TQString &,
 			sepstr = "\\";
 	}
 	separator = sepstr[0].latin1();
-	KGlobal::locale()->insertCatalogue( "kgreet_winbind" );
+	TDEGlobal::locale()->insertCatalogue( "kgreet_winbind" );
 	return true;
 }
 
 static void done( void )
 {
-	KGlobal::locale()->removeCatalogue( "kgreet_winbind" );
+	TDEGlobal::locale()->removeCatalogue( "kgreet_winbind" );
 	// avoid static deletion problems ... hopefully
 	staticDomains.clear();
 	defaultDomain = TQString::null;
-- 
cgit v1.2.1