Merge pull request #111 from mamarley/nosslloopback

Don't require SSL for loopback connections with --require-ssl

diff --combined src/common/main.cpp
index 6847371,d4833a4..b13d3ee
--- 1/src/common/main.cpp
--- 2/src/common/main.cpp
+++ b/src/common/main.cpp
@@@ -49,7 -49,6 +49,7 @@@
  #  include "kcmdlinewrapper.h"
  #elif defined HAVE_KF5
  #  include <KCoreAddons/KAboutData>
 +#  include <KCoreAddons/Kdelibs4ConfigMigrator>
  #  include "qt5cliparser.h"
  #elif defined HAVE_QT5
  #  include "qt5cliparser.h"
@@@ -103,13 -102,6 +103,13 @@@ int main(int argc, char **argv
  # endif
  #endif
  
 +    // Migrate settings from KDE4 to KF5 if appropriate
 +#ifdef HAVE_KF5
 +    Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
 +    migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
 +    migrator.migrate();
 +#endif
 +
      AbstractCliParser *cliParser;
  
  #ifdef HAVE_KDE4
@@@ -169,7 -161,7 +169,7 @@@
      cliParser->addSwitch("oidentd", 0, "Enable oidentd integration");
      cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
  #ifdef HAVE_SSL
-     cliParser->addSwitch("require-ssl", 0, "Require SSL for client connections");
+     cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
  #endif
      cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
  #endif