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 --- kcontrol/filetypes/keditfiletype.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kcontrol/filetypes/keditfiletype.cpp') diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 4e9f50121..2750e8aab 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -111,9 +111,9 @@ static KCmdLineOptions options[] = int main(int argc, char ** argv) { KLocale::setMainCatalogue("filetypes"); - KAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0", + TDEAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0", I18N_NOOP("TDE file type editor - simplified version for editing a single file type"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2000, KDE developers") ); aboutData.addAuthor("Preston Brown",0, "pbrown@kde.org"); aboutData.addAuthor("David Faure",0, "faure@kde.org"); -- cgit v1.2.3