diff options
author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-04 23:00:15 (GMT) |
---|---|---|
committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-04 23:00:15 (GMT) |
commit | 8be0ccb25a5d239b31a4cebddd41731b469dc240 (patch) | |
tree | 2ef173684a0bd561a66669772d2b4418f0f8d0ab /doc/src/snippets/code/doc_src_unix-signal-handlers.cpp | |
parent | aefda8ce30695c5383860eab709acca345d290dc (diff) | |
parent | c7b6c35e2b32b5d85f90088906d7ca6ecfe47202 (diff) | |
download | Qt-8be0ccb25a5d239b31a4cebddd41731b469dc240.zip Qt-8be0ccb25a5d239b31a4cebddd41731b469dc240.tar.gz Qt-8be0ccb25a5d239b31a4cebddd41731b469dc240.tar.bz2 |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'doc/src/snippets/code/doc_src_unix-signal-handlers.cpp')
-rw-r--r-- | doc/src/snippets/code/doc_src_unix-signal-handlers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp index fd5f386..a5f3ed1 100644 --- a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp +++ b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp @@ -44,7 +44,7 @@ class MyDaemon : public QObject Q_OBJECT public: - MyDaemon(QObject *parent = 0, const char *name = 0); + MyDaemon(QObject *parent = 0); ~MyDaemon(); // Unix signal handlers. @@ -67,8 +67,8 @@ class MyDaemon : public QObject //! [1] -MyDaemon::MyDaemon(QObject *parent, const char *name) - : QObject(parent,name) +MyDaemon::MyDaemon(QObject *parent) + : QObject(parent) { if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sighupFd)) qFatal("Couldn't create HUP socketpair"); |