summaryrefslogtreecommitdiffstats
path: root/kcontrol/arts/arts.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/arts/arts.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/arts/arts.cpp')
-rw-r--r--kcontrol/arts/arts.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index c6a012fe7..feea9b1d1 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -55,7 +55,7 @@
extern "C" {
KDE_EXPORT void init_arts();
- KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/)
+ KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/)
{
TDEGlobal::locale()->insertCatalogue("kcmarts");
return new KArtsModule(parent, "kcmarts" );
@@ -64,7 +64,7 @@ extern "C" {
static bool startArts()
{
- KConfig *config = new KConfig("kcmartsrc", true, false);
+ TDEConfig *config = new TDEConfig("kcmartsrc", true, false);
config->setGroup("Arts");
bool startServer = config->readBoolEntry("StartServer",true);
@@ -139,7 +139,7 @@ void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len)
}
KArtsModule::KArtsModule(TQWidget *parent, const char *name)
- : KCModule(parent, name), configChanged(false)
+ : TDECModule(parent, name), configChanged(false)
{
setButtons(Default|Apply);
@@ -157,7 +157,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
general = new generalTab(tab);
hardware = new hardwareTab(tab);
- //mixer = KCModuleLoader::loadModule("kmixcfg", tab);
+ //mixer = TDECModuleLoader::loadModule("kmixcfg", tab);
//midi = new KMidConfig(tab, "kmidconfig");
general->layout()->setMargin( KDialog::marginHint() );
@@ -211,7 +211,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
};
- config = new KConfig("kcmartsrc");
+ config = new TDEConfig("kcmartsrc");
load();
suspendTime->setRange( 1, 999, 1, true );
@@ -306,7 +306,7 @@ void KArtsModule::load( bool useDefaults )
// config->setGroup( "Mixer" );
// general->volumeSystray->setChecked( config->readBoolEntry( "VolumeControlOnSystray", true ) );
- KConfig *midiConfig = new KConfig( "kcmmidirc", true );
+ TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", true );
midiConfig->setGroup( "Configuration" );
hardware->midiDevice->setCurrentItem( midiConfig->readNumEntry( "midiDevice", 0 ) );
@@ -376,7 +376,7 @@ void KArtsModule::saveParams( void )
// config->setGroup( "Mixer" );
// config->writeEntry( "VolumeControlOnSystray", general->volumeSystray->isChecked() );
- KConfig *midiConfig = new KConfig( "kcmmidirc", false );
+ TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", false );
midiConfig->setGroup( "Configuration" );
midiConfig->writeEntry( "midiDevice", hardware->midiDevice->currentItem() );
@@ -385,7 +385,7 @@ void KArtsModule::saveParams( void )
delete midiConfig;
- KConfig *knotifyConfig = new KConfig( "knotifyrc", false );
+ TDEConfig *knotifyConfig = new TDEConfig( "knotifyrc", false );
knotifyConfig->setGroup( "StartProgress" );
knotifyConfig->writeEntry( "Arts Init", startServer->isChecked() );