1 files changed, 33 insertions, 33 deletions
diff --git a/doc/porting3.doc b/doc/porting3.doc
index 75fd1cc54..9a6dc3593 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -114,7 +114,7 @@ Header files that you might need to add #include directives for include:
 \i \c <ntqpainter.h>
 \i \c <ntqpen.h>
 \i \c <tqstringlist.h>
-\i \c <ntqregexp.h>
+\i \c <tqregexp.h>
 \i \c <tqstrlist.h>
 \i \c <tqstyle.h>
 \i \c <tqvaluelist.h>
@@ -209,7 +209,7 @@ All these functions have been removed in TQt 3.x:
 \i QPalette::normal(). Use TQPalette::active() instead.
 \i QPalette::setNormal(). Use TQPalette::setActive() instead.
 \i QPointArray::quadBezier()
-\i QRegExp::find()
+\i TQRegExp::find()
 \i QSignal::block(bool b)
 \i QSignal::isBlocked() const
 \i QSignal::parameter() const. Use TQSignal::value() instead.
@@ -314,7 +314,7 @@ new code.
 \i QMessageBox::message( const TQString \& caption, const TQString \& text, const TQString \& buttonText = TQString::null, TQWidget *parent = 0, const char *= 0 )
 \i QMessageBox::query( const TQString \& caption, const TQString \& text, const TQString \& yesButtonText = TQString::null, const TQString \& noButtonText = TQString::null, TQWidget *parent = 0, const char *= 0 )
 \i QMessageBox::standardIcon( Icon icon, GUIStyle style )
-\i QRegExp::match( const TQString \& str, int index = 0, int *len = 0, bool indexIsStart = TRUE ) const
+\i TQRegExp::match( const TQString \& str, int index = 0, int *len = 0, bool indexIsStart = TRUE ) const
 \i QScrollView::childIsVisible( TQWidget *child )
 \i QScrollView::showChild( TQWidget *child, bool show = TRUE )
 \i QSimpleRichText::draw( QPainter *p, int x, int y, const QRegion \& clipRegion, const QColorGroup \& cg, const QBrush *paper = 0 ) const
@@ -374,7 +374,7 @@ names are no longer avaialable.
 
 \table
 \header \i Old Name \i New Name \i New Header File
-\row \i QArray \i \l QMemArray \i \c <ntqmemarray.h>
+\row \i QArray \i \l TQMemArray \i \c <tqmemarray.h>
 \row \i QCollection \i \l TQPtrCollection \i \c <tqptrcollection.h>
 \row \i QList \i \l TQPtrList \i \c <tqptrlist.h>
 \row \i QListIterator \i \l TQPtrListIterator \i \c <tqptrlist.h>
@@ -511,19 +511,19 @@ On X11, QPrinter used to generate encapsulated postscript when
 fullPage() was TRUE and only one page was printed. This does not
 happen by default anymore, providing a more consistent printing output.
 
-\section1 QRegExp
+\section1 TQRegExp
 
-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
+The \l TQRegExp class has been rewritten to support many of the features of Perl
+regular expressions.  Both the regular expression syntax and the TQRegExp
 interface have been modified.
 
-Be also aware that \c <ntqregexp.h> is no longer included
+Be also aware that \c <tqregexp.h> is no longer included
 automatically when you include \c <tqstringlist.h>. See
 \link #Headers above \endlink for details.
 
 \omit
-In TQt 3.0, ntqregexp.h has to
-include tqstringlist.h, so it's no good to have tqstringlist.h include ntqregexp.h,
+In TQt 3.0, tqregexp.h has to
+include tqstringlist.h, so it's no good to have tqstringlist.h include tqregexp.h,
 unless one wants to achieve an Escher effect.
 \endomit
 
@@ -537,36 +537,36 @@ there.
 
 Example: Old code like
 \code
-    QRegExp rx( "([0-9|]*\\)" );        // works in TQt 2.x
+    TQRegExp rx( "([0-9|]*\\)" );        // works in TQt 2.x
 \endcode
 should be converted into
 \code
-    QRegExp rx( "\\([0-9\\|]*\\)" );      // works in TQt 2.x and 3.x
+    TQRegExp rx( "\\([0-9\\|]*\\)" );      // works in TQt 2.x and 3.x
 \endcode
 (Within character classes, the backslash is not necessary in front of certain
 characters, e.g. <tt>|</tt>, but it doesn't hurt.)
 
 Wildcard patterns need no conversion.  Here are two examples:
 \code
-    QRegExp wild( "(*.*)" );
+    TQRegExp wild( "(*.*)" );
     wild.setWildcard( TRUE );
 \endcode
 \code
     // TRUE as third argument means wildcard
-    QRegExp wild( "(*.*)", FALSE, TRUE );
+    TQRegExp wild( "(*.*)", FALSE, TRUE );
 \endcode
-However, when they are used, make sure to use QRegExp::exactMatch()
-rather than the obsolete QRegExp::match(). QRegExp::match(), like
-QRegExp::find(), tries to find a match somewhere in the target
-string, while QRegExp::exactMatch() tries to match the whole target
+However, when they are used, make sure to use TQRegExp::exactMatch()
+rather than the obsolete TQRegExp::match(). TQRegExp::match(), like
+TQRegExp::find(), tries to find a match somewhere in the target
+string, while TQRegExp::exactMatch() tries to match the whole target
 string.
 
-\section2 QRegExp::operator=()
+\section2 TQRegExp::operator=()
 
-This function has been replaced by \l QRegExp::setPattern() in TQt 2.2.
+This function has been replaced by \l TQRegExp::setPattern() in TQt 2.2.
 Old code such as
 \code
-    QRegExp rx( "alpha" );
+    TQRegExp rx( "alpha" );
     rx.setCaseSensitive( FALSE );
     rx.setWildcard( TRUE );
     rx = "beta";
@@ -578,25 +578,25 @@ and wildcard options are forgotten). This way,
 \endcode
 is the same as
 \code
-    rx = QRegExp( "beta" );
+    rx = TQRegExp( "beta" );
 \endcode
 which is what one expects.
 
-\section2 QRegExp::match()
+\section2 TQRegExp::match()
 
 The following function is now obsolete, as it has an unwieldy
 parameter list and was poorly named:
 \list
-\i bool QRegExp::match( const TQString \& str, int index = 0,
+\i bool TQRegExp::match( const TQString \& str, int index = 0,
 			int * len = 0, bool indexIsStart = TRUE ) const
 \endlist
 It will be removed in a future version of Qt. Its \link
-QRegExp::match() documentation \endlink explains how to replace it.
+TQRegExp::match() documentation \endlink explains how to replace it.
 
-\section2 QRegExp::find()
+\section2 TQRegExp::find()
 
 This function was removed, after a brief appearance in TQt 2.2.  Its
-name clashed with TQString::find().  Use \l QRegExp::search() or \l
+name clashed with TQString::find().  Use \l TQRegExp::search() or \l
 TQString::find() instead.
 
 \section2 TQString::findRev() and TQString::contains()
@@ -606,12 +606,12 @@ between 2.0 and 3.0 to be more consistent with the other overloads.
 
 For example,
 \code
-    TQString( "" ).contains( QRegExp("") )
+    TQString( "" ).contains( TQRegExp("") )
 \endcode
 returns 1 in TQt 2.0; it returns 0 in TQt 3.0. Also, "^" now really means
 start of input, so
 \code
-    TQString( "Heisan Hoppsan" ).contains( QRegExp("^.*$") )
+    TQString( "Heisan Hoppsan" ).contains( TQRegExp("^.*$") )
 \endcode
 returns 1, not 13 or 14.
 
@@ -619,16 +619,16 @@ This change affect very few existing programs.
 
 \section2 TQString::replace()
 
-With TQt 1.0 and 2.0, a TQString is converted implicitly into a QRegExp
+With TQt 1.0 and 2.0, a TQString is converted implicitly into a TQRegExp
 as the first argument to TQString::replace():
 \code
     TQString text = fetch_it_from_somewhere();
     text.replace( TQString("[A-Z]+"), "" );
 \endcode
 With TQt 3.0, the compiler gives an error. The solution is to use a
-QRegExp cast:
+TQRegExp cast:
 \code
-    text.replace( QRegExp("[A-Z]+"), "" );
+    text.replace( TQRegExp("[A-Z]+"), "" );
 \endcode
 This change makes it possible to introduce a
 TQString::replace(TQString, TQString) overload in a future version of Qt
@@ -641,7 +641,7 @@ modal dialog instead.
 
 \section1 QSortedList
 
-The QSortedList class is now obsolete. Consider using a QDict, a TQMap
+The QSortedList class is now obsolete. Consider using a TQDict, a TQMap
 or a plain TQPtrList instead.
 
 \section1 QTableView