13 files changed, 31 insertions, 31 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 572b8a1..52902d0 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
     to a QIODevice.
 
     \ingroup io
-    \mainclass
+
 
     A data stream is a binary stream of encoded information which is
     100% independent of the host computer's operating system, CPU or
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 6dd2640..1545082 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -52,8 +52,7 @@
 
 /*!
     \class QDebug
-    \ingroup io
-    \mainclass
+
     \brief The QDebug class provides an output stream for debugging information.
 
     QDebug is used whenever the developer needs to write out debugging or tracing
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 92aef3c..ca178ce 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -58,7 +58,7 @@
 
 #include "qvarlengtharray.h"
 
-#include "../kernel/qcoreglobaldata_p.h"
+#include "private/qcoreglobaldata_p.h"
 #include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
@@ -345,7 +345,7 @@ void QDirPrivate::detach(bool createFileEngine)
     \ingroup io
     \ingroup shared
     \reentrant
-    \mainclass
+
 
     A QDir is used to manipulate path names, access information
     regarding paths and files, and manipulate the underlying file
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 1718f3b..aa704d3 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -172,7 +172,7 @@ QFilePrivate::setError(QFile::FileError err, int errNum)
     \brief The QFile class provides an interface for reading from and writing to files.
 
     \ingroup io
-    \mainclass
+
     \reentrant
 
     QFile is an I/O device for reading and writing text and binary
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents_p.h b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
index b93d711..317c149 100644
--- a/src/corelib/io/qfilesystemwatcher_fsevents_p.h
+++ b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
@@ -59,8 +59,8 @@
 #include <QtCore/qmutex.h>
 #include <QtCore/qwaitcondition.h>
 #include <QtCore/qthread.h>
-#include <QtCore/QHash>
-#include <QtCore/QLinkedList>
+#include <QtCore/qhash.h>
+#include <QtCore/qlinkedlist.h>
 #include <private/qcore_mac_p.h>
 #include <sys/stat.h>
 
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index 89ed041..185d961 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -40,10 +40,9 @@
 ****************************************************************************/
 
 #include "qnoncontiguousbytedevice_p.h"
-#include <QObject>
-#include <QBuffer>
-#include <QDebug>
-#include <QFile>
+#include <qbuffer.h>
+#include <qdebug.h>
+#include <qfile.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h
index dd34c67..ecf9b9c 100644
--- a/src/corelib/io/qnoncontiguousbytedevice_p.h
+++ b/src/corelib/io/qnoncontiguousbytedevice_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QObject>
+#include <QtCore/qobject.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qbuffer.h>
 #include <QtCore/qiodevice.h>
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 133d51e..ccc16b2 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -151,12 +151,19 @@ void QProcessPrivate::Channel::clear()
     to communicate with them.
 
     \ingroup io
-    \ingroup misc
-    \mainclass
+
     \reentrant
 
+    \section1 Running a Process
+
     To start a process, pass the name and command line arguments of
-    the program you want to run as arguments to start(). For example:
+    the program you want to run as arguments to start(). Arguments
+    are supplied as individual strings in a QStringList.
+
+    For example, the following code snippet runs the analog clock
+    example in the Motif style on X11 platforms by passing strings
+    containing "-style" and "motif" as two items in the list of
+    arguments:
 
     \snippet doc/src/snippets/qprocess/qprocess-simpleexecution.cpp 0
     \dots
@@ -1565,16 +1572,16 @@ QByteArray QProcess::readAllStandardError()
     process, a warning may be printed at the console, and the existing
     process will continue running.
 
-    Note that arguments that contain spaces are not passed to the
+    \note Arguments that contain spaces are not passed to the
     process as separate arguments.
 
-    \bold{Windows:} Arguments that contain spaces are wrapped in quotes.
-
     \note Processes are started asynchronously, which means the started()
     and error() signals may be delayed. Call waitForStarted() to make
     sure the process has started (or has failed to start) and those signals
     have been emitted.
 
+    \bold{Windows:} Arguments that contain spaces are wrapped in quotes.
+
     \sa pid(), started(), waitForStarted()
 */
 void QProcess::start(const QString &program, const QStringList &arguments, OpenMode mode)
@@ -1834,7 +1841,7 @@ bool QProcess::startDetached(const QString &program,
     otherwise returns false. If the calling process exits, the
     detached process will continue to live.
 
-    Note that arguments that contain spaces are not passed to the
+    \note Arguments that contain spaces are not passed to the
     process as separate arguments.
 
     \bold{Unix:} The started process will run in its own session and act
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 958c7fc..212f153 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -169,7 +169,7 @@ Q_GLOBAL_STATIC(QStringList, resourceSearchPaths)
     \brief The QResource class provides an interface for reading directly from resources.
 
     \ingroup io
-    \mainclass
+
     \reentrant
     \since 4.2
 
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 81bd25a..af38b5a 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -2004,8 +2004,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     \brief The QSettings class provides persistent platform-independent application settings.
 
     \ingroup io
-    \ingroup misc
-    \mainclass
+
     \reentrant
 
     Users normally expect an application to remember its settings
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 2fbf93f..adfcf5e 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -447,7 +447,7 @@ QTemporaryFilePrivate::~QTemporaryFilePrivate()
     \brief The QTemporaryFile class is an I/O device that operates on temporary files.
 
     \ingroup io
-    \mainclass
+
 
     QTemporaryFile is used to create unique temporary files safely.
     The file itself is created by calling open(). The name of the
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 151a4a2..9c82976 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -49,7 +49,7 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
     reading and writing text.
 
     \ingroup io
-    \ingroup text
+    \ingroup string-processing
     \reentrant
 
     QTextStream can operate on a QIODevice, a QByteArray or a
@@ -3088,8 +3088,6 @@ QLocale QTextStream::locale() const
 
     \compat
     \reentrant
-    \ingroup io
-    \ingroup text
 
     Use QTextStream instead.
 */
@@ -3116,8 +3114,6 @@ QLocale QTextStream::locale() const
 
     \compat
     \reentrant
-    \ingroup io
-    \ingroup text
 
     Use QTextStream instead.
 */
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 423f5e2..acbac36 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -47,9 +47,9 @@
 
     \reentrant
     \ingroup io
-    \ingroup misc
+    \ingroup network
     \ingroup shared
-    \mainclass
+
 
     It can parse and construct URLs in both encoded and unencoded
     form. QUrl also has support for internationalized domain names