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

3 files changed, 14 insertions, 14 deletions

diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp
index bca13210..76e8e2e5 100644
--- a/kjumpingcube/kcubeboxwidget.cpp
+++ b/kjumpingcube/kcubeboxwidget.cpp
@@ -242,7 +242,7 @@ void KCubeBoxWidget::stopActivities()
 
 }
 
-void KCubeBoxWidget::saveProperties(KConfigBase* config)
+void KCubeBoxWidget::saveProperties(TDEConfigBase* config)
 {
    if(isMoving())
    {
@@ -275,7 +275,7 @@ void KCubeBoxWidget::saveProperties(KConfigBase* config)
   config->writeEntry("CubeDim",dim());
 }
 
-void KCubeBoxWidget::readProperties(KConfigBase* config)
+void KCubeBoxWidget::readProperties(TDEConfigBase* config)
 {
   TQStrList list;
   list.setAutoDelete(true);
diff --git a/kjumpingcube/kcubeboxwidget.h b/kjumpingcube/kcubeboxwidget.h
index b7645b2a..aea02ead 100644
--- a/kjumpingcube/kcubeboxwidget.h
+++ b/kjumpingcube/kcubeboxwidget.h
@@ -31,7 +31,7 @@ class TQGridLayout;
 class CubeBox;
 class TQPalette;
 class TQTimer;
-class KConfigBase;
+class TDEConfigBase;
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -108,8 +108,8 @@ public:
    */
    void checkComputerplayer(Player player);
  
-   inline void saveGame(KConfigBase *c) { saveProperties(c); }
-   inline void restoreGame(KConfigBase *c) { readProperties(c); } 
+   inline void saveGame(TDEConfigBase *c) { saveProperties(c); }
+   inline void restoreGame(TDEConfigBase *c) { readProperties(c); } 
   
 public slots:
    /** stops all activities like getting a hint or doing a move */
@@ -135,8 +135,8 @@ protected:
    virtual void deleteCubes();
    virtual void initCubes(); 
 
-   void saveProperties(KConfigBase *);
-   void readProperties(KConfigBase *);
+   void saveProperties(TDEConfigBase *);
+   void readProperties(TDEConfigBase *);
 
 protected slots:
    /** sets the cursor to an waitcursor */
diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp
index 32b19673..c8f8e66f 100644
--- a/kjumpingcube/kjumpingcube.cpp
+++ b/kjumpingcube/kjumpingcube.cpp
@@ -120,7 +120,7 @@ void KJumpingCube::saveGame(bool saveAs)
             url.setFileName( url.filename()+".kjc" );
          }
 
-         if(KIO::NetAccess::exists(url,false,this))
+         if(TDEIO::NetAccess::exists(url,false,this))
          {
             TQString mes=i18n("The file %1 exists.\n"
                "Do you want to overwrite it?").arg(url.url());
@@ -144,7 +144,7 @@ void KJumpingCube::saveGame(bool saveAs)
    view->saveGame(&config);
    config.sync();
 
-   if(KIO::NetAccess::upload( tempFile.name(),gameURL,this ))
+   if(TDEIO::NetAccess::upload( tempFile.name(),gameURL,this ))
    {
       TQString s=i18n("game saved as %1");
       s=s.arg(gameURL.url());
@@ -166,7 +166,7 @@ void KJumpingCube::openGame()
       url = KFileDialog::getOpenURL( gameURL.url(), "*.kjc", this, 0 );
       if( url.isEmpty() )
          return;
-      if(!KIO::NetAccess::exists(url,true,this))
+      if(!TDEIO::NetAccess::exists(url,true,this))
       {
          TQString mes=i18n("The file %1 does not exist!").arg(url.url());
          KMessageBox::sorry(this,mes);
@@ -176,7 +176,7 @@ void KJumpingCube::openGame()
    while(!fileOk);
 
    TQString tempFile;
-   if( KIO::NetAccess::download( url, tempFile, this ) )
+   if( TDEIO::NetAccess::download( url, tempFile, this ) )
    {
       KSimpleConfig config(tempFile,true);
       config.setGroup("KJumpingCube");
@@ -194,7 +194,7 @@ void KJumpingCube::openGame()
 
       undoAction->setEnabled(false);
 
-      KIO::NetAccess::removeTempFile( tempFile );
+      TDEIO::NetAccess::removeTempFile( tempFile );
    }
    else
       KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
@@ -265,10 +265,10 @@ void KJumpingCube::enableStop_Thinking(){
  * Show Configure dialog.
  */
 void KJumpingCube::showOptions(){
-  if(KConfigDialog::showDialog("settings"))
+  if(TDEConfigDialog::showDialog("settings"))
     return;
 
-  KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
+  TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
   dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings");
   connect(dialog, TQT_SIGNAL(settingsChanged()), view, TQT_SLOT(loadSettings()));
   dialog->show();