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 /kdialog/kdialog.cpp | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdialog/kdialog.cpp')
-rw-r--r-- | kdialog/kdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index e15564eb4..6533d51c3 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -676,9 +676,9 @@ static int directCommand(TDECmdLineArgs *args) int main(int argc, char *argv[]) { - KAboutData aboutData( "kdialog", I18N_NOOP("KDialog"), + TDEAboutData aboutData( "kdialog", I18N_NOOP("KDialog"), "1.0", I18N_NOOP( "KDialog can be used to show nice dialog boxes from shell scripts" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2000, Nick Thompson"); aboutData.addAuthor("David Faure", I18N_NOOP("Current maintainer"),"faure@kde.org"); aboutData.addAuthor("Brad Hards", 0, "bradh@frogmouth.net"); |