From 4bb787f41f7cdefac2aac33ef59317b7157302c1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:38:13 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kgpg/kgpginterface.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kgpg/kgpginterface.cpp')

diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 0655b38..fae5911 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -958,7 +958,7 @@ void KgpgInterface::signover(TDEProcess *)
 void KgpgInterface::openSignConsole()
 {
         TDEProcess conprocess;
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("General");
 	conprocess<< config->readPathEntry("TerminalApplication","konsole");
         conprocess<<"-e"<<"gpg";
@@ -1358,7 +1358,7 @@ void KgpgInterface::importKeyURL(KURL url)
 {
         /////////////      import a key
 
-        if( KIO::NetAccess::download( url, tempKeyFile,0) ) {
+        if( TDEIO::NetAccess::download( url, tempKeyFile,0) ) {
                 message=TQString();
                 KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
                 *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import";
@@ -1450,7 +1450,7 @@ kdDebug(2100)<<"Importing is over"<<endl;
 
 void KgpgInterface::importURLover(TDEProcess *p)
 {
-        KIO::NetAccess::removeTempFile(tempKeyFile);
+        TDEIO::NetAccess::removeTempFile(tempKeyFile);
         importover(p);
         //KMessageBox::information(0,message);
         //emit importfinished();
-- 
cgit v1.2.3