From 189de3212544da059ebe682065c9b72291e4ecb8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:14:48 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kscreensaver/kdesavers/slideshow.cpp | 4 ++-- 1 file 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");