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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp
index 9d27ef1..f0864a9 100644
--- a/src/app/historyAction.cpp
+++ b/src/app/historyAction.cpp
@@ -79,14 +79,14 @@ HistoryCollection::pop() //slot
 }
 
 void
-HistoryCollection::save( KConfig *config )
+HistoryCollection::save( TDEConfig *config )
 {
     config->writePathEntry( "backHistory", m_b->m_list );
     config->writePathEntry( "forwardHistory", m_f->m_list );
 }
 
 void
-HistoryCollection::restore( KConfig *config )
+HistoryCollection::restore( TDEConfig *config )
 {
     m_b->m_list = config->readPathListEntry( "backHistory" );
     m_f->m_list = config->readPathListEntry( "forwardHistory" );
diff --git a/src/app/historyAction.h b/src/app/historyAction.h
index 9ed65ab..1eaa1aa 100644
--- a/src/app/historyAction.h
+++ b/src/app/historyAction.h
@@ -8,7 +8,7 @@
 #include <kurl.h>
 #include <tqstringlist.h>
 
-class KConfig;
+class TDEConfig;
 
 
 /// defined in mainWindow.cpp
@@ -45,8 +45,8 @@ Q_OBJECT
 public:
     HistoryCollection( KActionCollection *ac, TQObject *parent, const char *name );
 
-    void save( KConfig *config );
-    void restore( KConfig *config );
+    void save( TDEConfig *config );
+    void restore( TDEConfig *config );
 
 public slots:
     void push( const KURL& );
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index fa5d365..b7f99ec 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -57,7 +57,7 @@ MainWindow::MainWindow()
         KMessageBox::error( this, i18n("Filelight is not installed properly, consequently its menus and toolbars will appear reduced or even empty") );
     delete buttons;
 
-    connect( m_part, TQT_SIGNAL(started( KIO::Job* )), TQT_SLOT(scanStarted()) );
+    connect( m_part, TQT_SIGNAL(started( TDEIO::Job* )), TQT_SLOT(scanStarted()) );
     connect( m_part, TQT_SIGNAL(completed()), TQT_SLOT(scanCompleted()) );
     connect( m_part, TQT_SIGNAL(canceled( const TQString& )), TQT_SLOT(scanFailed()) );
 
@@ -65,7 +65,7 @@ MainWindow::MainWindow()
     connect( m_part, TQT_SIGNAL(canceled( const TQString& )), m_histories, TQT_SLOT(stop()) );
     connect( BrowserExtension::childObject( m_part ), TQT_SIGNAL(openURLNotify()), TQT_SLOT(urlAboutToChange()) );
 
-    KConfig* const config = TDEGlobal::config();
+    TDEConfig* const config = TDEGlobal::config();
     config->setGroup( "general" );
     m_combo->setHistoryItems( config->readPathListEntry( "comboHistory" ) );
     applyMainWindowSettings( config, "window" );
@@ -114,7 +114,7 @@ MainWindow::queryExit()
     if( !m_part ) //apparently std::exit() still calls this function, and abort() causes a crash..
        return true;
 
-    KConfig* const config = TDEGlobal::config();
+    TDEConfig* const config = TDEGlobal::config();
 
     saveMainWindowSettings( config, "window" );
     m_recentScans->saveEntries( config );
@@ -237,14 +237,14 @@ MainWindow::urlAboutToChange()
  **********************************************/
 
 void
-MainWindow::saveProperties( KConfig *config ) //virtual
+MainWindow::saveProperties( TDEConfig *config ) //virtual
 {
    m_histories->save( config );
    config->writeEntry( "currentMap", m_part->url().path() );
 }
 
 void
-MainWindow::readProperties( KConfig *config ) //virtual
+MainWindow::readProperties( TDEConfig *config ) //virtual
 {
    m_histories->restore( config );
    slotScanPath( config->readEntry( "currentMap", TQString() ) );
diff --git a/src/app/mainWindow.h b/src/app/mainWindow.h
index 777a692..68314aa 100644
--- a/src/app/mainWindow.h
+++ b/src/app/mainWindow.h
@@ -63,8 +63,8 @@ class MainWindow : public KParts::MainWindow
     void urlAboutToChange();
 
   protected:
-    virtual void saveProperties( KConfig * );
-    virtual void readProperties( KConfig * );
+    virtual void saveProperties( TDEConfig * );
+    virtual void readProperties( TDEConfig * );
     virtual bool queryExit();
 
   private: