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 --- konqueror/keditbookmarks/kbookmarkmerger.cpp | 4 ++-- konqueror/keditbookmarks/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'konqueror/keditbookmarks') diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index b5dfe553f..1fbcd6c03 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -59,9 +59,9 @@ int main( int argc, char**argv ) { const bool kdeRunning = kdeIsRunning(); - KAboutData aboutData( "kbookmarkmerger", I18N_NOOP( "KBookmarkMerger" ), + TDEAboutData aboutData( "kbookmarkmerger", I18N_NOOP( "KBookmarkMerger" ), "1.0", I18N_NOOP( "Merges bookmarks installed by 3rd parties into the user's bookmarks" ), - KAboutData::License_BSD, + TDEAboutData::License_BSD, I18N_NOOP( "Copyright © 2005 Frerich Raabe" ) ); aboutData.addAuthor( "Frerich Raabe", I18N_NOOP( "Original author" ), "raabe@kde.org" ); diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 50b7d2046..0c47ff65f 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -114,9 +114,9 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) { extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("konqueror"); - KAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION, + TDEAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION, I18N_NOOP("Konqueror Bookmarks Editor"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2003, KDE developers") ); aboutData.addAuthor("David Faure", I18N_NOOP("Initial author"), "faure@kde.org"); aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "lypanov@kde.org"); -- cgit v1.2.3