diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/keditbookmarks/kbookmarkmerger.cpp | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/keditbookmarks/kbookmarkmerger.cpp')
| -rw-r--r-- | konqueror/keditbookmarks/kbookmarkmerger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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" ); |