Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 8874c8d8f7
commit d60d44d67f

@ -54,7 +54,7 @@
#include "configuredialog.h"
/*! This is the default constructor of the class ConfigureDialog. */
ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
ConfigureDialog::ConfigureDialog( TDEConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
TQWidget *parent, const char *name)
:configure_Dialog(parent, name, false, WDestructiveClose )
{

@ -46,7 +46,7 @@ class ConfigureDialog: public configure_Dialog {
public:
//! default constructor
ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
ConfigureDialog( TDEConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
TQWidget *parent = 0, const char *name = 0);
//! default destructor
~ConfigureDialog();
@ -59,7 +59,7 @@ private:
blacklistEditDialog* blacklistEDlgAD;
//! the pointer to the config of kpowersave, get from constructor
KConfig *kconfig;
TDEConfig *kconfig;
//! pointer to the KPowersave settings, get from constructor
Settings *settings;
//! pointer to hardware information and actions

@ -41,7 +41,7 @@
#include <tqtooltip.h>
/*! This is the default constructor of class infoDialog . */
infoDialog::infoDialog( KConfig *config, TQString captionName, TQString message,
infoDialog::infoDialog( TDEConfig *config, TQString captionName, TQString message,
TQString dontShowAgainMsg, TQString settingsEntryName,
TQWidget *parent, const char *name)
:info_Dialog( parent, name, false, TQt::WStyle_StaysOnTop | WDestructiveClose )

@ -43,7 +43,7 @@ class infoDialog: public info_Dialog {
public:
//! default constructor
infoDialog( KConfig *config = 0, TQString captionName = TQString(), TQString message = TQString(),
infoDialog( TDEConfig *config = 0, TQString captionName = TQString(), TQString message = TQString(),
TQString dontShowAgainMsg = TQString(), TQString settingsEntryName = TQString(),
TQWidget *parent = 0, const char *name = 0);
//! default destructor
@ -55,7 +55,7 @@ public:
private:
//! the pointer to the settings of kpowersave, get from constructor
KConfig *settings;
TDEConfig *settings;
//! name of the entry in the settings
/*! TQString store the name of the settings entry to

@ -75,7 +75,7 @@ private:
// permanent pointers
//! to configure kpowersave
KConfig *config;
TDEConfig *config;
//! instance of \ref screen
screen *display;
//! instance of \ref settings

@ -35,7 +35,7 @@
/*! This is the default constructor of the class Settings. */
Settings::Settings()
{
kconfig = new KConfig("kpowersaverc", true );
kconfig = new TDEConfig("kpowersaverc", true );
kde = new KDE_Settings();
load_kde();
load_general_settings();
@ -352,7 +352,7 @@ action Settings::mapActionToType (TQString _action) {
* \retval false if there was a error/problem
*/
void Settings::load_kde(){
KConfig *_kconfig = new KConfig("kcmdisplayrc", true );
TDEConfig *_kconfig = new TDEConfig("kcmdisplayrc", true );
/* KDE settings [DisplayEnergy] from kcmdisplayrc */
if(_kconfig->hasGroup("DisplayEnergy")) {
@ -363,7 +363,7 @@ void Settings::load_kde(){
kde->displayPowerOff = _kconfig->readNumEntry("displayPowerOff", 19);
}
delete _kconfig;
_kconfig = new KConfig("kdesktoprc", true );
_kconfig = new TDEConfig("kdesktoprc", true );
/* KDE settings [ScreenSaver] from kdesktoprc */
if(_kconfig->hasGroup("ScreenSaver")) {
_kconfig->setGroup("ScreenSaver");

@ -488,7 +488,7 @@ public:
private:
//! configuration of kpowersave
KConfig *kconfig;
TDEConfig *kconfig;
//! to map a battery action string to the related type
action mapActionToType (TQString _action);

Loading…
Cancel
Save