From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kdesktop/main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kdesktop/main.cc') diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 51eb7b2a3..a12f241b8 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -168,8 +168,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) twin_name.sprintf("twin-screen-%d", kdesktop_screen_number); } - KAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"), + version, description, TDEAboutData::License_GPL, "(c) 1998-2000, The KDesktop Authors"); aboutData.addAuthor("David Faure", 0, "faure@kde.org"); aboutData.addAuthor("Martin Koller", 0, "m.koller@surfeu.at"); -- cgit v1.2.3