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 /tdeinit | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeinit')
| -rw-r--r-- | tdeinit/displayconfig.cpp | 4 | ||||
| -rw-r--r-- | tdeinit/phase1.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index 9f0086ef5..eb1a3ffc1 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -51,8 +51,8 @@ int main(int argc, char **argv) { int return_code = -1; - KAboutData about("tdeinit_displayconfig", I18N_NOOP("tdeinit_displayconfig"), version, description, - KAboutData::License_GPL, "(C) 2013 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); + TDEAboutData about("tdeinit_displayconfig", I18N_NOOP("tdeinit_displayconfig"), version, description, + TDEAboutData::License_GPL, "(C) 2013 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index 6b4479c6c..467aa9b41 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -47,8 +47,8 @@ int main(int argc, char **argv) { int return_code = -1; - KAboutData about("tdeinit_phase1", I18N_NOOP("tdeinit_phase1"), version, description, - KAboutData::License_GPL, "(C) 2012 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); + TDEAboutData about("tdeinit_phase1", I18N_NOOP("tdeinit_phase1"), version, description, + TDEAboutData::License_GPL, "(C) 2012 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); |