diff options
| -rw-r--r-- | examples/xmlpatterns/filetree/doc/src/filetree.qdoc | 16 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qabstractmessagehandler.cpp | 18 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/src/xml-patterns.qdoc | 2 |
3 files changed, 12 insertions, 24 deletions
diff --git a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc index cf485ae3..796861d6 100644 --- a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc +++ b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc @@ -118,15 +118,13 @@ file system. At this point it is instructive to note that although the node model class for this example (\c{FileTree}) actually builds and contains the custom node model, building the custom node model - isn't always required. The node model class for the \l{QObject XML - Model Example} {QObject node model example} does not build its node - model but instead uses an already existing QObject tree as its node - model and just implements the callback interface for that already - existing data structure. In this file system example, however, - although we have an already existing data structure, i.e. the file - system, that data structure is not in memory and is not in a form we - can use. So we must build an analog of the file system in memory - from instances of QFileInfo, and we use that analog as the custom + isn't always required. For example, it is possible to use an already + existing QObject tree as a node model and just implement the callback + interface for that already existing data structure. In this file system + example, however, although we have an already existing data structure, + i.e. the file system, that data structure is not in memory and is not + in a form we can use. So we must build an analog of the file system in + memory from instances of QFileInfo, and we use that analog as the custom node model. The two sets of flags, \c{m_filterAllowAll} and \c{m_sortFlags}, diff --git a/src/xmlpatterns/api/qabstractmessagehandler.cpp b/src/xmlpatterns/api/qabstractmessagehandler.cpp index 2c13e4e8..b2c53bba 100644 --- a/src/xmlpatterns/api/qabstractmessagehandler.cpp +++ b/src/xmlpatterns/api/qabstractmessagehandler.cpp @@ -37,22 +37,13 @@ ** ****************************************************************************/ -#include <QMutex> - #include "private/qobject_p.h" #include "qabstractmessagehandler.h" QT_BEGIN_NAMESPACE -class QAbstractMessageHandlerPrivate : public QObjectPrivate -{ -public: - QMutex mutex; -}; - /*! \class QAbstractMessageHandler - \threadsafe \since 4.4 \ingroup xml-tools \inmodule QtXmlPatterns @@ -71,8 +62,6 @@ public: instance of your subclass to any classes that must generate messages. The messages are sent to the message handler via the message() function, which forwards them to your handleMessge(). - The effect is to serialize the handling of all messages, which - means your QAbstractMessageHandler subclass is thread safe. A single instance of QAbstractMessageHandler can be called on to handle messages from multiple sources. Hence, the content of a @@ -87,7 +76,7 @@ public: Constructs a QAbstractMessageHandler. The \a parent is passed to the QObject base class constructor. */ -QAbstractMessageHandler::QAbstractMessageHandler(QObject *parent) : QObject(*new QAbstractMessageHandlerPrivate(), parent) +QAbstractMessageHandler::QAbstractMessageHandler(QObject *parent) : QObject(parent) { } @@ -127,8 +116,6 @@ void QAbstractMessageHandler::message(QtMsgType type, const QUrl &identifier, const QSourceLocation &sourceLocation) { - Q_D(QAbstractMessageHandler); - QMutexLocker(&d->mutex); handleMessage(type, description, identifier, sourceLocation); } @@ -141,6 +128,9 @@ void QAbstractMessageHandler::message(QtMsgType type, This function must be implemented by the sub-class. message() will call this function, passing in its parameters, \a type, \a description, \a identifier and \a sourceLocation unmodified. + + This function can potentially be called from multiple threads. It's the reimplementation's + responsibility to ensure thread safety. */ QT_END_NAMESPACE diff --git a/src/xmlpatterns/doc/src/xml-patterns.qdoc b/src/xmlpatterns/doc/src/xml-patterns.qdoc index ae1ed3b8..407e2d11 100644 --- a/src/xmlpatterns/doc/src/xml-patterns.qdoc +++ b/src/xmlpatterns/doc/src/xml-patterns.qdoc @@ -538,7 +538,7 @@ \li The set of D-Bus interfaces available in a system - \li A QObject hierarchy, as seen in the \l{QObject XML Model Example}. + \li A QObject hierarchy. \endlist |