X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmain.cpp;h=47ad3d4802562422bf5fc340626042aa13037f4d;hb=c2e3479b87e7d0713d302d26fb2d7d01d7b8c9c2;hp=5fe45ad6cc792c1010ec5615bf93a4d045844ac9;hpb=27f186f9c78928d8c929d534f9f845978ba5bc83;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index 5fe45ad6..47ad3d48 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include +#include #include @@ -109,7 +110,7 @@ int main(int argc, char **argv) # endif #endif - AbstractCliParser *cliParser; + std::shared_ptr cliParser; #ifdef HAVE_KDE4 // We need to init KCmdLineArgs first @@ -117,15 +118,15 @@ int main(int argc, char **argv) ki18n("A modern, distributed IRC client")); aboutData.addLicense(KAboutData::License_GPL_V2); aboutData.addLicense(KAboutData::License_GPL_V3); - aboutData.setBugAddress("http://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); KCmdLineArgs::init(argc, argv, &aboutData); - cliParser = new KCmdLineWrapper(); + cliParser = std::make_shared(); #elif defined HAVE_QT5 - cliParser = new Qt5CliParser(); + cliParser = std::make_shared(); #else - cliParser = new CliParser(); + cliParser = std::make_shared(); #endif Quassel::setCliParser(cliParser); @@ -163,6 +164,7 @@ int main(int argc, char **argv) #endif cliParser->addOption("logfile", 'l', "Log to a file", "path"); cliParser->addOption("select-backend", 0, "Switch storage backend (migrating data if possible)", "backendidentifier"); + cliParser->addOption("select-authenticator", 0, "Select authentication backend", "authidentifier"); cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user"); cliParser->addOption("change-userpass", 0, "Starts an interactive session to change the password of the user identified by ", "username"); cliParser->addSwitch("oidentd", 0, "Enable oidentd integration"); @@ -207,7 +209,7 @@ int main(int argc, char **argv) // the non-KDE version parses after app has been instantiated if (!cliParser->init(app.arguments())) { cliParser->usage(); - return false; + return EXIT_FAILURE; } #endif