summaryrefslogtreecommitdiffstats
path: root/kmix/mixer.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:36 -0600
commitde9a6aa007626eba4e333ac4080cbdfcb9f98386 (patch)
tree79166818db79c0ac7acfbbb545a4929c0cd62b04 /kmix/mixer.cpp
parent27430f06c6cc2187c639f59f342f07f1fde91a8b (diff)
downloadtdemultimedia-de9a6aa007626eba4e333ac4080cbdfcb9f98386.tar.gz
tdemultimedia-de9a6aa007626eba4e333ac4080cbdfcb9f98386.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmix/mixer.cpp')
-rw-r--r--kmix/mixer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 0e7c36fc..99fd84b0 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -110,7 +110,7 @@ Mixer::~Mixer() {
delete _pollingTimer;
}
-void Mixer::volumeSave( KConfig *config )
+void Mixer::volumeSave( TDEConfig *config )
{
// kdDebug(67100) << "Mixer::volumeSave()" << endl;
readSetFromHW();
@@ -119,7 +119,7 @@ void Mixer::volumeSave( KConfig *config )
_mixerBackend->m_mixDevices.write( config, grp );
}
-void Mixer::volumeLoad( KConfig *config )
+void Mixer::volumeLoad( TDEConfig *config )
{
TQString grp("Mixer");
grp.append(mixerName());