diff options
| -rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 31 | ||||
| -rw-r--r-- | src/kreadconfig/kwriteconfig.cpp | 37 |
2 files changed, 31 insertions, 37 deletions
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index ce8e8137..8e95aeb7 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -31,31 +31,28 @@ #include <klocale.h> #include <kaboutdata.h> #include <stdio.h> - -static KCmdLineOptions options[] = -{ - { "file <file>", I18N_NOOP("Use <file> instead of global config"), 0 }, - { "group <group>", I18N_NOOP("Group to look in"), "KDE" }, - { "key <key>", I18N_NOOP("Key to look for"), 0 }, - { "default <default>", I18N_NOOP("Default value"), 0 }, - { "type <type>", I18N_NOOP("Type of variable"), 0 }, - KCmdLineLastOption -}; int main(int argc, char **argv) { - KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"), + KAboutData aboutData("kreadconfig", 0, ki18n("KReadConfig"), "1.0.1", - I18N_NOOP("Read KConfig entries - for use in shell scripts"), + ki18n("Read KConfig entries - for use in shell scripts"), KAboutData::License_GPL, - "(c) 2001 Red Hat, Inc."); - aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "bero@redhat.com"); + ki18n("(c) 2001 Red Hat, Inc.")); + aboutData.addAuthor(ki18n("Bernhard Rosenkraenzer"), KLocalizedString(), "bero@redhat.com"); KCmdLineArgs::init(argc, argv, &aboutData); + + KCmdLineOptions options; + options.add("file <file>", ki18n("Use <file> instead of global config")); + options.add("group <group>", ki18n("Group to look in"), "KDE"); + options.add("key <key>", ki18n("Key to look for")); + options.add("default <default>", ki18n("Default value")); + options.add("type <type>", ki18n("Type of variable")); KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs *args=KCmdLineArgs::parsedArgs(); - QString group=QString::fromLocal8Bit(args->getOption("group")); - QString key=QString::fromLocal8Bit(args->getOption("key")); - QString file=QString::fromLocal8Bit(args->getOption("file")); + QString group=args->getOption("group"); + QString key=args->getOption("key"); + QString file=args->getOption("file"); QString dflt=args->getOption("default"); QString type=args->getOption("type").toLower(); diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp index babfef9a..02a23120 100644 --- a/src/kreadconfig/kwriteconfig.cpp +++ b/src/kreadconfig/kwriteconfig.cpp @@ -15,40 +15,37 @@ #include <stdio.h> //Added by qt3to4: - -static KCmdLineOptions options[] = -{ - { "file <file>", I18N_NOOP("Use <file> instead of global config"), 0 }, - { "group <group>", I18N_NOOP("Group to look in"), "KDE" }, - { "key <key>", I18N_NOOP("Key to look for"), 0 }, - { "type <type>", I18N_NOOP("Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a string"), 0 }, - { "+value", I18N_NOOP( "The value to write. Mandatory, on a shell use '' for empty" ), 0 }, - KCmdLineLastOption -}; int main(int argc, char **argv) { - KAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"), + KAboutData aboutData("kwriteconfig", 0, ki18n("KWriteConfig"), "1.0.0", - I18N_NOOP("Write KConfig entries - for use in shell scripts"), + ki18n("Write KConfig entries - for use in shell scripts"), KAboutData::License_GPL, - "(c) 2001 Red Hat, Inc. & Luís Pedro Coelho"); - aboutData.addAuthor("Luís Pedro Coelho", 0, "luis_pedro@netcabo.pt"); - aboutData.addAuthor("Bernhard Rosenkraenzer", "Wrote kreadconfig on which this is based", "bero@redhat.com"); + ki18n("(c) 2001 Red Hat, Inc. & Luís Pedro Coelho")); + aboutData.addAuthor(ki18n("Luís Pedro Coelho"), KLocalizedString(), "luis_pedro@netcabo.pt"); + aboutData.addAuthor(ki18n("Bernhard Rosenkraenzer"), ki18n("Wrote kreadconfig on which this is based"), "bero@redhat.com"); KCmdLineArgs::init(argc, argv, &aboutData); + + KCmdLineOptions options; + options.add("file <file>", ki18n("Use <file> instead of global config")); + options.add("group <group>", ki18n("Group to look in"), "KDE"); + options.add("key <key>", ki18n("Key to look for")); + options.add("type <type>", ki18n("Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a string")); + options.add("+value", ki18n( "The value to write. Mandatory, on a shell use '' for empty" )); KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs *args=KCmdLineArgs::parsedArgs(); - QString group=QString::fromLocal8Bit(args->getOption("group")); - QString key=QString::fromLocal8Bit(args->getOption("key")); - QString file=QString::fromLocal8Bit(args->getOption("file")); - QByteArray type=args->getOption("type").toLower(); + QString group=args->getOption("group"); + QString key=args->getOption("key"); + QString file=args->getOption("file"); + QString type=args->getOption("type").toLower(); if (key.isNull() || !args->count()) { KCmdLineArgs::usage(); return 1; } - QByteArray value = args->arg( 0 ); + QByteArray value = args->arg( 0 ).toLocal8Bit(); KComponentData inst(&aboutData); |