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

---
 virt/virt.cc | 14 +++++++-------
 virt/virt.h  |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'virt')

diff --git a/virt/virt.cc b/virt/virt.cc
index bb71d40..706621f 100644
--- a/virt/virt.cc
+++ b/virt/virt.cc
@@ -30,7 +30,7 @@
 
 #include "virt.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 #define VIRT_VFS_DB "virt_vfs.db"
 #define VIRT_PROTOCOL "virt"
@@ -48,7 +48,7 @@ extern "C" { int kdemain( int argc, char **argv ); }
 }
 
 TQDict<KURL::List> VirtProtocol::kioVirtDict;
-KConfig* VirtProtocol::kio_virt_db;
+TDEConfig* VirtProtocol::kio_virt_db;
 
 int kdemain( int argc, char **argv ) {
 	TDEInstance instance( "kio_virt" );
@@ -65,7 +65,7 @@ int kdemain( int argc, char **argv ) {
 }
 
 VirtProtocol::VirtProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "virt", pool, app ) {
-	kio_virt_db = new KConfig(VIRT_VFS_DB,false,"data");
+	kio_virt_db = new TDEConfig(VIRT_VFS_DB,false,"data");
 }
 
 VirtProtocol::~VirtProtocol() {
@@ -75,7 +75,7 @@ VirtProtocol::~VirtProtocol() {
 void VirtProtocol::del(KURL const & /*url */, bool /* isFile */ ){
 //	KRDEBUG(url.path());
 	
-	messageBox(KIO::SlaveBase::QuestionYesNo,
+	messageBox(TDEIO::SlaveBase::QuestionYesNo,
 	                         i18n(""),
 	                         i18n("Virtulal delete"),
 	                         i18n("remove from virtual space"),
@@ -132,7 +132,7 @@ void VirtProtocol::mkdir(const KURL& url,int){
 	if ( path.isEmpty() ) path = "/";
 
 	if( kioVirtDict[ path ] ){
-		error( KIO::ERR_DIR_ALREADY_EXIST, url.path() );
+		error( TDEIO::ERR_DIR_ALREADY_EXIST, url.path() );
 		return;
 	}
 
@@ -222,7 +222,7 @@ bool VirtProtocol::rewriteURL(const KURL& /* src */, KURL&){
 bool VirtProtocol::save(){
 	lock();
 
-	KConfig* db = new KConfig(VIRT_VFS_DB,false,"data");;
+	TDEConfig* db = new TDEConfig(VIRT_VFS_DB,false,"data");;
 	
 	db->setGroup("virt_db");
 	TQDictIterator<KURL::List> it( kioVirtDict ); // See TQDictIterator
@@ -246,7 +246,7 @@ bool VirtProtocol::save(){
 bool VirtProtocol::load(){
 	lock();
 
-	KConfig* db = new KConfig(VIRT_VFS_DB,false,"data");
+	TDEConfig* db = new TDEConfig(VIRT_VFS_DB,false,"data");
 	db->setGroup("virt_db");
 	
 	TQMap<TQString, TQString> map = db->entryMap("virt_db");
diff --git a/virt/virt.h b/virt/virt.h
index bd35c29..9b436d7 100644
--- a/virt/virt.h
+++ b/virt/virt.h
@@ -23,7 +23,7 @@
 #include <kconfig.h>
 #include <kio/slavebase.h>
 
-class VirtProtocol : public KIO::SlaveBase {
+class VirtProtocol : public TDEIO::SlaveBase {
 public:
 	VirtProtocol( const TQCString &pool, const TQCString &app );
 	virtual ~VirtProtocol();
@@ -41,12 +41,12 @@ protected:
 	bool save();
 	bool load();
 
-	void local_entry(const KURL& url,KIO::UDSEntry& entry);
+	void local_entry(const KURL& url,TDEIO::UDSEntry& entry);
 	bool addDir(TQString& path);
 
 
 	static TQDict<KURL::List> kioVirtDict;
-	static KConfig* kio_virt_db;
+	static TDEConfig* kio_virt_db;
 
 	bool rewriteURL(const KURL&, KURL&);
 
-- 
cgit v1.2.1