summaryrefslogtreecommitdiffstats
path: root/kcontrol/componentchooser
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/componentchooser
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/componentchooser')
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp30
-rw-r--r--kcontrol/componentchooser/componentchooser.h22
-rw-r--r--kcontrol/componentchooser/kcm_componentchooser.cpp4
-rw-r--r--kcontrol/componentchooser/kcm_componentchooser.h2
4 files changed, 29 insertions, 29 deletions
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 616c98a50..c2d5305c5 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -61,13 +61,13 @@ void CfgComponent::slotComponentChanged(const TQString&) {
emit changed(true);
}
-void CfgComponent::save(KConfig *cfg) {
+void CfgComponent::save(TDEConfig *cfg) {
// yes, this can happen if there are NO KTrader offers for this component
if (!m_lookupDict[ComponentSelector->currentText()])
return;
TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
- KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
+ TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null"));
store->setGroup(cfg->readEntry("valueSection"));
store->writePathEntry(cfg->readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]);
store->sync();
@@ -75,7 +75,7 @@ void CfgComponent::save(KConfig *cfg) {
emit changed(false);
}
-void CfgComponent::load(KConfig *cfg) {
+void CfgComponent::load(TDEConfig *cfg) {
ComponentSelector->clear();
m_lookupDict.clear();
@@ -93,7 +93,7 @@ void CfgComponent::load(KConfig *cfg) {
m_revLookupDict.insert((*tit)->desktopEntryName(),new TQString((*tit)->name()));
}
- KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
+ TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null"));
store->setGroup(cfg->readEntry("valueSection"));
TQString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null"));
delete store;
@@ -139,7 +139,7 @@ void CfgEmailClient::defaults()
load(0L);
}
-void CfgEmailClient::load(KConfig *)
+void CfgEmailClient::load(TDEConfig *)
{
TQString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram);
bool useKMail = (emailClient.isEmpty());
@@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();
// get the preferred Terminal Application
- KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+ TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::fromLatin1(" -e ");
@@ -184,7 +184,7 @@ void CfgEmailClient::selectEmailClient()
}
-void CfgEmailClient::save(KConfig *)
+void CfgEmailClient::save(TDEConfig *)
{
if (kmailCB->isChecked())
{
@@ -234,8 +234,8 @@ void CfgTerminalEmulator::defaults()
}
-void CfgTerminalEmulator::load(KConfig *) {
- KConfig *config = new KConfig("kdeglobals", true);
+void CfgTerminalEmulator::load(TDEConfig *) {
+ TDEConfig *config = new TDEConfig("kdeglobals", true);
config->setGroup("General");
TQString terminal = config->readPathEntry("TerminalApplication","konsole");
if (terminal == "konsole")
@@ -253,9 +253,9 @@ void CfgTerminalEmulator::load(KConfig *) {
emit changed(false);
}
-void CfgTerminalEmulator::save(KConfig *) {
+void CfgTerminalEmulator::save(TDEConfig *) {
- KConfig *config = new KConfig("kdeglobals");
+ TDEConfig *config = new TDEConfig("kdeglobals");
config->setGroup("General");
config->writePathEntry("TerminalApplication",terminalCB->isChecked()?"konsole":terminalLE->text(), true, true);
config->sync();
@@ -306,8 +306,8 @@ void CfgBrowser::defaults()
}
-void CfgBrowser::load(KConfig *) {
- KConfig *config = new KConfig("kdeglobals", true);
+void CfgBrowser::load(TDEConfig *) {
+ TDEConfig *config = new TDEConfig("kdeglobals", true);
config->setGroup("General");
TQString exec = config->readEntry("BrowserApplication");
if (exec.isEmpty())
@@ -340,9 +340,9 @@ void CfgBrowser::load(KConfig *) {
emit changed(false);
}
-void CfgBrowser::save(KConfig *) {
+void CfgBrowser::save(TDEConfig *) {
- KConfig *config = new KConfig("kdeglobals");
+ TDEConfig *config = new TDEConfig("kdeglobals");
config->setGroup("General");
TQString exec;
if (radioExec->isChecked())
diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h
index af5d688ab..0407989cf 100644
--- a/kcontrol/componentchooser/componentchooser.h
+++ b/kcontrol/componentchooser/componentchooser.h
@@ -28,7 +28,7 @@
class TQListBoxItem;
class KEMailSettings;
-class KConfig;
+class TDEConfig;
/* The CfgPlugin class is an exception. It is LGPL. It will be parted of the plugin interface
which I plan for KDE 3.2.
@@ -38,8 +38,8 @@ class CfgPlugin
public:
CfgPlugin(){};
virtual ~CfgPlugin(){};
- virtual void load(KConfig *cfg)=0;
- virtual void save(KConfig *cfg)=0;
+ virtual void load(TDEConfig *cfg)=0;
+ virtual void save(TDEConfig *cfg)=0;
virtual void defaults()=0;
};
@@ -50,8 +50,8 @@ Q_OBJECT
public:
CfgComponent(TQWidget *parent);
virtual ~CfgComponent();
- virtual void load(KConfig *cfg);
- virtual void save(KConfig *cfg);
+ virtual void load(TDEConfig *cfg);
+ virtual void save(TDEConfig *cfg);
virtual void defaults();
protected:
@@ -70,8 +70,8 @@ Q_OBJECT
public:
CfgEmailClient(TQWidget *parent);
virtual ~CfgEmailClient();
- virtual void load(KConfig *cfg);
- virtual void save(KConfig *cfg);
+ virtual void load(TDEConfig *cfg);
+ virtual void save(TDEConfig *cfg);
virtual void defaults();
private:
@@ -90,8 +90,8 @@ Q_OBJECT
public:
CfgTerminalEmulator(TQWidget *parent);
virtual ~CfgTerminalEmulator();
- virtual void load(KConfig *cfg);
- virtual void save(KConfig *cfg);
+ virtual void load(TDEConfig *cfg);
+ virtual void save(TDEConfig *cfg);
virtual void defaults();
protected slots:
@@ -108,8 +108,8 @@ Q_OBJECT
public:
CfgBrowser(TQWidget *parent);
virtual ~CfgBrowser();
- virtual void load(KConfig *cfg);
- virtual void save(KConfig *cfg);
+ virtual void load(TDEConfig *cfg);
+ virtual void save(TDEConfig *cfg);
virtual void defaults();
protected slots:
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index 2e80ad145..84425a7b1 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -23,7 +23,7 @@
KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ):
- KCModule(parent,name) {
+ TDECModule(parent,name) {
(new TQVBoxLayout(this))->setAutoAdd(true);
m_chooser=new ComponentChooser(this,"ComponentChooser");
@@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){
extern "C"
{
- KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * )
{
TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
return new KCMComponentChooser( parent, "kcmcomponentchooser" );
diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h
index f2c68b3bd..905c0a9b5 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.h
+++ b/kcontrol/componentchooser/kcm_componentchooser.h
@@ -22,7 +22,7 @@
class TDEAboutData;
-class KCMComponentChooser : public KCModule
+class KCMComponentChooser : public TDECModule
{
Q_OBJECT
public: