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

---
 iso/iso.cpp  | 26 +++++++++++++-------------
 iso/iso.h    |  4 ++--
 iso/kiso.cpp |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'iso')

diff --git a/iso/iso.cpp b/iso/iso.cpp
index 543abab..520bf24 100644
--- a/iso/iso.cpp
+++ b/iso/iso.cpp
@@ -54,7 +54,7 @@ static const unsigned char zisofs_magic[8] = {
     0x37, 0xE4, 0x53, 0x96, 0xC9, 0xDB, 0xD6, 0x07
 };
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C" { int kdemain(int argc, char **argv); }
 
@@ -241,7 +241,7 @@ void kio_isoProtocol::listDir( const KURL & url )
         kdDebug()  << "Checking (stat) on " << _path << endl;
         struct stat buff;
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
-            error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+            error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
             return;
         }
         // It's a real dir -> redirect
@@ -278,12 +278,12 @@ void kio_isoProtocol::listDir( const KURL & url )
         const KArchiveEntry* e = root->entry( path );
         if ( !e )
         {
-            error( KIO::ERR_DOES_NOT_EXIST, path );
+            error( TDEIO::ERR_DOES_NOT_EXIST, path );
             return;
         }
         if ( ! e->isDirectory() )
         {
-            error( KIO::ERR_IS_FILE, path );
+            error( TDEIO::ERR_IS_FILE, path );
             return;
         }
         dir = (KArchiveDirectory*)e;
@@ -328,17 +328,17 @@ void kio_isoProtocol::stat( const KURL & url )
         struct stat buff;
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
             kdDebug() << "isdir=" << S_ISDIR( buff.st_mode ) << "  errno=" << strerror(errno) << endl;
-            error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+            error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
             return;
         }
         // Real directory. Return just enough information for KRun to work
         UDSAtom atom;
-        atom.m_uds = KIO::UDS_NAME;
+        atom.m_uds = TDEIO::UDS_NAME;
         atom.m_str = url.fileName();
         entry.append( atom );
         kdDebug()  << "kio_isoProtocol::stat returning name=" << url.fileName() << endl;
 
-        atom.m_uds = KIO::UDS_FILE_TYPE;
+        atom.m_uds = TDEIO::UDS_FILE_TYPE;
         atom.m_long = buff.st_mode & S_IFMT;
         entry.append( atom );
 
@@ -363,7 +363,7 @@ void kio_isoProtocol::stat( const KURL & url )
     }
     if ( !isoEntry )
     {
-        error( KIO::ERR_DOES_NOT_EXIST, path );
+        error( TDEIO::ERR_DOES_NOT_EXIST, path );
         return;
     }
     createUDSEntry( isoEntry, entry );
@@ -412,7 +412,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
                     
                 pptr = pointer_block.data();
             } else {
-                error(KIO::ERR_COULD_NOT_READ, path);
+                error(TDEIO::ERR_COULD_NOT_READ, path);
                 return;
             }
         } else {
@@ -474,7 +474,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
     }
 
     if (pos!=size) {
-        error(KIO::ERR_COULD_NOT_READ, path);
+        error(TDEIO::ERR_COULD_NOT_READ, path);
         return;
     }
 
@@ -492,7 +492,7 @@ void kio_isoProtocol::get( const KURL & url )
     TQString path;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
     {
-        error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+        error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
         return;
     }
 
@@ -501,12 +501,12 @@ void kio_isoProtocol::get( const KURL & url )
 
     if ( !isoEntry )
     {
-        error( KIO::ERR_DOES_NOT_EXIST, path );
+        error( TDEIO::ERR_DOES_NOT_EXIST, path );
         return;
     }
     if ( isoEntry->isDirectory() )
     {
-        error( KIO::ERR_IS_DIRECTORY, path );
+        error( TDEIO::ERR_IS_DIRECTORY, path );
         return;
     }
 
diff --git a/iso/iso.h b/iso/iso.h
index 2a488bd..136c327 100644
--- a/iso/iso.h
+++ b/iso/iso.h
@@ -28,7 +28,7 @@
 
 class KIso;
 
-class kio_isoProtocol : public KIO::SlaveBase
+class kio_isoProtocol : public TDEIO::SlaveBase
 {
 public:
     kio_isoProtocol( const TQCString &pool, const TQCString &app );
@@ -40,7 +40,7 @@ public:
 
 protected:
     void getFile( const KIsoFile *isoFileEntry, const TQString &path );
-    void createUDSEntry( const KArchiveEntry * isoEntry, KIO::UDSEntry & entry );
+    void createUDSEntry( const KArchiveEntry * isoEntry, TDEIO::UDSEntry & entry );
     bool checkNewFile( TQString fullPath, TQString & path, int startsec );
 
     KIso * m_isoFile;
diff --git a/iso/kiso.cpp b/iso/kiso.cpp
index e3a4def..4ab5c53 100644
--- a/iso/kiso.cpp
+++ b/iso/kiso.cpp
@@ -323,9 +323,9 @@ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
 
 void KIso::readParams()
 {
-    KConfig *config;
+    TDEConfig *config;
 
-    config = new KConfig("kio_isorc");
+    config = new TDEConfig("kio_isorc");
     
     showhidden=config->readBoolEntry("showhidden",false);
     showrr=config->readBoolEntry("showrr",true);
-- 
cgit v1.2.1