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

15 files changed, 24 insertions, 24 deletions

diff --git a/krec/kcm_krec.desktop b/krec/kcm_krec.desktop
index d3fbeaeb..b3eae3db 100644
--- a/krec/kcm_krec.desktop
+++ b/krec/kcm_krec.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=krec
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=krec
diff --git a/krec/kcm_krec_files.desktop b/krec/kcm_krec_files.desktop
index e5a683db..3d2949ed 100644
--- a/krec/kcm_krec_files.desktop
+++ b/krec/kcm_krec_files.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=filenew
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=krec_files
diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index 4b62ed9c..469b269f 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -32,7 +32,7 @@ typedef KGenericFactory<KRecConfigFiles, TQWidget> KRecConfigFilesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_krec_files, KRecConfigFilesFactory( "krec" ) )
 
 KRecConfigFiles::KRecConfigFiles( TQWidget* p, const char*, const TQStringList& s )
- : KCModule( KRecConfigFilesFactory::instance(), p, s )
+ : TDECModule( KRecConfigFilesFactory::instance(), p, s )
  , _layout( 0 )
  , _filewidget( 0 )
 {
diff --git a/krec/krecconfig_files.h b/krec/krecconfig_files.h
index 8dcc0665..9de24310 100644
--- a/krec/krecconfig_files.h
+++ b/krec/krecconfig_files.h
@@ -27,7 +27,7 @@ class TQLabel;
 
 class KRecConfigFilesWidget;
 
-class KRecConfigFiles : public KCModule {
+class KRecConfigFiles : public TDECModule {
    Q_OBJECT
   
 public:
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index c29d6b4a..633409f5 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -35,7 +35,7 @@ typedef KGenericFactory<KRecConfigGeneral, TQWidget> KRecConfigGeneralFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_krec, KRecConfigGeneralFactory( "krec" ) )
 
 KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringList& s )
- : KCModule( KRecConfigGeneralFactory::instance(), p, s )
+ : TDECModule( KRecConfigGeneralFactory::instance(), p, s )
  , _layout( 0 ), _layout_display( 0 )
  , _display_title( 0 )
  , _displaybox( 0 ), _framebasebox( 0 )
diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h
index 736d77c4..63d9e6d9 100644
--- a/krec/krecconfigure.h
+++ b/krec/krecconfigure.h
@@ -27,7 +27,7 @@ class TQLabel;
 class TQCheckBox;
 class KPushButton;
 
-class KRecConfigGeneral : public KCModule {
+class KRecConfigGeneral : public TDECModule {
    Q_OBJECT
   
 public:
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index a1e5c584..27975cdf 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -166,7 +166,7 @@ void KRecFile::save( const TQString &fname ) {
 	tar->addLocalDirectory( _dir->name(), basename );
 
 	delete tar;
-	KIO::file_move( tmpname, filetosave, -1, true, false, true );
+	TDEIO::file_move( tmpname, filetosave, -1, true, false, true );
 
 	KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).arg( filename() ) );
 	_saved = true;
@@ -226,7 +226,7 @@ TQIODevice::Offset KRecFile::samplesToOffset( int n ) const {
 	return out;
 }
 
-/// * * * Properties <-> KConfig * * *
+/// * * * Properties <-> TDEConfig * * *
 void KRecFile::saveProps() {
 	kdDebug( 60005 ) << k_funcinfo << endl;
 	_config->setGroup( "General" );
@@ -327,7 +327,7 @@ KRecBuffer::~KRecBuffer() {
 	//kdDebug( 60005 ) << k_funcinfo << "done." << endl;
 }
 
-void KRecBuffer::writeConfig( KConfig* config ) {
+void KRecBuffer::writeConfig( TDEConfig* config ) {
 	//kdDebug( 60005 ) << k_funcinfo << config << endl;
 	config->writeEntry( "Filename", _fileinfo->fileName() );
 	config->writeEntry( "StartPos", _start );
@@ -336,7 +336,7 @@ void KRecBuffer::writeConfig( KConfig* config ) {
 	config->writeEntry( "Comment", _comment );
 }
 
-KRecBuffer* KRecBuffer::fromConfig( KConfig* config, TQDir* dir, KRecFile* p, const char* n ) {
+KRecBuffer* KRecBuffer::fromConfig( TDEConfig* config, TQDir* dir, KRecFile* p, const char* n ) {
 	kdDebug( 60005 ) << k_funcinfo << config << endl;
 	KRecBuffer* tmp = new KRecBuffer( dir->path() + "/" + config->readEntry( "Filename" ),
 	                       config->readNumEntry( "StartPos" ),
diff --git a/krec/krecfile.h b/krec/krecfile.h
index a90786dc..cdb9af2d 100644
--- a/krec/krecfile.h
+++ b/krec/krecfile.h
@@ -121,7 +121,7 @@ private:
 class TQFile;
 class TQDir;
 class TQFileInfo;
-class KConfig;
+class TDEConfig;
 class TQDataStream;
 
 class KRecBuffer : virtual public TQObject {
@@ -140,9 +140,9 @@ public:
 	/**
 		Writes out its Config
 		It doesn't set the group.
-		@param config the KConfig where the data gets written
+		@param config the TDEConfig where the data gets written
 	*/
-	void writeConfig( KConfig* config );
+	void writeConfig( TDEConfig* config );
 
 	/**
 		restores a KRecBuffer from Config
@@ -150,7 +150,7 @@ public:
 		@param config The configuration thats read
 		@param dir The directory where the file is saved
 	*/
-	static KRecBuffer* fromConfig( KConfig* config, TQDir* dir, KRecFile* p, const char* n=0 );
+	static KRecBuffer* fromConfig( TDEConfig* config, TQDir* dir, KRecFile* p, const char* n=0 );
 
 	TQString filename() const;
 
diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp
index 68c48665..6b55a075 100644
--- a/krec/krecglobal.cpp
+++ b/krec/krecglobal.cpp
@@ -51,7 +51,7 @@ KRecGlobal* KRecGlobal::the() {
 void KRecGlobal::setMainWidget( TQWidget* n ) { _qwidget = n; }
 TQWidget* KRecGlobal::mainWidget() { return _qwidget; }
 
-KConfig* KRecGlobal::kconfig() { return kapp->config(); }
+TDEConfig* KRecGlobal::kconfig() { return kapp->config(); }
 
 void KRecGlobal::setStatusBar( KStatusBar *bar ) { _statusbar = bar; }
 void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar->message( text, 2000 ); }
diff --git a/krec/krecglobal.h b/krec/krecglobal.h
index 71050fde..06615d8d 100644
--- a/krec/krecglobal.h
+++ b/krec/krecglobal.h
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqdict.h>
 
-class KConfig;
+class TDEConfig;
 class TQWidget;
 class KStatusBar;
 
@@ -51,7 +51,7 @@ public:
 	TQWidget* mainWidget();
 
 	/// @return kapp->config()
-	static KConfig* kconfig();
+	static TDEConfig* kconfig();
 
 	/// Sets the Statusbar.
 	void setStatusBar( KStatusBar* );
diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp
index c8c1398f..a5cdc07b 100644
--- a/krec/krecnewproperties.cpp
+++ b/krec/krecnewproperties.cpp
@@ -39,7 +39,7 @@ KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n )
   , _samplerate( 44100 ), _channels( 2 ), _bits( 16 )
 {
 kdDebug( 60005 ) << k_funcinfo << endl;
-	KConfig *config = KRecGlobal::kconfig();
+	TDEConfig *config = KRecGlobal::kconfig();
 	config->setGroup( "FileDefaults" );
 	_samplerate = config->readNumEntry( "SamplingRate", 44100 );
 	_channels = config->readNumEntry( "Channels", 2 );
diff --git a/krec/krecnewproperties.h b/krec/krecnewproperties.h
index f4739efd..e7c14404 100644
--- a/krec/krecnewproperties.h
+++ b/krec/krecnewproperties.h
@@ -16,7 +16,7 @@
 
 #include <tqdialog.h>
 
-class KConfig;
+class TDEConfig;
 class TQBoxLayout;
 class TQButtonGroup;
 class TQRadioButton;
diff --git a/krec/krecord_private.h b/krec/krecord_private.h
index 1385223c..e0d80c3e 100644
--- a/krec/krecord_private.h
+++ b/krec/krecord_private.h
@@ -34,7 +34,7 @@ class KRecExportItem;
 
 class KAudioRecordStream;
 class KAudioPlayStream;
-class KConfig;
+class TDEConfig;
 class ArtsActions;
 class KAction;
 class KActionMenu;
diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp
index 43db55a6..7ec27e52 100644
--- a/krec/mp3_export/krecexport_mp3.cpp
+++ b/krec/mp3_export/krecexport_mp3.cpp
@@ -158,8 +158,8 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 // Derived from tdemultimedia/kioslave/audiocd/audiocd.cpp.
 // We use the encoding settings from kcmaudiocd.
 void KRecExport_MP3::setLameParameters() {
-	KConfig *config;
-	config = new KConfig( "kcmaudiocdrc" );
+	TDEConfig *config;
+	config = new TDEConfig( "kcmaudiocdrc" );
 
 	config->setGroup( "MP3" );
 
diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp
index 32f274df..e7e9c4dc 100644
--- a/krec/ogg_export/krecexport_ogg.cpp
+++ b/krec/ogg_export/krecexport_ogg.cpp
@@ -195,8 +195,8 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 // We use the encoding settings from kcmaudiocd.
 void KRecExport_OGG::setOggParameters() {
 kdDebug( 60005 ) << k_funcinfo << endl;
-	KConfig *config;
-	config = new KConfig( "kcmaudiocdrc" );
+	TDEConfig *config;
+	config = new TDEConfig( "kcmaudiocdrc" );
 
 	config->setGroup( "Vorbis" );