From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- wifi/kcmwifi/kcmwifi.cpp | 2 +- wifi/kcmwifi/kcmwifi.h | 2 +- wifi/kcmwifi/wificonfig.cpp | 4 ++-- wifi/kcmwifi/wificonfig.h | 6 +++--- wifi/kwifimanager.cpp | 26 +++++++++++++------------- wifi/kwifimanager.h | 4 ++-- wifi/kwireless/kwireless.h | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'wifi') diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index 79802e32..3544bb7a 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -43,7 +43,7 @@ typedef KGenericFactory < KCMWifi, TQWidget > KWiFiFactory; K_EXPORT_COMPONENT_FACTORY (kcm_wifi, KWiFiFactory("kcmwifi") ) KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) - : KCModule (parent, name) + : TDECModule (parent, name) { tabs = new TQTabWidget (this, "tabs"); diff --git a/wifi/kcmwifi/kcmwifi.h b/wifi/kcmwifi/kcmwifi.h index 0596ebee..26de95a1 100644 --- a/wifi/kcmwifi/kcmwifi.h +++ b/wifi/kcmwifi/kcmwifi.h @@ -30,7 +30,7 @@ class MainConfig; class TQTabWidget; class KProcIO; -class KCMWifi : public KCModule +class KCMWifi : public TDECModule { Q_OBJECT diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 6941b80e..7a1cdac3 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -115,7 +115,7 @@ IfConfig::IfConfig() powerModeList << "All" << "UnicastOnly" << "MulticastOnly"; } -void IfConfig::load( KConfig *config, int i ) +void IfConfig::load( TDEConfig *config, int i ) { TQString entry; @@ -148,7 +148,7 @@ void IfConfig::load( KConfig *config, int i ) m_wakeupPeriod = config->readNumEntry( "WakeupPeriod", 20 ); } -void IfConfig::save( KConfig *config, int i ) +void IfConfig::save( TDEConfig *config, int i ) { TQString group = TQString( "Configuration %1" ).arg( i+1 ); config->setGroup( group ); diff --git a/wifi/kcmwifi/wificonfig.h b/wifi/kcmwifi/wificonfig.h index 410756ed..2e153bcb 100644 --- a/wifi/kcmwifi/wificonfig.h +++ b/wifi/kcmwifi/wificonfig.h @@ -25,7 +25,7 @@ #include "kcmwifi.h" -class KConfig; +class TDEConfig; class KSimpleConfig; enum KeyStates { EMPTY=0, INVALID=1, HEX_64=2, HEX_128=3, HEX_256=4, STRING_64=5, STRING_128=6, STRING_256=7 }; @@ -58,8 +58,8 @@ class IfConfig enum PowerMode { AllPackets=0, UnicastOnly, MulticastOnly }; enum CryptoMode { Open=0, Restricted }; - void load( KConfig *config, int i ); - void save( KConfig *config, int i ); + void load( TDEConfig *config, int i ); + void save( TDEConfig *config, int i ); TQString speedAsString(); TQString wifimodeAsString(); 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) diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index 90234772..b8683a76 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -107,8 +107,8 @@ public: void slotDisablePowerProcessExited(); virtual bool queryClose(); virtual bool queryExit(); - virtual void readProperties( KConfig* ); - virtual void saveProperties( KConfig* ); + virtual void readProperties( TDEConfig* ); + virtual void saveProperties( TDEConfig* ); private: void initActions (); void initView (); diff --git a/wifi/kwireless/kwireless.h b/wifi/kwireless/kwireless.h index 7b51ea30..68ce7401 100644 --- a/wifi/kwireless/kwireless.h +++ b/wifi/kwireless/kwireless.h @@ -40,7 +40,7 @@ protected: void resizeEvent(TQResizeEvent *); private: - KConfig *ksConfig; + TDEConfig *ksConfig; KWireLessWidget *widget; }; -- cgit v1.2.1