diff options
author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/filetypes/keditfiletype.cpp | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/filetypes/keditfiletype.cpp')
-rw-r--r-- | kcontrol/filetypes/keditfiletype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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, "[email protected]"); aboutData.addAuthor("David Faure",0, "[email protected]"); |