Commit 46bdf822 authored by Chusslove Illich's avatar Chusslove Illich
Browse files

Auto-conversion to new KCmdLineArgs/KAboutData/KComponentData API (trunk/KDE)....

Auto-conversion to new KCmdLineArgs/KAboutData/KComponentData API (trunk/KDE). Watch for the few remaining QString to QByteArray assignments that will not compile without extra specification (typically needs .toLocal8Bit() or .toUtf8()).

svn path=/trunk/KDE/kdepim/; revision=682260
parent f878d237
......@@ -31,50 +31,50 @@
using namespace KOrg;
AboutData::AboutData()
: KAboutData( "korganizer", I18N_NOOP("KOrganizer"), korgVersion,
I18N_NOOP("A Personal Organizer for KDE"),
: KAboutData( "korganizer", 0, ki18n("KOrganizer"), korgVersion,
ki18n("A Personal Organizer for KDE"),
KAboutData::License_GPL,
"(c) 1997-1999 Preston Brown\n"
ki18n("(c) 1997-1999 Preston Brown\n"
"(c) 2000-2004,2007 Cornelius Schumacher\n"
"(c) 2004-2005 Reinhold Kainhofer", 0,
"(c) 2004-2005 Reinhold Kainhofer"), KLocalizedString(),
"http://korganizer.kde.org" )
{
addAuthor("Reinhold Kainhofer",I18N_NOOP("Current Maintainer"),
addAuthor(ki18n("Reinhold Kainhofer"),ki18n("Current Maintainer"),
"reinhold@kainhofer.com");
addAuthor("Cornelius Schumacher",I18N_NOOP("Co-Maintainer"),
addAuthor(ki18n("Cornelius Schumacher"),ki18n("Co-Maintainer"),
"schumacher@kde.org");
addAuthor("Preston Brown",I18N_NOOP("Original Author"),
addAuthor(ki18n("Preston Brown"),ki18n("Original Author"),
"pbrown@kde.org");
addCredit("Richard Apodaca");
addCredit("Jan-Pascal van Best");
addCredit("Laszlo Boloni");
addCredit("Barry Benowitz");
addCredit("Christopher Beard");
addCredit("Kalle Dalheimer");
addCredit("Ian Dawes");
addCredit("Thomas Eitzenberger");
addCredit("Neil Hart");
addCredit("Declan Houlihan");
addCredit("Hans-Jürgen Husel");
addCredit("Tim Jansen");
addCredit("Christian Kirsch");
addCredit("Tobias König");
addCredit("Martin Koller");
addCredit("Uwe Koloska");
addCredit("Glen Parker");
addCredit("Dan Pilone");
addCredit("Roman Rohr");
addCredit("Rafał Rzepecki", I18N_NOOP( "Part of work sponsored by Google with"
addCredit(ki18n("Richard Apodaca"));
addCredit(ki18n("Jan-Pascal van Best"));
addCredit(ki18n("Laszlo Boloni"));
addCredit(ki18n("Barry Benowitz"));
addCredit(ki18n("Christopher Beard"));
addCredit(ki18n("Kalle Dalheimer"));
addCredit(ki18n("Ian Dawes"));
addCredit(ki18n("Thomas Eitzenberger"));
addCredit(ki18n("Neil Hart"));
addCredit(ki18n("Declan Houlihan"));
addCredit(ki18n("Hans-Jürgen Husel"));
addCredit(ki18n("Tim Jansen"));
addCredit(ki18n("Christian Kirsch"));
addCredit(ki18n("Tobias König"));
addCredit(ki18n("Martin Koller"));
addCredit(ki18n("Uwe Koloska"));
addCredit(ki18n("Glen Parker"));
addCredit(ki18n("Dan Pilone"));
addCredit(ki18n("Roman Rohr"));
addCredit(ki18n("Rafał Rzepecki"), ki18n( "Part of work sponsored by Google with"
" Summer of Code 2005" ));
addCredit("Don Sanders");
addCredit("Bram Schoenmakers");
addCredit("Günter Schwann");
addCredit("Herwin Jan Steehouwer");
addCredit("Mario Teijeiro");
addCredit("Nick Thompson");
addCredit("Bo Thorsen");
addCredit("Allen Winter");
addCredit("Larry Wright");
addCredit("Thomas Zander");
addCredit("Fester Zigterman");
addCredit(ki18n("Don Sanders"));
addCredit(ki18n("Bram Schoenmakers"));
addCredit(ki18n("Günter Schwann"));
addCredit(ki18n("Herwin Jan Steehouwer"));
addCredit(ki18n("Mario Teijeiro"));
addCredit(ki18n("Nick Thompson"));
addCredit(ki18n("Bo Thorsen"));
addCredit(ki18n("Allen Winter"));
addCredit(ki18n("Larry Wright"));
addCredit(ki18n("Thomas Zander"));
addCredit(ki18n("Fester Zigterman"));
}
......@@ -53,25 +53,22 @@ class MyApp : public KUniqueApplication
static const char korgacVersion[] = "0.9";
static const KCmdLineOptions options[] =
{
{ 0, 0, 0 }
};
int main( int argc, char **argv )
{
KLocale::setMainCatalog( "korganizer" );
KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
korgacVersion, I18N_NOOP("KOrganizer Reminder Daemon"),
KAboutData aboutData( "korgac", 0, ki18n("KOrganizer Reminder Daemon"),
korgacVersion, ki18n("KOrganizer Reminder Daemon"),
KAboutData::License_GPL,
"(c) 2003 Cornelius Schumacher",
0, "http://pim.kde.org" );
aboutData.addAuthor( "Cornelius Schumacher", I18N_NOOP("Maintainer"),
ki18n("(c) 2003 Cornelius Schumacher"),
KLocalizedString(), "http://pim.kde.org" );
aboutData.addAuthor( ki18n("Cornelius Schumacher"), ki18n("Maintainer"),
"schumacher@kde.org" );
aboutData.addAuthor( "Reinhold Kainhofer", I18N_NOOP("Maintainer"),
aboutData.addAuthor( ki18n("Reinhold Kainhofer"), ki18n("Maintainer"),
"kainhofer@kde.org" );
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineOptions options;
KCmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions();
......
......@@ -34,7 +34,7 @@
int main(int argc,char **argv)
{
KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
KAboutData aboutData("testkabc", 0,ki18n("TestKabc"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
KApplication app;
......
......@@ -29,17 +29,18 @@
#include <kcmdlineargs.h>
#include <klocale.h>
static const KCmdLineOptions korganizer_options[] =
static KCmdLineOptions korganizer_options ()
{
{ "i", 0, 0 },
{ "import", I18N_NOOP("Import the given calendars as new resources into the default calendar"), 0 },
{ "m", 0, 0 },
{ "merge", I18N_NOOP("Merge the given calendars into the standard calendar (i.e. copy the events)"), 0 },
{ "o", 0, 0 },
{ "open", I18N_NOOP("Open the given calendars in a new window"), 0 },
{ "+[calendars]", I18N_NOOP("Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user will be asked whether to import, merge or open in a separate window."), 0 },
KCmdLineLastOption
};
KCmdLineOptions options;
options.add("i");
options.add("import", ki18n("Import the given calendars as new resources into the default calendar"));
options.add("m");
options.add("merge", ki18n("Merge the given calendars into the standard calendar (i.e. copy the events)"));
options.add("o");
options.add("open", ki18n("Open the given calendars in a new window"));
options.add("+[calendars]", ki18n("Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user will be asked whether to import, merge or open in a separate window."));
return options;
}
#endif /* KORGANIZER_OPTIONS_H */
......@@ -40,7 +40,7 @@ int main ( int argc, char **argv )
KOrg::AboutData aboutData;
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( korganizer_options );
KCmdLineArgs::addCmdLineOptions( korganizer_options() );
KUniqueApplication::addCmdLineOptions();
if ( !KOrganizerApp::start() ) return 0;
......
......@@ -34,7 +34,7 @@
int main(int argc,char **argv)
{
KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
KAboutData aboutData("korgplugins", 0,ki18n("KOrgPlugins"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
KApplication app;
......
......@@ -36,7 +36,7 @@
int main(int argc,char **argv)
{
KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
KAboutData aboutData("timezone", 0,ki18n("KOrganizer Timezone Test"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
KApplication app;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment