summaryrefslogtreecommitdiffstats
path: root/katapult/katapult
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:54 -0600
commit4946d97747eac03d3fbc7c624cd027990d85f0e4 (patch)
tree6879368be68593343f00b03e9ff8d590393df315 /katapult/katapult
parenta935c1de6f952a489a96a27cb897144b5d225ebe (diff)
downloadkatapult-4946d97747eac03d3fbc7c624cd027990d85f0e4.tar.gz
katapult-4946d97747eac03d3fbc7c624cd027990d85f0e4.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'katapult/katapult')
-rw-r--r--katapult/katapult/katapultsettings.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp
index ec20e79..b283ed0 100644
--- a/katapult/katapult/katapultsettings.cpp
+++ b/katapult/katapult/katapultsettings.cpp
@@ -59,7 +59,7 @@ KatapultSettings::~KatapultSettings()
void KatapultSettings::readSettings()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
_hideSessionNotification = config->readNumEntry("HideSessionNotification", 1);
_hideUserNotification = config->readNumEntry("HideUserNotification", 0);
_notificationTimeout = config->readNumEntry("NotificationTimeout", 5000);
@@ -83,7 +83,7 @@ void KatapultSettings::readSettings()
void KatapultSettings::writeSettings()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
int hideSession = _hideSessionNotification;
int hideUser = _hideUserNotification;
@@ -109,14 +109,14 @@ void KatapultSettings::writeSettings()
KatapultCatalog *catalog;
while((catalog = it.current()) != 0)
{
- KConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey()));
+ TDEConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey()));
catalog->writeSettings(&group);
++it;
}
if(_display != 0)
{
- KConfigGroup group(config, TQString("Displays/%1").arg(_displayName));
+ TDEConfigGroup group(config, TQString("Displays/%1").arg(_displayName));
_display->writeSettings(&group);
}
@@ -323,7 +323,7 @@ void KatapultSettings::loadCatalogPlugins()
(service, 0, 0, TQStringList(), &errCode);
if(catalog != 0)
{
- KConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id));
+ TDEConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id));
catalog->readSettings(&group);
catalog->initialize();
_activeCatalogs.insert(id, catalog);
@@ -364,7 +364,7 @@ void KatapultSettings::loadDisplayPlugins()
}
if(_display != 0)
{
- KConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
+ TDEConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
_display->readSettings(&group);
}
}