From de9a6aa007626eba4e333ac4080cbdfcb9f98386 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:35:36 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kmix/kmix.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kmix/kmix.cpp')

diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index c20c9443..a9fb11d0 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -229,7 +229,7 @@ KMixWindow::saveSettings()
 void
 KMixWindow::saveConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(0);
 
    // make sure we don't start without any UI
@@ -289,7 +289,7 @@ KMixWindow::saveConfig()
 void
 KMixWindow::loadConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(0);
 
    m_showDockWidget = config->readBoolEntry("AllowDocking", true);
@@ -468,7 +468,7 @@ KMixWindow::showAbout()
 void
 KMixWindow::loadVolumes()
 {
-	KConfig *cfg = new KConfig( "kmixctrlrc", true );
+	TDEConfig *cfg = new TDEConfig( "kmixctrlrc", true );
 	for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next())
 	{
 		mixer->volumeLoad( cfg );
@@ -484,7 +484,7 @@ KMixWindow::loadVolumes()
 void
 KMixWindow::saveVolumes()
 {
-    KConfig *cfg = new KConfig( "kmixctrlrc", false );
+    TDEConfig *cfg = new TDEConfig( "kmixctrlrc", false );
     for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) {
 	//kdDebug(67100) << "KMixWindow::saveConfig()" << endl;
 	if ( mixer->isOpen() ) { // protect from unplugged devices (better do *not* save them)
-- 
cgit v1.2.3