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

---
 wifi/kwifimanager.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'wifi/kwifimanager.cpp')

diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 8c2f976a..ef3d5588 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -83,7 +83,7 @@ DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(f
   device = new Interface_wireless_wirelessextensions (ignoreInterfaces);
 
    //This setting gets here from the kdeglobals config
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   if (config->hasGroup("System Tray"))
       config->setGroup("System Tray");
   m_iconSize=config->readNumEntry("systrayIconWidth", 22);
@@ -110,7 +110,7 @@ DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(f
   connect (tricorder_trigger, TQT_SIGNAL (timeout ()), this,
 	   TQT_SLOT (tricorder_beep ()));
   connect (trayicon, TQT_SIGNAL (quitSelected ()), this, TQT_SLOT (slotFileQuit ()));
-  slotToggleTric(); //set to value saved by KConfig
+  slotToggleTric(); //set to value saved by TDEConfig
 
   setAutoSaveSettings();
   kapp->setMainWidget(this);
@@ -301,7 +301,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
 void
 KWiFiManagerApp::initActions ()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   if (config->hasGroup("General"))
 	config->setGroup("General");
   fileDisableRadio = new KToggleAction (i18n ("&Disable Radio"), 0, TQT_TQOBJECT(this),
@@ -313,19 +313,19 @@ KWiFiManagerApp::initActions ()
 		       TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation");
 
   settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") );
-  slotToggleStrengthCalc();  //set to value saved by KConfig
+  slotToggleStrengthCalc();  //set to value saved by TDEConfig
 
   settingsShowStatsNoise =
     new KToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, TQT_TQOBJECT(this),
 		       TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise");
 
   settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") );
-  slotShowStatsNoise();  //set to value saved by KConfig
+  slotShowStatsNoise();  //set to value saved by TDEConfig
 
   settingsShowStrengthNumber = new KToggleAction (i18n ("&Show Strength Number in System Tray"), 0, TQT_TQOBJECT(this),
                        TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray");
   settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") );
-  slotToggleShowStrengthNumber (); //set to value saved by KConfig
+  slotToggleShowStrengthNumber (); //set to value saved by TDEConfig
 
   KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), actionCollection ());
 
@@ -402,7 +402,7 @@ KWiFiManagerApp::initView ()
 void
 KWiFiManagerApp::slotToggleShowStrengthNumber ()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("General");
   config->writeEntry( "showStrengthNumberInTray", settingsShowStrengthNumber->isChecked() );
   if (settingsShowStrengthNumber->isChecked()) { showStrength = true; }
@@ -488,7 +488,7 @@ KWiFiManagerApp::slotDisablePowerProcessExited()
 void
 KWiFiManagerApp::slotToggleTric ()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("General");
   config->writeEntry( "acousticScanning", settingsAcousticScanning->isChecked() );
   if (settingsAcousticScanning->isChecked())
@@ -503,7 +503,7 @@ KWiFiManagerApp::slotToggleTric ()
 
 void KWiFiManagerApp::slotToggleStrengthCalc ()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("General");
   config->writeEntry( "useAlternateStrengthCalculation", settingsUseAlternateCalc->isChecked() );
   useAlternateStrengthCalc = settingsUseAlternateCalc->isChecked();
@@ -511,7 +511,7 @@ void KWiFiManagerApp::slotToggleStrengthCalc ()
 
 void KWiFiManagerApp::slotToggleStayInSystray ()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("General");
   config->writeEntry( "stayInSystrayOnClose", settingsStayInSystrayOnClose->isChecked() );
 }
@@ -541,7 +541,7 @@ KWiFiManagerApp::tricorder_beep ()
 void
 KWiFiManagerApp::slotShowStatsNoise ()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("General");
   config->writeEntry( "showStatsNoise", settingsShowStatsNoise->isChecked() );
   showStatsNoise = settingsShowStatsNoise->isChecked();
@@ -562,7 +562,7 @@ KWiFiManagerApp::slotStartConfigEditor ()
   startConf.start (TDEProcess::DontCare);
 }
 
-void KWiFiManagerApp::saveProperties( KConfig* conf)
+void KWiFiManagerApp::saveProperties( TDEConfig* conf)
 {
   m_startDocked = !isVisible();
   conf->writeEntry( "startDocked", m_startDocked );
@@ -570,7 +570,7 @@ void KWiFiManagerApp::saveProperties( KConfig* conf)
   conf->sync();
 }
 
-void KWiFiManagerApp::readProperties( KConfig* conf)
+void KWiFiManagerApp::readProperties( TDEConfig* conf)
 {
   m_startDocked = conf->readBoolEntry( "startDocked", false );
   if (m_startDocked)
-- 
cgit v1.2.1