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

---
 ktux/sprite.cpp     | 6 +++---
 ktux/spriteanim.cpp | 8 ++++----
 ktux/spriteanim.h   | 8 ++++----
 ktux/spritepm.cpp   | 4 ++--
 ktux/spritepm.h     | 4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'ktux')

diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp
index 0fb80e4..c87fd9c 100644
--- a/ktux/sprite.cpp
+++ b/ktux/sprite.cpp
@@ -99,7 +99,7 @@ KSpriteSetup::~KSpriteSetup()
 // read settings from config file
 void KSpriteSetup::readSettings()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Settings" );
 
     speed = config->readNumEntry( "Speed", 50 );
@@ -119,7 +119,7 @@ void KSpriteSetup::slotSpeed(int s)
 // Ok pressed - save settings and exit
 void KSpriteSetup::slotOkPressed()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Settings");
     config->writeEntry("Speed", speed);
     config->sync();
@@ -171,7 +171,7 @@ void KSpriteSaver::readSettings()
 {
     TQString str;
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Settings");
 
     mSpeed = config->readNumEntry("Speed", 50);
diff --git a/ktux/spriteanim.cpp b/ktux/spriteanim.cpp
index fdbcd00..fe4e70e 100644
--- a/ktux/spriteanim.cpp
+++ b/ktux/spriteanim.cpp
@@ -52,7 +52,7 @@ bool SpriteObject::outOfBounds() const
 //
 // SpriteDef stores the animations that create an object
 //
-SpriteDef::SpriteDef(KConfigBase &config)
+SpriteDef::SpriteDef(TDEConfigBase &config)
 {
     read(config);
 }
@@ -82,7 +82,7 @@ SpriteObject *SpriteDef::create( TQCanvas *c )
 }
 
 //---------------------------------------------------------------------------
-void SpriteDef::read(KConfigBase &config)
+void SpriteDef::read(TDEConfigBase &config)
 {
     mDirX.set(config.readEntry("DirectionX", "0"));
     mDirY.set(config.readEntry("DirectionY", "0"));
@@ -101,7 +101,7 @@ void SpriteDef::read(KConfigBase &config)
 //
 // SpriteGroup
 //
-SpriteGroup::SpriteGroup(TQCanvas *c, KConfigBase &config)
+SpriteGroup::SpriteGroup(TQCanvas *c, TDEConfigBase &config)
     : mCanvas(c)
 {
     mAvailable.setAutoDelete(true);
@@ -141,7 +141,7 @@ void SpriteGroup::refresh()
 
 
 //---------------------------------------------------------------------------
-void SpriteGroup::read(KConfigBase &config)
+void SpriteGroup::read(TDEConfigBase &config)
 {
     SpriteRange countRange(config.readEntry("Count", "1"));
     mCount = countRange.random();
diff --git a/ktux/spriteanim.h b/ktux/spriteanim.h
index cb19385..8749a2a 100644
--- a/ktux/spriteanim.h
+++ b/ktux/spriteanim.h
@@ -49,12 +49,12 @@ protected:
 class SpriteDef
 {
 public:
-    SpriteDef(KConfigBase &config);
+    SpriteDef(TDEConfigBase &config);
 
     SpriteObject *create( TQCanvas *c );
 
 protected:
-    void read(KConfigBase &config);
+    void read(TDEConfigBase &config);
 
 protected:
     SpriteRange             mDirX;
@@ -75,14 +75,14 @@ protected:
 class SpriteGroup
 {
 public:
-    SpriteGroup(TQCanvas *c, KConfigBase &config);
+    SpriteGroup(TQCanvas *c, TDEConfigBase &config);
 
     void next();
     void refresh();
     int refreshTime() const { return mRefresh.random(); }
 
 protected:
-    void read(KConfigBase &config);
+    void read(TDEConfigBase &config);
 
 protected:
     TQPtrList<SpriteDef>        mAvailable;
diff --git a/ktux/spritepm.cpp b/ktux/spritepm.cpp
index d933144..ca11f56 100644
--- a/ktux/spritepm.cpp
+++ b/ktux/spritepm.cpp
@@ -112,7 +112,7 @@ SpriteSequenceManager::~SpriteSequenceManager()
 // Returns:
 //   pointer to sprite if loaded successfully, 0 otherwise.
 //
-SpritePixmapSequence *SpriteSequenceManager::load(KConfigBase &config,
+SpritePixmapSequence *SpriteSequenceManager::load(TDEConfigBase &config,
     const TQString & name)
 {
     SpritePixmapSequence *sprite = mSprites.find(name);
@@ -133,7 +133,7 @@ SpritePixmapSequence *SpriteSequenceManager::load(KConfigBase &config,
 
 //---------------------------------------------------------------------------
 //
-SpritePixmapSequence *SpriteSequenceManager::read(KConfigBase &config)
+SpritePixmapSequence *SpriteSequenceManager::read(TDEConfigBase &config)
 {
     TQStrList strImages;
     TQStrList strDelays;
diff --git a/ktux/spritepm.h b/ktux/spritepm.h
index b3aaa6e..97d27e8 100644
--- a/ktux/spritepm.h
+++ b/ktux/spritepm.h
@@ -67,14 +67,14 @@ public:
     SpriteSequenceManager();
     ~SpriteSequenceManager();
  
-    SpritePixmapSequence *load(KConfigBase &config, const TQString & name);
+    SpritePixmapSequence *load(TDEConfigBase &config, const TQString & name);
     SpritePixmapSequence *sprite(const char *name)
         { return mSprites.find(name); }
 
     static SpriteSequenceManager *manager();
      
 protected:
-    SpritePixmapSequence *read(KConfigBase &config);
+    SpritePixmapSequence *read(TDEConfigBase &config);
 
 protected:
     TQDict<SpritePixmapSequence> mSprites;
-- 
cgit v1.2.1