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

5 files changed, 13 insertions, 13 deletions

diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 10bf9b29..2945dfdd 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -69,7 +69,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList,
    cbSkipDialog = new TQCheckBox( i18n("&Do not ask on startup again, always use this device"),
 				 page, "CBOX_SKIP_ON_START" );
 
-   KConfig *gcfg = TDEGlobal::config();
+   TDEConfig *gcfg = TDEGlobal::config();
    gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
    cbSkipDialog->setChecked( skipDialog );
@@ -80,7 +80,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList,
 
 TQCString DeviceSelector::getDeviceFromConfig( void ) const
 {
-   KConfig *gcfg = TDEGlobal::config();
+   TDEConfig *gcfg = TDEGlobal::config();
    gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
    
@@ -125,7 +125,7 @@ TQCString DeviceSelector::getSelectedDevice( void ) const
    kdDebug(29000) << "The selected device: <" << dev << ">" << endl;
 
    /* Store scanner selection settings */
-   KConfig *c = TDEGlobal::config();
+   TDEConfig *c = TDEGlobal::config();
    c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    /* Write both the scan device and the skip-start-dialog flag global. */
    c->writeEntry( STARTUP_SCANDEV, dev, true, true );
@@ -140,7 +140,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources,
 				     const TQStringList& hrSources )
 {
    bool default_ok = false;
-   KConfig *gcfg = TDEGlobal::config();
+   TDEConfig *gcfg = TDEGlobal::config();
    gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    TQCString defstr = gcfg->readEntry( STARTUP_SCANDEV, "" ).local8Bit();
 
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index a721a094..d42ddb9f 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -187,7 +187,7 @@ KScanDevice::KScanDevice( TQObject *parent )
     pixel_y = 0;
     scanner_name = 0L;
 
-    KConfig *konf = TDEGlobal::config ();
+    TDEConfig *konf = TDEGlobal::config ();
     konf->setGroup( GROUP_STARTUP );
     bool netaccess = konf->readBoolEntry( STARTUP_ONLY_LOCAL, false );
     kdDebug(29000) << "Query for network scanners " << (netaccess ? "Not enabled" : "Enabled") << endl;
diff --git a/libkscan/kscanoptset.cpp b/libkscan/kscanoptset.cpp
index 80404d74..0c9b76e6 100644
--- a/libkscan/kscanoptset.cpp
+++ b/libkscan/kscanoptset.cpp
@@ -146,7 +146,7 @@ void KScanOptSet::saveConfig( const TQString& scannerName, const TQString& confi
    TQString confFile = SCANNER_DB_FILE;
    kdDebug( 29000) << "Creating scan configuration file <" << confFile << ">" << endl;
 
-   KConfig *scanConfig = new KConfig( confFile );
+   TDEConfig *scanConfig = new TDEConfig( confFile );
    TQString cfgName = configName;
 
    if( configName.isNull() || configName.isEmpty() )
@@ -180,7 +180,7 @@ bool KScanOptSet::load( const TQString& /*scannerName*/ )
    kdDebug( 29000) << "** Reading from scan configuration file <" << confFile << ">" << endl;
    bool ret = true;
 
-   KConfig *scanConfig = new KConfig( confFile, true );
+   TDEConfig *scanConfig = new TDEConfig( confFile, true );
    TQString cfgName = name; /* of the KScanOptSet, given in constructor */
 
    if( cfgName.isNull() || cfgName.isEmpty() )
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index b7705f82..183c7ba6 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -125,7 +125,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     layout->addLayout( left, 2 );
 
     /* Load autoselection values from Config file */
-    KConfig *cfg = TDEGlobal::config();
+    TDEConfig *cfg = TDEGlobal::config();
     cfg->setGroup( GROUP_STARTUP );
 
     /* Units etc. TODO: get from Config */
diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp
index 3bc492aa..c4b8691b 100644
--- a/libkscan/scandialog.cpp
+++ b/libkscan/scandialog.cpp
@@ -129,7 +129,7 @@ void ScanDialog::createOptionsTab( void )
 
 
    /* Read settings for startup behavior */
-   KConfig *gcfg = TDEGlobal::config();
+   TDEConfig *gcfg = TDEGlobal::config();
    gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    bool skipDialog  = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
    bool onlyLocal   = gcfg->readBoolEntry( STARTUP_ONLY_LOCAL, false );
@@ -153,7 +153,7 @@ void ScanDialog::slotNetworkToggle( bool state)
    bool writestate = !state;
 
    kdDebug(29000) << "slotNetworkToggle: Writing state " << writestate << endl;
-   KConfig *c = TDEGlobal::config();
+   TDEConfig *c = TDEGlobal::config();
    c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    c->writeEntry( STARTUP_ONLY_LOCAL, writestate, true, true );
 }
@@ -163,7 +163,7 @@ void ScanDialog::slotAskOnStartToggle(bool state)
    bool writestate = !state;
 
    kdDebug(29000) << "slotAskOnStartToggle: Writing state " << writestate << endl;
-   KConfig *c = TDEGlobal::config();
+   TDEConfig *c = TDEGlobal::config();
    c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    c->writeEntry( STARTUP_SKIP_ASK, writestate, true, true );
 }
@@ -307,7 +307,7 @@ bool ScanDialog::setup()
     /* set initial sizes */
     setInitialSize( configDialogSize( GROUP_STARTUP ));
 
-    KConfig *kfg = TDEGlobal::config();
+    TDEConfig *kfg = TDEGlobal::config();
     if( kfg )
     {
        TQRect r = TDEGlobalSettings::desktopGeometry(this);
@@ -329,7 +329,7 @@ void ScanDialog::slotClose()
 
    if( splitter )
    {
-      KConfig *kfg = TDEGlobal::config();
+      TDEConfig *kfg = TDEGlobal::config();
       if( kfg )
       {
          TQRect r = TDEGlobalSettings::desktopGeometry(this);