# include <KCoreAddons/Kdelibs4ConfigMigrator>
#endif
-#if !defined(BUILD_CORE) && defined(STATIC)
-#include <QtPlugin>
-Q_IMPORT_PLUGIN(qjpeg)
-Q_IMPORT_PLUGIN(qgif)
-#endif
-
-#include "qt5cliparser.h"
#include "quassel.h"
#include "types.h"
int main(int argc, char **argv)
{
-#ifdef HAVE_UMASK
- umask(S_IRWXG | S_IRWXO);
-#endif
-
- // Instantiate early, so log messages are handled
- Quassel quassel;
-
- Quassel::setupBuildInfo();
- QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
- QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString);
- QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName);
- QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain);
-
- //Setup the High-DPI settings
-# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6
-#endif
- QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-
// We need to explicitly initialize the required resources when linking statically
#ifndef BUILD_QTUI
Q_INIT_RESOURCE(sql);
Q_INIT_RESOURCE(breeze_icons);
Q_INIT_RESOURCE(breeze_dark_icons);
# ifdef WITH_OXYGEN_ICONS
- Q_INIT_RESOURCE(oxygen_icons);
+ Q_INIT_RESOURCE(oxygen_icons);
# endif
# ifdef WITH_BUNDLED_ICONS
Q_INIT_RESOURCE(breeze_icon_theme);
# endif
#endif
- std::shared_ptr<AbstractCliParser> cliParser = std::make_shared<Qt5CliParser>();
- Quassel::setCliParser(cliParser);
+ // Set umask so files are created with restricted permissions
+#ifdef HAVE_UMASK
+ umask(S_IRWXG | S_IRWXO);
+#endif
- // Initialize CLI arguments
- // NOTE: We can't use tr() at this point, since app is not yet created
- // TODO: Change this once we get rid of KDE4 and can initialize the parser after creating the app
+ // Instantiate early, so log messages are handled
+ Quassel quassel;
- // put shared client&core arguments here
- cliParser->addSwitch("debug", 'd', "Enable debug output");
- cliParser->addSwitch("help", 'h', "Display this help and exit");
- cliParser->addSwitch("version", 'v', "Display version information");
-#ifdef BUILD_QTUI
- cliParser->addOption("configdir", 'c', "Specify the directory holding the client configuration", "path");
-#else
- cliParser->addOption("configdir", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate", "path");
-#endif
- cliParser->addOption("datadir", 0, "DEPRECATED - Use --configdir instead", "path");
- cliParser->addOption("loglevel", 'L', "Loglevel Debug|Info|Warning|Error", "level", "Info");
-#ifdef HAVE_SYSLOG
- cliParser->addSwitch("syslog", 0, "Log to syslog");
-#endif
- cliParser->addOption("logfile", 'l', "Log to a file", "path");
+ Quassel::setupBuildInfo();
+ QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
+ QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString);
+ QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName);
+ QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain);
-#ifndef BUILD_CORE
- // put client-only arguments here
- cliParser->addOption("icontheme", 0, "Override the system icon theme ('breeze' is recommended)", "theme");
- cliParser->addOption("qss", 0, "Load a custom application stylesheet", "file.qss");
- cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches");
- cliParser->addSwitch("debugmodel", 0, "Enables debugging for models");
- cliParser->addSwitch("hidewindow", 0, "Start the client minimized to the system tray");
-#endif
-#ifndef BUILD_QTUI
- // put core-only arguments here
- cliParser->addOption("listen", 0, "The address(es) quasselcore will listen on", "<address>[,<address>[,...]]", "::,0.0.0.0");
- cliParser->addOption("port", 'p', "The port quasselcore will listen at", "port", "4242");
- cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
- cliParser->addSwitch("config-from-environment", 0, "Load configuration from environment variables");
- 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>", "username");
- cliParser->addSwitch("oidentd", 0, "Enable oidentd integration. In most cases you should also enable --strict-ident");
- cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
- cliParser->addSwitch("strict-ident", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting.");
- cliParser->addSwitch("ident-daemon", 0, "Enable internal ident daemon");
- cliParser->addOption("ident-port", 0, "The port quasselcore will listen at for ident requests. Only meaningful with --ident-daemon", "port", "10113");
-#ifdef HAVE_SSL
- cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
- cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem");
- cliParser->addOption("ssl-key", 0, "Specify the path to the SSL key", "path", "ssl-cert-path");
+ // Migrate settings from KDE4 to KF5 if appropriate
+#ifdef HAVE_KF5
+ Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
+ migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
+ migrator.migrate();
#endif
- cliParser->addSwitch("debug-irc", 0,
- "Enable logging of all raw IRC messages to debug log, including "
- "passwords! In most cases you should also set --loglevel Debug");
- cliParser->addOption("debug-irc-id", 0,
- "Limit raw IRC logging to this network ID. Implies --debug-irc",
- "database network ID", "-1");
- cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
+
+ //Setup the High-DPI settings
+# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6
#endif
+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ // Instantiate application
#if defined BUILD_CORE
CoreApplication app(argc, argv);
+ const auto runMode = Quassel::RunMode::CoreOnly;
#elif defined BUILD_QTUI
QtUiApplication app(argc, argv);
+ const auto runMode = Quassel::RunMode::ClientOnly;
#elif defined BUILD_MONO
MonolithicApplication app(argc, argv);
+ const auto runMode = Quassel::RunMode::Monolithic;
#endif
- if (!cliParser->init(app.arguments())) {
- cliParser->usage();
- return EXIT_FAILURE;
- }
+ try {
+ Quassel::instance()->init(runMode);
-// Migrate settings from KDE4 to KF5 if appropriate
#ifdef HAVE_KF5
- Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
- migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
- migrator.migrate();
+ AboutData aboutData;
+ AboutData::setQuasselPersons(&aboutData);
+ KAboutData::setApplicationData(aboutData.kAboutData());
#endif
-#ifdef HAVE_KF5
- // FIXME: This should be done after loading the translation catalogue, but still in main()
- AboutData aboutData;
- AboutData::setQuasselPersons(&aboutData);
- KAboutData::setApplicationData(aboutData.kAboutData());
-#endif
- try {
+ // Initialize the application
app.init();
}
catch (ExitException e) {
projects / quassel.git / blobdiff