summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorjaanttil <janne.anttila@digia.com>2011-09-27 13:42:01 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-09-27 13:47:22 (GMT)
commit28b72c06942fd59666b6cb00adf63e1ad952dc03 (patch)
tree4955755cf9a19dc1af3953e49a40a78545db814f /doc/src/snippets
parent06af1253c214e893a4754cd10f8a17dc535c34a4 (diff)
downloadQt-28b72c06942fd59666b6cb00adf63e1ad952dc03.zip
Qt-28b72c06942fd59666b6cb00adf63e1ad952dc03.tar.gz
Qt-28b72c06942fd59666b6cb00adf63e1ad952dc03.tar.bz2
docs: Typo and link fixes.
Task-number: QTBUG-9224 Task-number: QTBUG-13442 Task-number: QTBUG-19858 Task-number: QTBUG-20957 Task-number: QTBUG-21447 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/code/doc_src_unix-signal-handlers.cpp6
-rw-r--r--doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp4
2 files changed, 5 insertions, 5 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");
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
index 11f5163..e695572 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
@@ -76,7 +76,7 @@ QString result = future.result();
//! [4]
// call 'QList<QByteArray> QByteArray::split(char sep) const' in a separate thread
QByteArray bytearray = "hello world";
-QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split), ',');
+QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split, ',');
...
QList<QByteArray> result = future.result();
//! [4]
@@ -84,7 +84,7 @@ QList<QByteArray> result = future.result();
//! [5]
// call 'void QImage::invertPixels(InvertMode mode)' in a separate thread
QImage image = ...;
-QFuture<void> future = QtConcurrent::run(image, &QImage::invertPixels, QImage::InvertRgba);
+QFuture<void> future = QtConcurrent::run(&image, &QImage::invertPixels, QImage::InvertRgba);
...
future.waitForFinished();
// At this point, the pixels in 'image' have been inverted