From 5fc6f26e12b596addd235f87320c31761bd5a84d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:15 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- wizards/egroupwaremain.cpp | 2 +- wizards/exchangemain.cpp | 2 +- wizards/groupwisemain.cpp | 2 +- wizards/kolabmain.cpp | 2 +- wizards/main.cpp | 2 +- wizards/scalixmain.cpp | 2 +- wizards/sloxmain.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'wizards') diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index 72d66fe5a..a5fd9c67c 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -36,7 +36,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "egroupwarewizard", + TDEAboutData aboutData( "egroupwarewizard", "eGroupware Server Configuration Wizard", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index 7d7bc8943..627467b63 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "exchangewizard", + TDEAboutData aboutData( "exchangewizard", I18N_NOOP( "Microsoft Exchange Server Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp index e305e2143..86d2eae91 100644 --- a/wizards/groupwisemain.cpp +++ b/wizards/groupwisemain.cpp @@ -37,7 +37,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "groupwisewizard", + TDEAboutData aboutData( "groupwisewizard", I18N_NOOP( "Novell GroupWise Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index 3b5715aa1..e24f7ac5f 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -38,7 +38,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "kolabwizard", I18N_NOOP( "Kolab Configuration Wizard" ), "0.1" ); + TDEAboutData aboutData( "kolabwizard", I18N_NOOP( "Kolab Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/wizards/main.cpp b/wizards/main.cpp index c45fdd52b..ac9275a67 100644 --- a/wizards/main.cpp +++ b/wizards/main.cpp @@ -16,7 +16,7 @@ int main( int argc, char **argv ) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "groupwarewizard", + TDEAboutData aboutData( "groupwarewizard", I18N_NOOP( "TDE-PIM Groupware Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp index 1ae125fc6..702438704 100644 --- a/wizards/scalixmain.cpp +++ b/wizards/scalixmain.cpp @@ -38,7 +38,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "scalixwizard", I18N_NOOP( "Scalix Configuration Wizard" ), "0.1" ); + TDEAboutData aboutData( "scalixwizard", I18N_NOOP( "Scalix Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp index 93500b3cc..3eab6b69e 100644 --- a/wizards/sloxmain.cpp +++ b/wizards/sloxmain.cpp @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "sloxwizard", + TDEAboutData aboutData( "sloxwizard", I18N_NOOP( "SUSE LINUX Openexchange Server Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); -- cgit v1.2.1