summaryrefslogtreecommitdiffstats
path: root/doc/porting3.doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/porting3.doc')
-rw-r--r--doc/porting3.doc46
1 files changed, 23 insertions, 23 deletions
diff --git a/doc/porting3.doc b/doc/porting3.doc
index 9b7c01211..83bc9c9f8 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -105,19 +105,19 @@ nested header files. But in some cases you will find you need to add
an extra #include to your files.
For example, if you get a message about QStringList or its functions
-not being defined, then add \c {#include <qstringlist.h>} at
+not being defined, then add \c {#include <ntqstringlist.h>} at
the top of the file giving the error.
Header files that you might need to add #include directives for include:
\list
-\i \c <qcursor.h>
-\i \c <qpainter.h>
-\i \c <qpen.h>
-\i \c <qstringlist.h>
-\i \c <qregexp.h>
-\i \c <qstrlist.h>
-\i \c <qstyle.h>
-\i \c <qvaluelist.h>
+\i \c <ntqcursor.h>
+\i \c <ntqpainter.h>
+\i \c <ntqpen.h>
+\i \c <ntqstringlist.h>
+\i \c <ntqregexp.h>
+\i \c <ntqstrlist.h>
+\i \c <ntqstyle.h>
+\i \c <ntqvaluelist.h>
\endlist
\section1 Namespace
@@ -126,7 +126,7 @@ Qt 3.x is namespace clean. A few global identifiers that had been
left in Qt 2.x have been discarded.
Enumeration \l Qt::CursorShape and its values are now part of the
-special \c Qt class defined in qnamespace.h. If you get compilation
+special \c Qt class defined in ntqnamespace.h. If you get compilation
errors about these being missing (unlikely, since most of your code will
be in classes that inherit from the Qt namespace class), then apply
the following changes:
@@ -366,13 +366,13 @@ old header-file names are still supported.
\table
\header \i Old Name \i New Name \i New Header File
-\row \i QArray \i \l QMemArray \i \c <qmemarray.h>
-\row \i QCollection \i \l QPtrCollection \i \c <qptrcollection.h>
-\row \i QList \i \l QPtrList \i \c <qptrlist.h>
-\row \i QListIterator \i \l QPtrListIterator \i \c <qptrlist.h>
-\row \i QQueue \i \l QPtrQueue \i \c <qptrqueue.h>
-\row \i QStack \i \l QPtrStack \i \c <qptrstack.h>
-\row \i QVector \i \l QPtrVector \i \c <qptrvector.h>
+\row \i QArray \i \l QMemArray \i \c <ntqmemarray.h>
+\row \i QCollection \i \l QPtrCollection \i \c <ntqptrcollection.h>
+\row \i QList \i \l QPtrList \i \c <ntqptrlist.h>
+\row \i QListIterator \i \l QPtrListIterator \i \c <ntqptrlist.h>
+\row \i QQueue \i \l QPtrQueue \i \c <ntqptrqueue.h>
+\row \i QStack \i \l QPtrStack \i \c <ntqptrstack.h>
+\row \i QVector \i \l QPtrVector \i \c <ntqptrvector.h>
\endtable
\section1 QButtonGroup
@@ -436,8 +436,8 @@ for the \c echo parameter.
The definitions of \l QGLayoutIterator, \l QLayout, \l QLayoutItem, \l
QLayoutIterator, \l QSpacerItem and \l QWidgetItem have been moved from \c
-<qabstractlayout.h> to \c <qlayout.h>. The header \c
-<qabstractlayout.h> now includes \c <qlayout.h> for compatibility. It
+<ntqabstractlayout.h> to \c <ntqlayout.h>. The header \c
+<ntqabstractlayout.h> now includes \c <ntqlayout.h> for compatibility. It
might be removed in a future version.
\section1 QListViewItem
@@ -509,13 +509,13 @@ The \l QRegExp class has been rewritten to support many of the features of Perl
regular expressions. Both the regular expression syntax and the QRegExp
interface have been modified.
-Be also aware that \c <qregexp.h> is no longer included
-automatically when you include \c <qstringlist.h>. See
+Be also aware that \c <ntqregexp.h> is no longer included
+automatically when you include \c <ntqstringlist.h>. See
\link #Headers above \endlink for details.
\omit
-In Qt 3.0, qregexp.h has to
-include qstringlist.h, so it's no good to have qstringlist.h include qregexp.h,
+In Qt 3.0, ntqregexp.h has to
+include ntqstringlist.h, so it's no good to have ntqstringlist.h include ntqregexp.h,
unless one wants to achieve an Escher effect.
\endomit