Port kreadconfig to KF5

3 files changed, 40 insertions, 40 deletions

diff --git a/src/kreadconfig/CMakeLists.txt b/src/kreadconfig/CMakeLists.txt
index 7e1edfe1..d0654db8 100644
--- a/src/kreadconfig/CMakeLists.txt
+++ b/src/kreadconfig/CMakeLists.txt
@@ -1,9 +1,9 @@
-# add_executable(kreadconfig kreadconfig.cpp)
-# ecm_mark_nongui_executable(kreadconfig)
-#
-# target_link_libraries(kreadconfig KF5::CoreAddons KF5::KI18n KF5::Config)
-#
-# install(TARGETS kreadconfig ${INSTALL_TARGETS_DEFAULT_ARGS})
+add_executable(kreadconfig kreadconfig.cpp)
+ecm_mark_nongui_executable(kreadconfig)
+
+target_link_libraries(kreadconfig KF5::CoreAddons KF5::I18n KF5::ConfigCore)
+
+install(TARGETS kreadconfig ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### next target ###############
 
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp
index 0778002b..cbdb3ec8 100644
--- a/src/kreadconfig/kreadconfig.cpp
+++ b/src/kreadconfig/kreadconfig.cpp
@@ -41,51 +41,51 @@
  *		rm someFile
  *	fi
  */
-#include <kconfig.h>
-#include <kconfiggroup.h>
-#include <kglobal.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kaboutdata.h>
+
+#include <KConfig>
+#include <KConfigGroup>
+#include <KAboutData>
+#include <KLocalizedString>
+#include <QCommandLineParser>
 #include <stdio.h>
+
 int main(int argc, char **argv)
 {
-	KAboutData aboutData("kreadconfig", 0, ki18n("KReadConfig"),
+	QCoreApplication app(argc, argv);
+	KAboutData aboutData("kreadconfig", 0, i18n("KReadConfig"),
 		"1.0.1",
-		ki18n("Read KConfig entries - for use in shell scripts"),
+		i18n("Read KConfig entries - for use in shell scripts"),
 		KAboutData::License_GPL,
-		ki18n("(c) 2001 Red Hat, Inc."));
-	aboutData.addAuthor(ki18n("Bernhard Rosenkraenzer"), KLocalizedString(), "bero@redhat.com");
-	KCmdLineArgs::init(argc, argv, &aboutData);
+		i18n("(c) 2001 Red Hat, Inc."));
+	aboutData.addAuthor(i18n("Bernhard Rosenkraenzer"), QString(), "bero@redhat.com");
 
-	QCoreApplication app(argc, argv);
+	KAboutData::setApplicationData(aboutData);
+
+	QCommandLineParser parser;
+	parser.addOption(QCommandLineOption("file", i18n("Use <file> instead of global config"), "file"));
+	parser.addOption(QCommandLineOption("group", i18n("Group to look in. Use repeatedly for nested groups."), "group", "KDE"));
+	parser.addOption(QCommandLineOption("key", i18n("Key to look for"), "key"));
+	parser.addOption(QCommandLineOption("default", i18n("Default value"), "value"));
+	parser.addOption(QCommandLineOption("type", i18n("Type of variable"), "type"));
+
+	aboutData.setupCommandLine(&parser);
+	parser.process(app);
+	aboutData.processCommandLine(&parser);
+
+	QStringList groups=parser.values("group");
+	QString key=parser.value("key");
+	QString file=parser.value("file");
+	QString dflt=parser.value("default");
+	QString type=parser.value("type").toLower();
 
-	KCmdLineOptions options;
-	options.add("file <file>", ki18n("Use <file> instead of global config"));
-	options.add("group <group>", ki18n("Group to look in. Use repeatedly for nested groups."), "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();
-
-	QStringList groups=args->getOptionList("group");
-	QString key=args->getOption("key");
-	QString file=args->getOption("file");
-	QString dflt=args->getOption("default");
-	QString type=args->getOption("type").toLower();
-
-	if (key.isNull()) {
-		KCmdLineArgs::usage();
-		return 1;
+	if (parser.positionalArguments().isEmpty()) {
+		parser.showHelp(1);
 	}
 
-	KComponentData inst(&aboutData);
 	KSharedConfig::openConfig();
 
 	KConfig *konfig;
-        bool configMustDeleted = false;
+	bool configMustDeleted = false;
 	if (file.isEmpty())
 	   konfig = KSharedConfig::openConfig().data();
 	else
diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp
index 250a6e36..e5597d34 100644
--- a/src/kreadconfig/kwriteconfig.cpp
+++ b/src/kreadconfig/kwriteconfig.cpp
@@ -30,6 +30,7 @@
 
 int main(int argc, char **argv)
 {
+	QCoreApplication app(argc, argv);
 	KAboutData aboutData("kwriteconfig", 0, i18n("KWriteConfig"),
 		"1.0.0",
 		i18n("Write KConfig entries - for use in shell scripts"),
@@ -38,7 +39,6 @@ int main(int argc, char **argv)
 	aboutData.addAuthor("Luís Pedro Coelho", QString(), "luis_pedro@netcabo.pt");
 	aboutData.addAuthor("Bernhard Rosenkraenzer", i18n("Wrote kreadconfig on which this is based"), "bero@redhat.com");
 
-	QCoreApplication app(argc, argv);
 	KAboutData::setApplicationData(aboutData);
 
 	QCommandLineParser parser;