Rename a number of libraries and executables to avoid conflicts with KDE4

10 files changed, 18 insertions, 18 deletions

diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index 469b269f..36f7d3b3 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -25,7 +25,7 @@
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 typedef KGenericFactory<KRecConfigFiles, TQWidget> KRecConfigFilesFactory;
diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp
index 206eda1b..96340ed3 100644
--- a/krec/krecconfig_fileswidget.cpp
+++ b/krec/krecconfig_fileswidget.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tqlabel.h>
 
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index 633409f5..5db92218 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -26,7 +26,7 @@
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index 27975cdf..bee2f733 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -23,7 +23,7 @@
 #include <ktempdir.h>
 #include <ktempfile.h>
 #include <ktar.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <tqdir.h>
diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp
index 984048d2..a1c9c44c 100644
--- a/krec/krecglobal.cpp
+++ b/krec/krecglobal.cpp
@@ -16,7 +16,7 @@
 
 #include "krecexport_template.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwidget.h>
 #include <kapplication.h>
 #include <kstatusbar.h>
@@ -51,7 +51,7 @@ KRecGlobal* KRecGlobal::the() {
 void KRecGlobal::setMainWidget( TQWidget* n ) { _qwidget = n; }
 TQWidget* KRecGlobal::mainWidget() { return _qwidget; }
 
-TDEConfig* KRecGlobal::kconfig() { return kapp->config(); }
+TDEConfig* KRecGlobal::tdeconfig() { 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 06615d8d..e0733022 100644
--- a/krec/krecglobal.h
+++ b/krec/krecglobal.h
@@ -51,7 +51,7 @@ public:
 	TQWidget* mainWidget();
 
 	/// @return kapp->config()
-	static TDEConfig* kconfig();
+	static TDEConfig* tdeconfig();
 
 	/// Sets the Statusbar.
 	void setStatusBar( KStatusBar* );
diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp
index a5cdc07b..fc713a1a 100644
--- a/krec/krecnewproperties.cpp
+++ b/krec/krecnewproperties.cpp
@@ -17,7 +17,7 @@
 #include "krecglobal.h"
 #include "krecconfig_fileswidget.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqbuttongroup.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
@@ -39,7 +39,7 @@ KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n )
   , _samplerate( 44100 ), _channels( 2 ), _bits( 16 )
 {
 kdDebug( 60005 ) << k_funcinfo << endl;
-	TDEConfig *config = KRecGlobal::kconfig();
+	TDEConfig *config = KRecGlobal::tdeconfig();
 	config->setGroup( "FileDefaults" );
 	_samplerate = config->readNumEntry( "SamplingRate", 44100 );
 	_channels = config->readNumEntry( "Channels", 2 );
@@ -91,8 +91,8 @@ void KRecNewProperties::channelschanged( int channels ) { _channels = channels;
 void KRecNewProperties::bitschanged( int bits ) { _bits = bits; }
 void KRecNewProperties::usedefaultschanged( bool n ) {
 	_usedefaults = n;
-	KRecGlobal::kconfig()->setGroup( "FileDefaults" );
-	KRecGlobal::kconfig()->writeEntry( "UseDefaults", _usedefaults );
+	KRecGlobal::tdeconfig()->setGroup( "FileDefaults" );
+	KRecGlobal::tdeconfig()->writeEntry( "UseDefaults", _usedefaults );
 }
 
 void KRecNewProperties::done( int r ) {
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index 538957c5..164a38df 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -25,13 +25,13 @@
 
 #include <arts/kaudioplaystream.h>
 #include <arts/kaudiorecordstream.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <ksettings/dialog.h>
@@ -359,7 +359,7 @@ KRecord::~KRecord(){
 	d->volumecontrol = Arts::StereoVolumeControl::null();
 	if( d->b_comp ) d->comp = Arts::StereoEffect::null();
 
-	KRecGlobal::kconfig()->sync();
+	KRecGlobal::tdeconfig()->sync();
 	delete d;
 	kdDebug( 60005 ) << k_funcinfo << "done. Bye!" << endl;
 }
diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp
index 7ec27e52..312a91e0 100644
--- a/krec/mp3_export/krecexport_mp3.cpp
+++ b/krec/mp3_export/krecexport_mp3.cpp
@@ -25,7 +25,7 @@
 #include <time.h>
 #include <tqdatetime.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 // Error code definitions from lame.h
@@ -155,7 +155,7 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 	} else return false;
 }
 
-// Derived from tdemultimedia/kioslave/audiocd/audiocd.cpp.
+// Derived from tdemultimedia/tdeioslave/audiocd/audiocd.cpp.
 // We use the encoding settings from kcmaudiocd.
 void KRecExport_MP3::setLameParameters() {
 	TDEConfig *config;
diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp
index e7e9c4dc..f8bc9799 100644
--- a/krec/ogg_export/krecexport_ogg.cpp
+++ b/krec/ogg_export/krecexport_ogg.cpp
@@ -24,7 +24,7 @@
 #include <ktempfile.h>
 #include <tqfile.h>
 #include <tqtimer.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <stdlib.h>
 #include <time.h>
 #include <tqdatetime.h>
@@ -191,7 +191,7 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 }
 
 
-// Derived from tdemultimedia/kioslave/audiocd/audiocd.cpp.
+// Derived from tdemultimedia/tdeioslave/audiocd/audiocd.cpp.
 // We use the encoding settings from kcmaudiocd.
 void KRecExport_OGG::setOggParameters() {
 kdDebug( 60005 ) << k_funcinfo << endl;