projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Don't use unsafe functions when handling POSIX signals
[quassel.git]
/
src
/
common
/
quassel.h
diff --git
a/src/common/quassel.h
b/src/common/quassel.h
index
157386a
..
77f7b87
100644
(file)
--- a/
src/common/quassel.h
+++ b/
src/common/quassel.h
@@
-32,6
+32,7
@@
#include <QStringList>
#include "abstractcliparser.h"
#include <QStringList>
#include "abstractcliparser.h"
+#include "abstractsignalwatcher.h"
#include "singleton.h"
class QFile;
#include "singleton.h"
class QFile;
@@
-228,7
+229,6
@@
protected:
static void setDataDirPaths(const QStringList &paths);
static QStringList findDataDirPaths();
static void setDataDirPaths(const QStringList &paths);
static QStringList findDataDirPaths();
- static void disableCrashHandler();
friend class CoreApplication;
friend class QtUiApplication;
friend class CoreApplication;
friend class QtUiApplication;
@@
-237,6
+237,7
@@
protected:
private:
void setupEnvironment();
void registerMetaTypes();
private:
void setupEnvironment();
void registerMetaTypes();
+ void setupSignalHandling();
/**
* Requests a reload of relevant runtime configuration.
/**
* Requests a reload of relevant runtime configuration.
@@
-250,13
+251,13
@@
private:
void logBacktrace(const QString &filename);
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};
private:
BuildInfo _buildInfo;
RunMode _runMode;
bool _initialized{false};
- bool _handleCrashes{true};
bool _quitting{false};
QString _coreDumpFileName;
bool _quitting{false};
QString _coreDumpFileName;
@@
-267,6
+268,7
@@
private:
std::shared_ptr<AbstractCliParser> _cliParser;
Logger *_logger;
std::shared_ptr<AbstractCliParser> _cliParser;
Logger *_logger;
+ AbstractSignalWatcher *_signalWatcher{nullptr};
std::vector<ReloadHandler> _reloadHandlers;
std::vector<QuitHandler> _quitHandlers;
std::vector<ReloadHandler> _reloadHandlers;
std::vector<QuitHandler> _quitHandlers;