summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:14:48 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:14:48 -0600
commit189de3212544da059ebe682065c9b72291e4ecb8 (patch)
treeae8871ac020dca0e8571cc7e986f57b24d366f1d
parent1784869980256ec08b4f3e73f61551f8ebe75ac6 (diff)
downloadtdeartwork-189de3212544da059ebe682065c9b72291e4ecb8.tar.gz
tdeartwork-189de3212544da059ebe682065c9b72291e4ecb8.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rw-r--r--kscreensaver/kdesavers/slideshow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp
index 4c4a4cd8..f1d37749 100644
--- a/kscreensaver/kdesavers/slideshow.cpp
+++ b/kscreensaver/kdesavers/slideshow.cpp
@@ -1010,8 +1010,8 @@ void kSlideShowSetup::slotOk()
//-----------------------------------------------------------------------------
void kSlideShowSetup::slotHelp()
{
- KAboutData aboutData( "kslideshow.kss", I18N_NOOP("SlideShow"),
- version, description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "kslideshow.kss", I18N_NOOP("SlideShow"),
+ version, description, TDEAboutData::License_GPL,
"(c) 1999-2003, The KDE Team" );
aboutData.addAuthor("Stefan Taferner", 0, "taferner@kde.org");
aboutData.addAuthor("Chris Howells", 0, "howells@kde.org");