X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.h;fp=src%2Fcommon%2Fquassel.h;h=77f7b870b40eeb380b4e45321fedadfdfaed9c0c;hp=157386a8e47118971fd0f193c1418846f40088f1;hb=c015fbf8afaf64fbb5a8e2122e2a1ecf0325b1a1;hpb=893f0c21b72d7e4aedde092887073c590155b6d9 diff --git a/src/common/quassel.h b/src/common/quassel.h index 157386a8..77f7b870 100644 --- a/src/common/quassel.h +++ b/src/common/quassel.h @@ -32,6 +32,7 @@ #include #include "abstractcliparser.h" +#include "abstractsignalwatcher.h" #include "singleton.h" class QFile; @@ -228,7 +229,6 @@ protected: static void setDataDirPaths(const QStringList &paths); static QStringList findDataDirPaths(); - static void disableCrashHandler(); friend class CoreApplication; friend class QtUiApplication; @@ -237,6 +237,7 @@ protected: private: void setupEnvironment(); void registerMetaTypes(); + void setupSignalHandling(); /** * Requests a reload of relevant runtime configuration. @@ -250,13 +251,13 @@ private: void logBacktrace(const QString &filename); - static void handleSignal(int signal); +private slots: + void handleSignal(AbstractSignalWatcher::Action action); private: BuildInfo _buildInfo; RunMode _runMode; bool _initialized{false}; - bool _handleCrashes{true}; bool _quitting{false}; QString _coreDumpFileName; @@ -267,6 +268,7 @@ private: std::shared_ptr _cliParser; Logger *_logger; + AbstractSignalWatcher *_signalWatcher{nullptr}; std::vector _reloadHandlers; std::vector _quitHandlers;