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

---
 lanbrowsing/kio_lan/kio_lan.cpp | 46 ++++++++++++++++++++---------------------
 lanbrowsing/kio_lan/kio_lan.h   |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'lanbrowsing/kio_lan')

diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp
index 7e296694..9490f7b4 100644
--- a/lanbrowsing/kio_lan/kio_lan.cpp
+++ b/lanbrowsing/kio_lan/kio_lan.cpp
@@ -56,7 +56,7 @@
 #define PORTSETTINGS_PROVIDE 1
 #define PORTSETTINGS_DISABLE 2
 
-using namespace KIO;
+using namespace TDEIO;
 
 #ifndef SHUT_RDWR
 #define SHUT_RDWR 2
@@ -94,7 +94,7 @@ LANProtocol::LANProtocol(int isLanIoslave, const TQCString &pool, const TQCStrin
 ,m_maxAge(15*60)
 ,m_isLanIoslave(isLanIoslave?true:false)
 {
-   KConfig *config=TDEGlobal::config();
+   TDEConfig *config=TDEGlobal::config();
 
    m_protocolInfo[KIOLAN_FTP].enabled=config->readNumEntry("Support_FTP",PORTSETTINGS_CHECK);
    m_protocolInfo[KIOLAN_HTTP].enabled=config->readNumEntry("Support_HTTP",PORTSETTINGS_CHECK);
@@ -232,7 +232,7 @@ int LANProtocol::lanReadDataFromServer()
          kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl;
          UDSAtom atom;
 
-         atom.m_uds = KIO::UDS_NAME;
+         atom.m_uds = TDEIO::UDS_NAME;
          if (m_shortHostnames)
          {
             if (inet_addr(tmpName)!=-1)
@@ -248,14 +248,14 @@ int LANProtocol::lanReadDataFromServer()
             atom.m_str = tmpName;
 
          entry.append( atom );
-         atom.m_uds = KIO::UDS_SIZE;
+         atom.m_uds = TDEIO::UDS_SIZE;
          atom.m_long = 1024;
          entry.append(atom);
-         atom.m_uds = KIO::UDS_ACCESS;
+         atom.m_uds = TDEIO::UDS_ACCESS;
          atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
          //atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
          entry.append(atom);
-         atom.m_uds = KIO::UDS_FILE_TYPE;
+         atom.m_uds = TDEIO::UDS_FILE_TYPE;
          atom.m_long = S_IFDIR; // it is always a directory
          entry.append( atom );
          listEntry(entry,false);
@@ -407,7 +407,7 @@ int LANProtocol::rlanReadDataFromServer()
          kdDebug(7101)<<"RLANProtocol::readDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl;
          UDSAtom atom;
 
-         atom.m_uds = KIO::UDS_NAME;
+         atom.m_uds = TDEIO::UDS_NAME;
          if (m_shortHostnames)
          {
             if (inet_addr(tmpName)!=-1)
@@ -422,14 +422,14 @@ int LANProtocol::rlanReadDataFromServer()
          else
             atom.m_str = tmpName;
          entry.append( atom );
-         atom.m_uds = KIO::UDS_SIZE;
+         atom.m_uds = TDEIO::UDS_SIZE;
          atom.m_long = 1024;
          entry.append(atom);
-         atom.m_uds = KIO::UDS_ACCESS;
+         atom.m_uds = TDEIO::UDS_ACCESS;
          atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
          //atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
          entry.append(atom);
-         atom.m_uds = KIO::UDS_FILE_TYPE;
+         atom.m_uds = TDEIO::UDS_FILE_TYPE;
          atom.m_long = S_IFDIR; // it is always a directory
          entry.append( atom );
          listEntry(entry,false);
@@ -510,20 +510,20 @@ int LANProtocol::checkHost(const TQString& host)
          kdDebug(7101)<<"LAN::checkHost(): Host ["<<hostUpper<<"] Service ["<<m_protocolInfo[i].name<<"]"<<endl;
          UDSAtom atom;
          // name
-         atom.m_uds = KIO::UDS_NAME;
+         atom.m_uds = TDEIO::UDS_NAME;
          atom.m_str = m_protocolInfo[i].name;
          entry.append( atom );
          // size
-         atom.m_uds = KIO::UDS_SIZE;
+         atom.m_uds = TDEIO::UDS_SIZE;
          atom.m_long = 1024;
          entry.append(atom);
          // access permissions
-         atom.m_uds = KIO::UDS_ACCESS;
+         atom.m_uds = TDEIO::UDS_ACCESS;
          atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
          //atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
          entry.append(atom);
          // file type
-         atom.m_uds = KIO::UDS_FILE_TYPE;
+         atom.m_uds = TDEIO::UDS_FILE_TYPE;
          if (strcmp(m_protocolInfo[i].name,"HTTP")==0)
          {
             // normal file -- if we called stat(2) on this,
@@ -532,7 +532,7 @@ int LANProtocol::checkHost(const TQString& host)
             entry.append(atom);
 
             // also define the mime-type for this file
-            atom.m_uds = KIO::UDS_MIME_TYPE;
+            atom.m_uds = TDEIO::UDS_MIME_TYPE;
             atom.m_str="text/html";
             entry.append( atom );
          }
@@ -544,7 +544,7 @@ int LANProtocol::checkHost(const TQString& host)
             entry.append(atom);
 
             // also set the mime-type
-            atom.m_uds = KIO::UDS_MIME_TYPE;
+            atom.m_uds = TDEIO::UDS_MIME_TYPE;
             atom.m_str="inode/directory";
             entry.append( atom );
          }
@@ -732,14 +732,14 @@ void LANProtocol::stat( const KURL & url)
    UDSEntry entry;
    UDSAtom atom;
 
-   atom.m_uds = KIO::UDS_NAME;
+   atom.m_uds = TDEIO::UDS_NAME;
    atom.m_str = url.path();
    entry.append( atom );
-   atom.m_uds = KIO::UDS_SIZE;
+   atom.m_uds = TDEIO::UDS_SIZE;
    atom.m_long = 1024;
    entry.append(atom);
 
-   atom.m_uds = KIO::UDS_ACCESS;
+   atom.m_uds = TDEIO::UDS_ACCESS;
    atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
    //atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
    entry.append(atom);
@@ -749,20 +749,20 @@ void LANProtocol::stat( const KURL & url)
    TQStringList pathList=TQStringList::split( "/",path);
    if ((pathList.count()==2) && (pathList[1].upper()=="HTTP"))
    {
-      atom.m_uds = KIO::UDS_FILE_TYPE;
+      atom.m_uds = TDEIO::UDS_FILE_TYPE;
       atom.m_long=S_IFREG;
       entry.append(atom);
-      atom.m_uds = KIO::UDS_MIME_TYPE;
+      atom.m_uds = TDEIO::UDS_MIME_TYPE;
       atom.m_str="text/html";
       //kdDebug(7101)<<"LANProtocol::stat: http is reg file"<<endl;
       entry.append( atom );
    }
    else
    {
-      atom.m_uds = KIO::UDS_FILE_TYPE;
+      atom.m_uds = TDEIO::UDS_FILE_TYPE;
       atom.m_long = S_IFDIR; // it is always a directory
       entry.append(atom);
-      atom.m_uds = KIO::UDS_MIME_TYPE;
+      atom.m_uds = TDEIO::UDS_MIME_TYPE;
       atom.m_str="inode/directory";
       //kdDebug(7101)<<"LANProtocol::stat: is dir"<<endl;
       entry.append( atom );
diff --git a/lanbrowsing/kio_lan/kio_lan.h b/lanbrowsing/kio_lan/kio_lan.h
index 1969700f..40dd14ba 100644
--- a/lanbrowsing/kio_lan/kio_lan.h
+++ b/lanbrowsing/kio_lan/kio_lan.h
@@ -55,7 +55,7 @@ struct HostInfo
    int services[KIOLAN_MAX];
 };
 
-class LANProtocol : public KIO::TCPSlaveBase
+class LANProtocol : public TDEIO::TCPSlaveBase
 {
    public:
       LANProtocol (int isLanIoSlave, const TQCString &pool, const TQCString &app );
-- 
cgit v1.2.1