From fcd5041fd6bf0cea48980d8a035468b2cdb5fff2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:31 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- juk/main.cpp | 4 ++-- juk/tagguessertest.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'juk') diff --git a/juk/main.cpp b/juk/main.cpp index 3aaa5556..99f3ca61 100644 --- a/juk/main.cpp +++ b/juk/main.cpp @@ -49,8 +49,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData("juk", I18N_NOOP("JuK"), - "2.3.5", description, KAboutData::License_GPL, + TDEAboutData aboutData("juk", I18N_NOOP("JuK"), + "2.3.5", description, TDEAboutData::License_GPL, "© 2002 - 2007, Scott Wheeler", 0, "http://developer.kde.org/~wheeler/juk.html"); diff --git a/juk/tagguessertest.cpp b/juk/tagguessertest.cpp index 7b92ee49..0a7c09bb 100644 --- a/juk/tagguessertest.cpp +++ b/juk/tagguessertest.cpp @@ -64,7 +64,7 @@ void check( const TQString &filename, const TQString &title, int main( int argc, char **argv ) { - KAboutData aboutData("tagguessertest", "tagguessertest", "0.1"); + TDEAboutData aboutData("tagguessertest", "tagguessertest", "0.1"); TDECmdLineArgs::init(argc, argv, &aboutData); TDEApplication app; check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3", -- cgit v1.2.1