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/kcmlisa/kcmkiolan.cpp  |  2 +-
 lanbrowsing/kcmlisa/kcmkiolan.h    |  4 ++--
 lanbrowsing/kcmlisa/kcmlisa.cpp    |  2 +-
 lanbrowsing/kcmlisa/kcmlisa.h      |  4 ++--
 lanbrowsing/kcmlisa/kcmreslisa.cpp |  2 +-
 lanbrowsing/kcmlisa/kcmreslisa.h   |  6 ++---
 lanbrowsing/kcmlisa/main.cpp       |  6 ++---
 lanbrowsing/kio_lan/kio_lan.cpp    | 46 +++++++++++++++++++-------------------
 lanbrowsing/kio_lan/kio_lan.h      |  2 +-
 9 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'lanbrowsing')

diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp
index 558b6f62..fa3188fc 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.cpp
+++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp
@@ -32,7 +32,7 @@
 #include <kdialog.h>
 
 IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent)
-:KCModule(parent)
+:TDECModule(parent)
 ,m_config(config,false,true)
 {
    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
diff --git a/lanbrowsing/kcmlisa/kcmkiolan.h b/lanbrowsing/kcmlisa/kcmkiolan.h
index 6c5ef911..eacea6da 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.h
+++ b/lanbrowsing/kcmlisa/kcmkiolan.h
@@ -28,7 +28,7 @@
 class TQCheckBox;
 class TQLineEdit;
 
-class IOSlaveSettings:public KCModule
+class IOSlaveSettings:public TDECModule
 {
    Q_OBJECT
   
@@ -40,7 +40,7 @@ class IOSlaveSettings:public KCModule
    signals:
       void changed();
    protected:
-      KConfig m_config;
+      TDEConfig m_config;
       TQCheckBox *m_shortHostnames;
       TQCheckBox *m_rlanSidebar;
       PortSettingsBar *m_ftpSettings;
diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index c5892395..b73e8507 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -49,7 +49,7 @@
 #include <kdebug.h>
 
 LisaSettings::LisaSettings(const TQString& config, TQWidget *parent)
-: KCModule(parent, "kcmlanbrowser")
+: TDECModule(parent, "kcmlanbrowser")
 ,m_config(config,false,true)
 ,m_wizard(0)
 ,m_configFilename(config)
diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h
index 51815906..5a39d09a 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.h
+++ b/lanbrowsing/kcmlisa/kcmlisa.h
@@ -34,7 +34,7 @@ class KRestrictedLine;
 class KEditListBox;
 class SetupWizard;
 
-class LisaSettings:public KCModule
+class LisaSettings:public TDECModule
 {
    Q_OBJECT
   
@@ -51,7 +51,7 @@ class LisaSettings:public KCModule
       void saveDone(TDEProcess *);  // called after the tdesud returns (on save)
       void suggestSettings();
    protected:
-      KConfig m_config;
+      TDEConfig m_config;
       TQPushButton *m_autoSetup;
       TQCheckBox *m_useNmblookup;
       TQCheckBox *m_sendPings;
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp
index fcaf104c..6b946608 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp
@@ -37,7 +37,7 @@
 #include <keditlistbox.h>
 
 ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent)
-: KCModule(parent)
+: TDECModule(parent)
 ,m_config(config,false,true)
 ,m_kiolanConfig("kio_lanrc",false,true)
 ,m_advancedSettingsButton(0)
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.h b/lanbrowsing/kcmlisa/kcmreslisa.h
index 1db4ec69..af7a6fd4 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.h
+++ b/lanbrowsing/kcmlisa/kcmreslisa.h
@@ -32,7 +32,7 @@ class KEditListBox;
 class KDialogBase;
 class KRestrictedLine;
 
-class ResLisaSettings:public KCModule
+class ResLisaSettings:public TDECModule
 {
    Q_OBJECT
   
@@ -46,8 +46,8 @@ class ResLisaSettings:public KCModule
    protected slots:
       void suggestSettings();
    protected:
-      KConfig m_config;
-      KConfig m_kiolanConfig;
+      TDEConfig m_config;
+      TDEConfig m_kiolanConfig;
       TQPushButton* m_advancedSettingsButton;
       TQPushButton* m_suggestSettings;
       TQCheckBox* m_useNmblookup;
diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp
index 00d03e52..03d5d045 100644
--- a/lanbrowsing/kcmlisa/main.cpp
+++ b/lanbrowsing/kcmlisa/main.cpp
@@ -33,15 +33,15 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_lisa(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_lisa(TQWidget *parent, const char *)
   {
     return new LisaSettings("/etc/lisarc", parent);
   }
-  KDE_EXPORT KCModule *create_reslisa(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_reslisa(TQWidget *parent, const char *)
   {
     return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent);
   }
-  KDE_EXPORT KCModule *create_kiolan(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_kiolan(TQWidget *parent, const char *)
   {
     return new IOSlaveSettings("kio_lanrc", parent);
   }
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