Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

15 files changed, 9 insertions, 22 deletions

diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index a414862..4fa0cd2 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -168,7 +168,6 @@ void QAbstractEventDispatcherPrivate::releaseTimerId(int timerId)
     \class QAbstractEventDispatcher
     \brief The QAbstractEventDispatcher class provides an interface to manage Qt's event queue.
 
-    \ingroup application
     \ingroup events
 
     An event dispatcher receives events from the window system and other
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index 61b19a2..d6d1bcf 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -753,7 +753,7 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \brief The QModelIndex class is used to locate data in a data model.
 
     \ingroup model-view
-    \mainclass
+
 
     This class is used as an index into item models derived from
     QAbstractItemModel. The index is used by item views, delegates, and
@@ -941,7 +941,7 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     item model classes.
 
     \ingroup model-view
-    \mainclass
+
 
     The QAbstractItemModel class defines the standard interface that item
     models must use to be able to interoperate with other components in the
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp
index df5941f..7fd975d 100644
--- a/src/corelib/kernel/qbasictimer.cpp
+++ b/src/corelib/kernel/qbasictimer.cpp
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
     \class QBasicTimer
     \brief The QBasicTimer class provides timer events for objects.
 
-    \ingroup time
     \ingroup events
 
     This is a fast, lightweight, and low-level class used by Qt
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 86221a1..a2c9de9 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -339,9 +339,6 @@ QString qAppName()
     \brief The QCoreApplication class provides an event loop for console Qt
     applications.
 
-    \ingroup application
-    \mainclass
-
     This class is used by non-GUI applications to provide their event
     loop. For non-GUI application that uses Qt, there should be exactly
     one QCoreApplication object. For GUI applications, see
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index f661d47..9771284 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
     event classes. Event objects contain event parameters.
 
     \ingroup events
-    \ingroup environment
 
     Qt's main event loop (QCoreApplication::exec()) fetches native
     window system events from the event queue, translates them into
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 2afab1a..0e75867 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -524,7 +524,7 @@ int QMetaCallEvent::placeMetaCall(QObject *object)
     \brief The QObject class is the base class of all Qt objects.
 
     \ingroup objectmodel
-    \mainclass
+
     \reentrant
 
     QObject is the heart of the \l{Qt object model}. The central
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index fb7a81e..624336f 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -44,7 +44,7 @@
     \brief The QPointer class is a template class that provides guarded pointers to QObjects.
 
     \ingroup objectmodel
-    \mainclass
+
 
     A guarded pointer, QPointer<T>, behaves like a normal C++
     pointer \c{T *}, except that it is automatically set to 0 when the
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index 168bf29..5dbd7c8 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -86,7 +86,6 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
 
 /*!
   \class QSharedMemory
-  \ingroup ipc
   \since 4.4
 
   \brief The QSharedMemory class provides access to a shared memory segment.
diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp
index 5e89da2..7b2097d 100644
--- a/src/corelib/kernel/qsignalmapper.cpp
+++ b/src/corelib/kernel/qsignalmapper.cpp
@@ -66,8 +66,8 @@ public:
     \class QSignalMapper
     \brief The QSignalMapper class bundles signals from identifiable senders.
 
-    \ingroup io
-    \mainclass
+    \ingroup objectmodel
+
 
     This class collects a set of parameterless signals, and re-emits
     them with integer, string or widget parameters corresponding to
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp
index 4ac1cbb..85a3ea3 100644
--- a/src/corelib/kernel/qsocketnotifier.cpp
+++ b/src/corelib/kernel/qsocketnotifier.cpp
@@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE
     \brief The QSocketNotifier class provides support for monitoring
     activity on a file descriptor.
 
+    \ingroup network
     \ingroup io
 
     The QSocketNotifier makes it possible to integrate Qt's event
diff --git a/src/corelib/kernel/qsystemsemaphore.cpp b/src/corelib/kernel/qsystemsemaphore.cpp
index 95dc8a0..94548f7 100644
--- a/src/corelib/kernel/qsystemsemaphore.cpp
+++ b/src/corelib/kernel/qsystemsemaphore.cpp
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
 
 /*!
   \class QSystemSemaphore
-  \ingroup ipc
   \since 4.4
 
   \brief The QSystemSemaphore class provides a general counting system semaphore.
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 2e34592..6c4eb1b 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -50,9 +50,8 @@ QT_BEGIN_NAMESPACE
     \class QTimer
     \brief The QTimer class provides repetitive and single-shot timers.
 
-    \ingroup time
     \ingroup events
-    \mainclass
+
 
     The QTimer class provides a high-level programming interface for
     timers. To use it, create a QTimer, connect its timeout() signal
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index de1157c..b9e6e14 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -249,8 +249,6 @@ public:
     output.
 
     \ingroup i18n
-    \ingroup environment
-    \mainclass
 
     An object of this class contains a set of translations from a
     source language to a target language. QTranslator provides
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 66c4176..54d6073 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1164,9 +1164,8 @@ const QVariant::Handler *QVariant::handler = &qt_kernel_variant_handler;
     \brief The QVariant class acts like a union for the most common Qt data types.
 
     \ingroup objectmodel
-    \ingroup misc
     \ingroup shared
-    \mainclass
+
 
     Because C++ forbids unions from including types that have
     non-default constructors or destructors, most interesting Qt
diff --git a/src/corelib/kernel/qwineventnotifier_p.cpp b/src/corelib/kernel/qwineventnotifier_p.cpp
index f54d564..e5ce02c 100644
--- a/src/corelib/kernel/qwineventnotifier_p.cpp
+++ b/src/corelib/kernel/qwineventnotifier_p.cpp
@@ -52,8 +52,6 @@ QT_BEGIN_NAMESPACE
     \class QWinEventNotifier
     \brief The QWinEventNotifier class provides support for the Windows Wait functions.
 
-    \ingroup io
-
     The QWinEventNotifier class makes it possible to use the wait
     functions on windows in a asynchronous manner. With this class
     you can register a HANDLE to an event and get notification when