Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

7 files changed, 25 insertions, 25 deletions

diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp
index 1679eb6..47f5864 100644
--- a/ksim/monitors/snmp/chartmonitor.cpp
+++ b/ksim/monitors/snmp/chartmonitor.cpp
@@ -51,7 +51,7 @@ void ChartMonitor::setData( const Value &data )
     setValue( currentValue );
     if ( m_config.displayCurrentValueInline ) {
         TQ_UINT64 bytesPerSec = currentValue / ( m_config.refreshInterval.seconds + m_config.refreshInterval.minutes * 60 );
-        setText( KIO::convertSize( bytesPerSec ), 0 );
+        setText( TDEIO::convertSize( bytesPerSec ), 0 );
     }
 }
 
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index ee50054..8e4102f 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -76,7 +76,7 @@ ConfigPage::~ConfigPage()
 
 void ConfigPage::saveConfig()
 {
-    KConfig &cfg = *config();
+    TDEConfig &cfg = *config();
 
     // collect garbage
     removeAllHostGroups();
@@ -92,7 +92,7 @@ void ConfigPage::saveConfig()
 
 void ConfigPage::readConfig()
 {
-    KConfig &cfg = *config();
+    TDEConfig &cfg = *config();
 
     cfg.setGroup( "General" );
     TQStringList hosts = cfg.readListEntry( "Hosts" );
@@ -274,7 +274,7 @@ void ConfigPage::removeAllMonitorGroups()
 
 void ConfigPage::removeConfigGroups( const TQString &prefix )
 {
-    KConfig &cfg = *config();
+    TDEConfig &cfg = *config();
 
     TQStringList groups = cfg.groupList();
     for ( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it )
diff --git a/ksim/monitors/snmp/hostconfig.cpp b/ksim/monitors/snmp/hostconfig.cpp
index 1188c12..844bee5 100644
--- a/ksim/monitors/snmp/hostconfig.cpp
+++ b/ksim/monitors/snmp/hostconfig.cpp
@@ -33,7 +33,7 @@ static int defaultSnmpPort()
     return ent->s_port;
 }
 
-bool HostConfig::load( KConfigBase &config )
+bool HostConfig::load( TDEConfigBase &config )
 {
     name = config.readEntry( "Host" );
     if ( name.isEmpty() )
@@ -76,7 +76,7 @@ bool HostConfig::load( KConfigBase &config )
     return true;
 }
 
-void HostConfig::save( KConfigBase &config ) const
+void HostConfig::save( TDEConfigBase &config ) const
 {
     if ( isNull() )
         return;
@@ -109,7 +109,7 @@ void HostConfig::save( KConfigBase &config ) const
     writeIfNotEmpty( config, "PrivPassphrase", KStringHandler::obscure( privacy.key ) );
 }
 
-void HostConfig::writeIfNotEmpty( KConfigBase &config, const TQString &name, const TQString &value )
+void HostConfig::writeIfNotEmpty( TDEConfigBase &config, const TQString &name, const TQString &value )
 {
     if ( value.isEmpty() )
         return;
@@ -117,7 +117,7 @@ void HostConfig::writeIfNotEmpty( KConfigBase &config, const TQString &name, con
     config.writeEntry( name, value );
 }
 
-void HostConfigMap::load( KConfigBase &config, const TQStringList &hosts )
+void HostConfigMap::load( TDEConfigBase &config, const TQStringList &hosts )
 {
     clear();
 
@@ -132,7 +132,7 @@ void HostConfigMap::load( KConfigBase &config, const TQStringList &hosts )
     }
 }
 
-TQStringList HostConfigMap::save( KConfigBase &config ) const
+TQStringList HostConfigMap::save( TDEConfigBase &config ) const
 {
     TQStringList hostList;
 
diff --git a/ksim/monitors/snmp/hostconfig.h b/ksim/monitors/snmp/hostconfig.h
index af8a0fd..3726eb5 100644
--- a/ksim/monitors/snmp/hostconfig.h
+++ b/ksim/monitors/snmp/hostconfig.h
@@ -31,7 +31,7 @@ namespace Snmp
 struct HostConfig
 {
     HostConfig() {}
-    HostConfig( KConfigBase &config )
+    HostConfig( TDEConfigBase &config )
     { load( config ); }
 
     TQString name; // hostname
@@ -56,8 +56,8 @@ struct HostConfig
         TQString key;
     } privacy;
 
-    bool load( KConfigBase &config );
-    void save( KConfigBase &config ) const;
+    bool load( TDEConfigBase &config );
+    void save( TDEConfigBase &config ) const;
 
     bool isNull() const { return name.isEmpty(); }
 
@@ -65,7 +65,7 @@ struct HostConfig
     { return name == rhs.name; }
 
 private:
-    static void writeIfNotEmpty( KConfigBase &config, const TQString &name, const TQString &value );
+    static void writeIfNotEmpty( TDEConfigBase &config, const TQString &name, const TQString &value );
 };
 
 struct HostConfigMap : public TQMap< TQString, HostConfig >
@@ -74,8 +74,8 @@ struct HostConfigMap : public TQMap< TQString, HostConfig >
     HostConfigMap( const TQMap< TQString, HostConfig > &rhs )
         : TQMap< TQString, HostConfig >( rhs ) {}
 
-    void load( KConfigBase &config, const TQStringList &hosts );
-    TQStringList save( KConfigBase &config ) const;
+    void load( TDEConfigBase &config, const TQStringList &hosts );
+    TQStringList save( TDEConfigBase &config ) const;
 };
 
 }
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 6ab85b6..d2dee45 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -33,7 +33,7 @@ MonitorConfig::MonitorConfig()
     displayCurrentValueInline = false;
 }
 
-bool MonitorConfig::load( KConfigBase &config, const HostConfigMap &hosts )
+bool MonitorConfig::load( TDEConfigBase &config, const HostConfigMap &hosts )
 {
     TQString hostName = config.readEntry( "Host" );
     if ( hostName.isEmpty() )
@@ -74,7 +74,7 @@ bool MonitorConfig::load( KConfigBase &config, const HostConfigMap &hosts )
     return true;
 }
 
-void MonitorConfig::save( KConfigBase &config ) const
+void MonitorConfig::save( TDEConfigBase &config ) const
 {
     if ( isNull() )
         return;
@@ -148,7 +148,7 @@ TQStringList KSim::Snmp::allDisplayTypes()
     return TQStringList() << "Label" << "Chart";
 }
 
-void MonitorConfigMap::load( KConfigBase &config, const TQStringList &names, const HostConfigMap &hosts )
+void MonitorConfigMap::load( TDEConfigBase &config, const TQStringList &names, const HostConfigMap &hosts )
 {
     clear();
 
@@ -163,7 +163,7 @@ void MonitorConfigMap::load( KConfigBase &config, const TQStringList &names, con
     }
 }
 
-TQStringList MonitorConfigMap::save( KConfigBase &config ) const
+TQStringList MonitorConfigMap::save( TDEConfigBase &config ) const
 {
     TQStringList names;
 
diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h
index cf2d525..5ad6a32 100644
--- a/ksim/monitors/snmp/monitorconfig.h
+++ b/ksim/monitors/snmp/monitorconfig.h
@@ -33,11 +33,11 @@ struct MonitorConfig
     enum DisplayType { Label = 0, Chart };
 
     MonitorConfig();
-    MonitorConfig( KConfigBase &config, const HostConfigMap &hosts )
+    MonitorConfig( TDEConfigBase &config, const HostConfigMap &hosts )
     { load( config, hosts ); }
 
-    bool load( KConfigBase &config, const HostConfigMap &hosts );
-    void save( KConfigBase &config ) const;
+    bool load( TDEConfigBase &config, const HostConfigMap &hosts );
+    void save( TDEConfigBase &config ) const;
 
     bool isNull() const { return name.isEmpty() || host.isNull(); }
 
@@ -65,8 +65,8 @@ struct MonitorConfigMap : public TQMap< TQString, MonitorConfig >
     MonitorConfigMap( const TQMap< TQString, MonitorConfig > &rhs )
         : TQMap< TQString, MonitorConfig >( rhs ) {}
 
-    void load( KConfigBase &config, const TQStringList &names, const HostConfigMap &hosts );
-    TQStringList save( KConfigBase &config ) const;
+    void load( TDEConfigBase &config, const TQStringList &names, const HostConfigMap &hosts );
+    TQStringList save( TDEConfigBase &config ) const;
 };
 
 typedef TQValueList<MonitorConfig> MonitorConfigList;
diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp
index 9515645..ec26949 100644
--- a/ksim/monitors/snmp/view.cpp
+++ b/ksim/monitors/snmp/view.cpp
@@ -47,7 +47,7 @@ void View::reparseConfig()
     m_widgets.clear();
     m_widgets.setAutoDelete( false );
 
-    KConfig &cfg = *config();
+    TDEConfig &cfg = *config();
     cfg.setGroup( "General" );
     TQStringList allHosts = cfg.readListEntry( "Hosts" );
     TQStringList monitors = cfg.readListEntry( "Monitors" );