summaryrefslogtreecommitdiffstats
path: root/kscd/kscd.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:27 -0600
commit2f1044cf6325ef76548375b602a14f8eb56eeb3f (patch)
treea5c4773d5bcb1e35ca3717dc96ba5cfcfac1b5f2 /kscd/kscd.cpp
parent58646ccdcdc8ee08b081edba54e1460ff3295166 (diff)
downloadtdemultimedia-2f1044cf6325ef76548375b602a14f8eb56eeb3f.tar.gz
tdemultimedia-2f1044cf6325ef76548375b602a14f8eb56eeb3f.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kscd/kscd.cpp')
-rw-r--r--kscd/kscd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 8f115ea0..6c26e1d3 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -1491,7 +1491,7 @@ void KSCD::information(int i)
bool KSCD::saveState(TQSessionManager& /*sm*/)
{
writeSettings();
- KConfig* config = KApplication::kApplication()->sessionConfig();
+ KConfig* config = TDEApplication::kApplication()->sessionConfig();
config->setGroup("General");
config->writeEntry("Show", isVisible());
return true;
@@ -1659,7 +1659,7 @@ int main( int argc, char *argv[] )
if (kapp->isRestored())
{
- KConfig* config = KApplication::kApplication()->sessionConfig();
+ KConfig* config = TDEApplication::kApplication()->sessionConfig();
config->setGroup("General");
if (config->readBoolEntry("Show"))
k->show();