diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
| commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
| tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /ktnef | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ktnef')
| -rw-r--r-- | ktnef/gui/main.cpp | 4 | ||||
| -rw-r--r-- | ktnef/tests/parsertest.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp index 8f655e67..24e2a602 100644 --- a/ktnef/gui/main.cpp +++ b/ktnef/gui/main.cpp @@ -36,8 +36,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"), - "1.0", description, KAboutData::License_GPL, + TDEAboutData aboutData( "ktnef", I18N_NOOP("KTnef"), + "1.0", description, TDEAboutData::License_GPL, "(c) 2000, Michael Goffioul"); aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/ktnef/tests/parsertest.cpp b/ktnef/tests/parsertest.cpp index 6e3d3af3..cc7efe73 100644 --- a/ktnef/tests/parsertest.cpp +++ b/ktnef/tests/parsertest.cpp @@ -95,7 +95,7 @@ void ParserTest::testMAPIAttachments() int main( int argc, char** argv ) { - KInstance inst( "ktnef-parsertest" ); + TDEInstance inst( "ktnef-parsertest" ); ParserTest test; test.testSingleAttachment(); test.testTwoAttachments(); |